From 3b4bb28ef24e70573c02ffc7b4717840fea37e70 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 4 Jul 2008 08:20:26 +0000 Subject: [PATCH 001/168] Create a R2_10 branch for WinMerge 2.10 releases. --HG-- branch : R2_10 From 05f0f3a60a7b2848575c61f068cdc59a6491864b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 4 Jul 2008 08:25:18 +0000 Subject: [PATCH 002/168] WinMerge 2.10.x (R_210) branch created (r5561) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index c7b9ef48fd5..d5bea29d0d8 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,6 +3,8 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.10.x (R_210) branch created (r5561) + WinMerge 2.9.1.5 - 2008-07-04 (r5560) Manual: Copy editing (#2000322, #2005418) Manual: Clarify 64-bit support (#2002431) From da171d7a0eeb68cd56c223de01409211d30f19af Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 4 Jul 2008 09:23:08 +0000 Subject: [PATCH 003/168] Add 2.10 branch to branch list. --HG-- branch : R2_10 --- Docs/Developers/readme-Subversion.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Docs/Developers/readme-Subversion.html b/Docs/Developers/readme-Subversion.html index 6c3b4a87e51..1ec05bc1aa7 100644 --- a/Docs/Developers/readme-Subversion.html +++ b/Docs/Developers/readme-Subversion.html @@ -94,6 +94,8 @@

Repository URLs

https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_6
  • 2.8 release branch
    https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_8
    • +
  • 2.10 release branch
    + https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10

    • Old branches (2.0 - 2.4 releases) are in CVS repository.

    From 5541b3d86306944e0b871709678d25c0f54bfb2e Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 7 Jul 2008 07:39:18 +0000 Subject: [PATCH 004/168] PATCH: [ 2011365 ] Incorporate dev review comments in Intro_diffs help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 5 +- Docs/Users/Manual/Intro_diffs.xml | 330 +++++++++++++----- .../Manual/screenshots/currentdiff_btn.png | Bin 0 -> 474 bytes .../Manual/screenshots/filecomp_diffpane1.png | Bin 0 -> 5990 bytes Docs/Users/Manual/screenshots/filemerged1.png | Bin 25980 -> 35429 bytes .../Manual/screenshots/firstdiff_btn.png | Bin 0 -> 528 bytes .../Manual/screenshots/missing_lines.png | Bin 28098 -> 29841 bytes 7 files changed, 242 insertions(+), 93 deletions(-) create mode 100644 Docs/Users/Manual/screenshots/currentdiff_btn.png create mode 100644 Docs/Users/Manual/screenshots/filecomp_diffpane1.png create mode 100644 Docs/Users/Manual/screenshots/firstdiff_btn.png diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index d5bea29d0d8..acec8b788de 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,7 +3,10 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.10.x (R_210) branch created (r5561) +WinMerge 2.9.1.6 + Manual: Introduction update (#2011365) + +WinMerge 2.10.x (R2_10) branch created (r5561) WinMerge 2.9.1.5 - 2008-07-04 (r5560) Manual: Copy editing (#2000322, #2005418) diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 8e394a86a8a..00795c7ab90 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -2,146 +2,292 @@ Overview of file comparing and merging - This topic introduces the concept of differences in files, how WinMerge displays differences in the File Compare window, and how you can merge differences between files. + This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations. - What are file differences? + Comparing files - If you compare two files, you can probably easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. A spell checker is a commonly-used utility that handles simple differences: it highlights words in a document that are different from those in its stored dictionary. You step through the document, resolving each highlighted word in turn. + If you compare two files, you can easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge can make this work much easier and more efficient. - However, looking only at characters and words is not an effective way to do more complicated comparisons. For this reason, many text utilities use lines as the basic unit of comparison instead. WinMerge's compare engine also uses lines as the basic unit for comparing and merging. WinMerge detects smaller differences, but they are not the basis for comparing and merging operations. To illustrate: if two files have identical lines except for one line, and that line has five words that are different, then we say that the file has one difference, not five. + A spell checker is a useful difference utility: it can systematically step you through a document, highlight words that are different from those in its dictionary, and help you resolve each spelling problem. However, looking only at characters and words is not an effective way to do more complicated comparisons: many text utilities use lines as the basic unit of comparison instead. - It's simple to compare files by identifying single lines that are different. But what it your files have many consecutive different lines? WinMerge handles the entire block of lines as a single difference. This makes it easier for you to step through files and identify their differences. As we will see later, it makes merging quicker too. + WinMerge also uses lines as its basic unit of difference. Words and spaces are not treated individually in comparing and merging operations. To illustrate: if two files have identical lines except that in one file, the last line has four different words and an extra space, then we say that the file has one difference, not five. - Let's look at a simple example that shows what we have discussed so far. First, examine these two files: + It's easy to identify individual lines that are different. But sometimes it is useful to treat an entire block of lines that are different as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too. - - - File1 + + Simple compare operation - It's hard to compare words + This section offers a simple example that demonstrates how to compare line difference between two files in WinMerge: + + + + Using a text editor, create two files with the names and contents shown here, being careful to preserve the words and line breaks exactly: + + + Fle1: + + It's hard to compare words and merge them. So instead WinMerge compares lines. Believe it or else. - + - - File2 + + File2: - It's hard to compare words. + It's hard to compare words. WinMerge compares lines. Believe it or not. - - + - If we open these two files in WinMerge, here is how they initially display in the File Compare window: + The files are similar enough that they might be later versions of the same file. + - - - - + + Start WinMerge. For example, double-click the + + + - - Compare Files screen shot - - + + WinMerge desktop shortcut + + WinMerge desktop shortcut. + - Notice the status message at the bottom right of the window: It tells you that two differences were detected. Can you identify them? The File Compare window indicates differences by adding a background color (which you can customize) to the text. + + In the Select Files and Folders dialog, specify File1 as the Left file and File2 as the Right file, then click OK. The File Compare window displays the two files in the left and right pane, like this: - The following notes explain each of the callout numbers in the screenshot: + + + + - - - The first difference is a multiline difference: it compares lines 1 and 2 on the left with line 1 on the right. + + Compare Files screen shot + + - Dark gold is the default background color that identifies line differences. Also notice the second, lighter color within the differences. This color identifies word differences: the specific words and spaces within the lines that are different. - + The window elements are described in more detail in Comparing Files. Here are some features you should notice in this example: - - In the right pane, difference 1 includes an empty line with a gray background. We know that line 2 in File2 is + + + Number of differences - WinMerge compares lines. + + The message in the status bar (at the bottom) tells you that two differences were detected. Read on to learn how to identify them. + + - Because this line is not part of difference 1, WinMerge inserts a blank line in its place. It then moves the line down so that it aligns with its matching line in the left pane (which happens to be line 3 in File1. If you understand this principle, you can always tell which lines WinMerge is comparing. + + Difference colors - Empty gray lines are ignored, and are not part of the source file. What do you think happens if you enter text in an empty gray line? You are adding content to the source file, and the gray background disappears from the line to which you add text. + + WinMerge marks detected differences with various background colors (which you can configure in WinMerge options). The basic difference color is gold, by default. Within each line difference, WinMerge marks words and characters that are different with a lighter background color. Identical lines (like the third line in the example) are unmarked: they have white backgrounds. + + - - One consequence of this alignment method is that both panes in the File Compare window always display the same number of lines, even if their source files do not. - - + + Blank lines - - This line is not highlighted because it is identical in both files, and does not need merging. As with differences, the WinMerge display aligns matching lines even when they occur in different places in the source files. - + + Notice that in the left comparison pane, the second line has text: the other pane has a blank gray line in the same location. This blank line does not exist in the File2 source file, so what is it doing in WinMerge? - - The last line is difference 2. Again, we know it is a difference because of its gold background color. Can you identify the specific word differences? - - - + WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right versions of differences vertically aligned. Thus in our example, the text, WinMerge compares lines, appears side by side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge than in a conventional editor. - - What is file merging? + + One consequence of the blank lines is that both panes in the File Compare window always display the same total number of lines, even if their source files do not. + + + + + + Now that you understand how WinMerge detects and displays differences, you can use the comparing functions effectively, as shown in the next steps. + + + + Click + + + + + + Current Difference button + + Current Difference in the toolbar (or press + Alt + + Enter + ). If this button is not enabled (for example, if your cursor is in a different line of the file), click + + + - After you compare two files in the File Compare window, you might want to merge them. In WinMerge, merging is nothing more than copying differences from one file to the other. If a difference includes multiple lines, all of them are copied at once. + + First Difference button + + First Difference (or press + Alt - WinMerge provides controls in the toolbar that make it easy to navigate through the differences, and to merge selected differences (or even all differences) in either direction. + Home + ) instead. - Let's show how you can use the controls in the File Compare window to merge the simple files shown earlier. You can perform the following merge operation using only four mouse clicks: + When you select a difference, the two versions are loaded in the Diff pane. The Diff pane is useful for confirming which lines are included, and for examining them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines. - - - Click + - + - Next Difference button + Compare Files Diff Pane - Next Difference to select difference 1. - + + + + + Click + + + + + + Current Difference button + + Next Difference in the toolbar (or click + Alt + + Enter + ). This jumps over the identical line (which is not a difference) and selects the last line. + + You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences, and there are other ways to compare differences in WinMerge — but it demonstrates the efficiency of using the WinMerge navigation controls. + + + + - - Click + + Merging files + + The purpose of merging is to combine changes from two files into one file. Merging concepts and functions build on the comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single target version. + + An environment without merging is simple but constrained: you must always update files sequentially. Two people cannot work on the same file concurrently, and once you create two versions of a file, they must be maintained separately. + + Merging files makes concurrent development possible, and it is a common occurrence in team environments. For example, suppose you and another person want to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor. + + Merging can be prompted (or even initiated) by version control systems like Subversion and ClearCase. For example, your version control system might prevent you from submitting changes to its repository because of a conflict. A conflict can occur if someone else checked in a different version of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated difference and merge tools, but you might prefer to use WinMerge instead. + + Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through each difference. Resolve each difference by copying either its left or right candidate to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging. + + + Simple merge operation + + This short exercise demonstrates how use the controls in the File Compare window to merge the simple files shown earlier, in only a few steps: + + + + Click + + + + + + Current Difference button + + Current Difference in the toolbar to select the first difference. If this button is not enabled, click + + + + + + First Difference button + + First Difference instead. + + + + Click + + + + + + Copy Right button + + Copy Right to merge difference 1 from File1 to File2. In File 2, notice that the single difference line is replaced by the two lines from File1, and the gray blank line is now gone. + + + + Click + + + + + + Next Difference button + + Next Difference to select difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any. + + + + Click + + + + + + Copy Left button + + Copy Left to merge difference 2 from File2 to File1. + + The message that the the files are identical tells you that the merge is complete: + + - + + + - - Copy Right button - - Copy Right to merge difference 1 from File1 to File2. In File 2, notice that the single difference line is replaced by the two lines from File1, and the gray empty line is now gone. - + + Click OK to dismiss the message. The status Difference message changes from Difference of 1 to identical. + - - Click Next Difference again to select difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any. - + + Press + Ctrl - - Click - - - + S + to save your changes. + + + - - Copy Left button - - Copy Left to merge difference 2 from File2 to File1. - - + + Choosing a merge result file + + You control where your merge result is preserved. The WinMerge Compare window does not have a separate result pane, unlike some merge tools. So the simplest strategy is to save your changes in one or both source files. Press + Ctrl + + S + at any time to save the current changes to both files; alternatively, click + File + + Save Left + or + File + + Save Right + to save only one file. - Here is the result of our merge: + To write to a third file instead of either source file, use + File - - - - - - - + Save As + . For example, your target file might be the difference or conflict file generated by a version control system. - Remember that in addition to its specialized comparing and merging functions, the File Compare window also enables you to edit your files directly using its conventional editing functions (including searching, copying and pasting text). + Similarly, in the WinMerge command line, you can leave both source versions unchanged by using the optional argument, as described in Command Line. + diff --git a/Docs/Users/Manual/screenshots/currentdiff_btn.png b/Docs/Users/Manual/screenshots/currentdiff_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..d041149e41d81f6962015225e9f32375c491aa3c GIT binary patch literal 474 zcmV<00VV#4P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RT2LlcmEGTiFtN;K3Y)M2xR4C7# zlRrp8Q543%BN@HdBA5|Q6%v(eO-&AM&5aJBcj(X35=2S#hG;7KH@qmYDO_5DhK809 z$_9xbXpm|UEfaf`irG62&*bHMB6PURx%c~V&iOc(m>B>7IZS93#r>MN&3x;b?>Oy? z+X54*vDb}KJ*9dzqu|J5*PL4c696U<1Hks%(#=|~UaAo@$VsJlz&T0;W`OWeNyL^P z%?tprC8Q9fBt`Q6NZv0cNebC$h?%eGj~U%U_;nSt1OPkytO%{3ng#uXOw61O294YS z=l}pI5a@|d0VwVr;QPYV8v%fHM9f?u8|&MJkhh%B51|7fIDTi-37wzB%xMcI3*psO z0J%+3DXR^yE;kc1Ut4AyZZ%s|Cri3k(zRwz!pcl%eVJ;?IG4ranHQgxY}}IZh*$B% zj5PIiclHs@RG$Exucqy{L=Mx?f@`IFw`Mi?M2p^*6F^OHzy4k)>3=`q2SrU4B3}Ll Q8~^|S07*qoM6N<$g2n&9Hvj+t literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/filecomp_diffpane1.png b/Docs/Users/Manual/screenshots/filecomp_diffpane1.png new file mode 100644 index 0000000000000000000000000000000000000000..9c7abe9c0dde7f285befd58575651d4c86931986 GIT binary patch literal 5990 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 literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/filemerged1.png b/Docs/Users/Manual/screenshots/filemerged1.png index 0362c537307e1f0adc35cf677e5e99edec137af9..65e0e80da63152a15cdcc37419be24f87a4542ad 100644 GIT binary patch literal 35429 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
    ;R$%JT6PoIl}qeysZ5rG^5Z|*|Q449W_DWHS9yG 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 Uv+;8WfLkPKaRq3Z*ayG=1^D`%TL1t6 literal 28098 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 Date: Mon, 7 Jul 2008 07:59:35 +0000 Subject: [PATCH 005/168] PATCH: [ 2011602 ] Add ShellExtension for drives (root folders) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + ShellExtension/WinMergeShell.rgs | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index acec8b788de..9cd3f2bce4b 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.9.1.6 Manual: Introduction update (#2011365) + Add ShellExtension menu for drive letters (root folders) (#2011602) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/ShellExtension/WinMergeShell.rgs b/ShellExtension/WinMergeShell.rgs index 983c8fb423c..51e1f849216 100644 --- a/ShellExtension/WinMergeShell.rgs +++ b/ShellExtension/WinMergeShell.rgs @@ -58,4 +58,15 @@ HKCR } } } -} \ No newline at end of file + + NoRemove Drive + { + NoRemove ShellEx + { + NoRemove ContextMenuHandlers + { + ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}' + } + } + } +} From 7134b83e087c54d109765ef6c7e9d8ec7809341a Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 7 Jul 2008 12:52:18 +0000 Subject: [PATCH 006/168] Fix ifdef for debug code (we have _DEBUG). Trunk commit r5568. --HG-- branch : R2_10 --- Src/CompareEngines/DiffUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/CompareEngines/DiffUtils.cpp b/Src/CompareEngines/DiffUtils.cpp index 81f2e0f6adf..2c39560cc7e 100644 --- a/Src/CompareEngines/DiffUtils.cpp +++ b/Src/CompareEngines/DiffUtils.cpp @@ -133,7 +133,7 @@ int DiffUtils::diffutils_compare_files() making them a hunk, and remember the rest for next iteration. */ next = end->link; end->link = 0; -#ifdef DEBUG +#ifdef _DEBUG debug_script(thisob); #endif From 32004591a0b2e6b941d04bcd2bec95294b26817c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 9 Jul 2008 08:23:47 +0000 Subject: [PATCH 007/168] PATCH: [ 2011924 ] Reorganize help components Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/Manual/About_Doc.xml | 4 +- Docs/Users/Manual/Command_line.xml | 8 +- Docs/Users/Manual/Compare_dirs.xml | 72 ++++----- Docs/Users/Manual/Compare_files.xml | 96 ++++++------ Docs/Users/Manual/Configuration.xml | 172 ++++++++++----------- Docs/Users/Manual/Faq.xml | 36 ++--- Docs/Users/Manual/Filters.xml | 24 +-- Docs/Users/Manual/Install.xml | 32 ++-- Docs/Users/Manual/Intro_diffs.xml | 24 +-- Docs/Users/Manual/Locales.xml | 20 +-- Docs/Users/Manual/Open_paths.xml | 52 +++---- Docs/Users/Manual/Plugins.xml | 116 +++++++------- Docs/Users/Manual/Quick_start.xml | 20 +-- Docs/Users/Manual/Text_encoding.xml | 12 +- Docs/Users/Manual/Version_control.xml | 8 +- Docs/Users/Manual/WinMerge_help.xml | 8 +- Docs/Users/Manual/build/build_html.xsl | 5 +- Docs/Users/Manual/build/build_htmlhelp.xsl | 1 + Docs/Users/Manual/css/all.css | 26 +++- 20 files changed, 381 insertions(+), 356 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 9cd3f2bce4b..cd06a83d080 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.9.1.6 Manual: Introduction update (#2011365) + Manual: Reorganize structure (#2011924) Add ShellExtension menu for drive letters (root folders) (#2011602) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index bc5b53bec5f..4e26aafe6ed 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -1,5 +1,5 @@ - +
    About this document This document is the user manual for WinMerge 2.8. It explains the capabilities and limitations of WinMerge. This manual is recommended reading for both new and experienced users. @@ -85,4 +85,4 @@ - +
    diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml index eeb784f1c9f..f75e1350745 100644 --- a/Docs/Users/Manual/Command_line.xml +++ b/Docs/Users/Manual/Command_line.xml @@ -1,5 +1,5 @@ - +
    <indexterm> <primary>Command line</primary> </indexterm>Command Line @@ -199,7 +199,7 @@ resolved" about these three files. And those paths should be given in that order for WinMerge. - +
    Conflict File Conflict file can be given to command line as one path to the @@ -207,5 +207,5 @@ After WinMerge opens the given conflict file, it can be resolved like described in Resolving Conflict Files. - - \ No newline at end of file +
    +
    diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index 4dd7337da2f..10606670049 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -1,5 +1,5 @@ - +
    Comparing Folders The Folder compare window displays all of the files and subfolders @@ -56,7 +56,7 @@ big text files) it can be changed via registry value: HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit. As usual be careful when changing values directly to registry! - +
    <indexterm> <primary>Folder Compare Result</primary> </indexterm>Compare Results @@ -137,9 +137,9 @@ Aborted item. WinMerge did not finish comparing this item when compare was stopped. Result is unknown. - +
    - +
    Folder Compare Status During the folder comparison WinMerge shows status panel: @@ -187,9 +187,9 @@ Compare Statistics . - +
    - +
    Selecting Items to Show In "View" menu there are several choices for @@ -226,9 +226,9 @@ hides files and directories filtered out by file filters - +
    - +
    <indexterm> <primary>Folder Compare Columns</primary> </indexterm>Columns in Folder Compare @@ -334,9 +334,9 @@ style (linefeed style) of files. - +
    - +
    Browsing Folders Browsing folders is only possible when subfolders are not included @@ -375,7 +375,7 @@ folder. This can be used in situation explained in previous paragraph when there is same folder compared as both sides. - +
    <indexterm> <primary>Open Unique Folders</primary> </indexterm>Unique Folders @@ -400,10 +400,10 @@ menu. WinMerge shows a message asking if the missing folder should be created. Answer Yes to create the folder, or No to cancel the action. - - +
    +
    - +
    Navigation in Folder Compare In addition moving selection using mouse or keyboard, also @@ -417,12 +417,12 @@ Multiple files/folders can be selected. However not all operations are possible with multi-selection. - +
    - +
    File Operations in Folder Compare - +
    Copying, moving and deleting Folder compare allows user to copy and delete files and folders. @@ -462,9 +462,9 @@ File/folder deletion cannot be undone if Recycle Bin is not used! - +
    - +
    Renaming Renaming files and folders is available through context menu item @@ -473,9 +473,9 @@ cancelled by pressing Esc -key. Note that items in both sides are renamed. Renaming just other side is not currently possible. - +
    - +
    Opening files There are three items in Open-menus: @@ -505,9 +505,9 @@ folder is selected usually opens that folder into new Explorer window. - +
    - +
    Archiving Zip-menu in directory compare context menu @@ -566,10 +566,10 @@ file. But WinMerge does not update archive contents for files added/deleted/copied. User can create a new archive file using above menuitems instead. - - +
    +
    - +
    Copying Path- or Filenames In context menu there are items for copying selected items' paths or @@ -588,9 +588,9 @@ filenames without paths. - +
    - +
    Customising Folder Compare There are many ways to customize folder compare: @@ -614,9 +614,9 @@ dropping column names with mouse. - +
    - +
    Protecting Folders / Read-only Folders If user wants to protect one or both sides from changes, user can @@ -634,9 +634,9 @@ Protection status is shown in statusbar, there are own panes for left and right side. - +
    - +
    <indexterm> <primary>Hiding Files and Folders</primary> </indexterm>Hiding Items @@ -654,9 +654,9 @@ So when you have merged files, use context menu item to hide them. It is a lot easier to see what items are left to merge. Get used to it! It saves your time! - +
    - +
    Refreshing Only Selected Items Full refresh of large folders can take a long time. In 2.2 and @@ -668,5 +668,5 @@ Refresh Selected from the main menu. - - \ No newline at end of file +
    +
    diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index 1ce609e0d1d..453ef949285 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -1,5 +1,5 @@ - +
    Comparing Files File compare window is basically two files opened to editor into two @@ -29,7 +29,7 @@ refresh is recommended after editing. - +
    Showing the Differences WinMerge uses different (user configurable) colors to highlight and @@ -37,9 +37,9 @@ background and missing lines with gray background. If user selects the difference, it is shown with red background and missing lines with milder red. - +
    - +
    Tabs WinMerge can show open windows in tab bar below toolbar. Tab bar can @@ -50,9 +50,9 @@ . When the tab bar is shown it has one tab for every open window. The tab contains last part of the folder names or file names. - +
    - +
    File Headerbar The file headerbar has several functionalities. See screenshot @@ -82,9 +82,9 @@ Headerbar has a context menu with items to copy full path or filename to clipboard. - +
    - +
    Statusbar @@ -173,9 +173,9 @@ difference (X) - +
    - +
    Editor Margin The editor panes (file panes) have optional gray margin area for @@ -230,9 +230,9 @@ that with linenumbers the margin width is set so that the longest line number fits into it. So with large files with lots of lines it needs space for several numbers. - +
    - +
    <indexterm> <primary>Difference Navigation</primary> @@ -248,7 +248,7 @@ </imageobject> </inlinemediaobject></para> - <sect3> + <section> <title>Selecting a difference Before difference can be merged, it must be selected. Selecting @@ -265,9 +265,9 @@ Current Difference. - +
    - +
    Navigating differences Merge-menu has items for navigating to @@ -280,9 +280,9 @@ When difference is selected with navigation commands cursor is moved to begin of first line of difference. In both files. - +
    - +
    <guimenuitem>Current Difference</guimenuitem>-command This command has two important functions: @@ -299,9 +299,9 @@ contents and quickly return back to selected difference. - +
    - +
    Go To line or difference Using Go To from @@ -315,10 +315,10 @@ using Find or difference navigation it is faster to jump to first line of difference. - - +
    + - +
    <indexterm> <primary>Merging Differences</primary> </indexterm>Merging Differences @@ -377,9 +377,9 @@ linkend="Configuration">Options & Configuration -chapter for more information. - +
    - +
    <indexterm> <primary>Merge Mode</primary> </indexterm>Merge Mode @@ -420,9 +420,9 @@ When merge mode is enabled Merge text is shown in statusbar. - +
    - +
    Refreshing Refreshing updates differences after changes are made to files. It @@ -433,9 +433,9 @@ updated files etc, those changes are not seen. Refresh updates differences according changes user has done. - +
    - +
    View Whitespaces When enabled from View menu View @@ -444,9 +444,9 @@ spaces in other file and tabulators in other. Also, if Preserve original EOL chars is enabled, WinMerge shows type of EOL (Windows/Unix/Mac). - +
    - +
    Editing Files Normal editing features work in WinMerge editor. User can type and @@ -455,9 +455,9 @@ only in other side). Anyway these customisations are not usually visible to users otherwise that lines can sometimes "jump" when WinMerge has to relocate matching/non-matching files. - +
    - +
    Line Difference Highlight WinMerge can automatically highlight all differences it finds in @@ -488,9 +488,9 @@ and Editor page). See Options & Configuration -chapter for more information. - +
    - +
    Line Difference Selection Many times it is useful to see exact differences inside lines. @@ -505,9 +505,9 @@ - +
    - +
    Location Pane Location pane is a handy side-pane showing a overall (difference) @@ -546,9 +546,9 @@ background color) can be used like a scrollbar thumb - after pressing down the left mouse button over it can be dragged upwards and downwards to scroll the files. - +
    - +
    Context Menu File compare context menu contains items for frequently used @@ -565,9 +565,9 @@ (system) registered application or with external editor. Also context menu merge-commands are not relative to active file. They always merge the selected difference. - +
    - +
    Fonts Font used by editor can be changed from @@ -603,9 +603,9 @@ fixed-width mode) - +
    - +
    <indexterm> <primary>Conflict Files</primary> </indexterm>Resolving Conflict Files @@ -617,7 +617,7 @@ compare. So conflicted file can be resolved using normal WinMerge file compare functionality. - +
    Opening Conflict Files Conflict files can be opened into WinMerge using @@ -633,9 +633,9 @@ wanted to save, it must be copied to another folder or another filename before opening it into WinMerge. - +
    - +
    Conflict Resolving WinMerge opens conflict file into normal file compare (see above). @@ -673,6 +673,6 @@ command line parameters. See more info from Command Line -chapter. Single path to the conflict file is also accepted in command line. - - - \ No newline at end of file +
    +
    +
    diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index 27dd8154557..7e4954a2f3c 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -1,5 +1,5 @@ - +
    Options & configuration Options dialog can be opened from Edit-menu or from @@ -7,10 +7,10 @@ OK-button (or pressing Enter-key). - +
    General options - +
    Automatically scroll to first difference When this option is enabled: @@ -26,9 +26,9 @@ is scrolled visible and selected. - +
    - +
    <indexterm> <primary>Disabling splash screen</primary> </indexterm>Disable splash screen @@ -36,9 +36,9 @@ User can disable splash screen appearing when WinMerge is started. It does not make WinMerge start faster (splash screen can be missed by clicking it with mouse) but it saves one click. - +
    - +
    <indexterm> <primary>Esc key</primary> @@ -54,9 +54,9 @@ <para>Note that -e command line parameter overrides this option. If -e parameter is given in command line, WinMerge closes with one <keycap>ESC</keycap> key press.</para> - </sect3> + </section> - <sect3> + <section> <title>Automatically verify paths in Open-dialog When enabled: Open-dialog checks both paths given for validity and @@ -69,9 +69,9 @@ message is shown if path is not valid. This is faster to use, there is no any delay in enabling OK. But user must look at error-dialogs. - +
    - +
    <indexterm> <primary>Single-instance</primary> </indexterm>Allow only one instance to run @@ -81,9 +81,9 @@ open with paths, new paths replace existing ones in previous instance. Or, if multiple compare window support is enabled new compare windows are opened for new paths. (See below.) - +
    - +
    Open-dialog Auto-Completion This option allows user to enable auto-completion for Open-dialog @@ -102,9 +102,9 @@ (usually in MRU lists) to compare. - +
    - +
    Enable multiple compare windows for Allows opening multiple folder or file compare windows into one @@ -118,9 +118,9 @@ can open one file compare window for every folder compare window. - +
    - +
    Reset messageboxes (Reset-button) WinMerge allows user to hide (suppress) some common messageboxes. @@ -139,10 +139,10 @@ installer is not used then it should be done using this Reset button. - - +
    +
    - +
    Compare options Several compare options allow to ignore some specific type of @@ -162,7 +162,7 @@ merging files! - +
    <indexterm> <primary>Ignore whitespace characters</primary> </indexterm>Whitespace @@ -200,33 +200,33 @@ No spaces between words:TwoWords - +
    - +
    Ignore blank lines Ignores differences that have only blank (empty) lines. Blank lines are shown in file view, but difference is shown with ignored difference colors and it cannot be merged. - +
    - +
    Ignore case If this option is enabled WinMerge ignores differences between lowercase and uppercase letters. For example "LowerCase" and "LOWERCASE" and "lowercase" are same. - +
    - +
    Ignore carriage return differences (Windows/Unix/Mac) If this option is not set WinMerge does not detect EOL style differences as differences. If two lines differ only by EOL characters (e.g. Windows EOL and Unix EOL) WinMerge detects files as identical. - +
    - +
    Enable moved block detection When this option is enabled WinMerge tries to detect lines that @@ -234,9 +234,9 @@ location pane can show moved lines with line between bars. This makes it easier to visualise changes in files. However if there are a lot of moved lines it may get messy looking. - +
    - +
    Ignore time differences less than 3 seconds Only for "Modified Date" and @@ -253,9 +253,9 @@ This option should be enabled only when the time difference is detected. Otherwise it can cause wrong compare results. - +
    - +
    File compare method File compare method has five choices: @@ -302,9 +302,9 @@ not so accurate like the contents methods. - +
    - +
    Stop after first difference @@ -320,13 +320,13 @@ enable this if you don't know which kind of files you are comparing. If you know your files then this is a nice way to make compare even faster. - - +
    +
    - +
    Editor options - +
    Syntax highlighting From Editor-page user can enable/disable @@ -334,9 +334,9 @@ language source codes, web formats etc. Syntax highlighting consumes some processing power, so if WinMerge screen updating seems to be slow, turning off this option might help. - +
    - +
    <indexterm> <primary>Automatic rescan</primary> </indexterm>Automatic rescan @@ -358,9 +358,9 @@ WinMerge 2.2 release delays more edit events than 2.0.x releases, so selecting between automatic and manual rescan is mostly a matter of taste. - +
    - +
    Preserve original EOL chars @@ -405,9 +405,9 @@ EOL differences. fixing, file might be handled in systems with different EOL styles (e.g. Windows and Unix). In that case, user can set this option and see WinMerge showing EOL style for every line. - +
    - +
    Tab options From General-page user can set size tabulator @@ -416,9 +416,9 @@ EOL differences. Another selection is if user wants WinMerge to add tab characters or spaces (amount specified by tab size -option) when Tab-key is pressed. - +
    - +
    <indexterm> <primary>Highlighting line differences</primary> </indexterm>Line Difference Coloring @@ -472,30 +472,30 @@ EOL differences. WinMerge would highlight whole lines when using Break at whitespace but only numbers 20/25 and 40/25 when using Break at whitespace or punctuation. - - +
    +
    - +
    System options - +
    Send deleted files to Recycle Bin When this options is enabled files and folders deleted in directory compare are moved to Recycle Bin. Note that use of Recycle Bin may have disabled from system. - +
    - +
    Add to explorer context menu This option enables/disables shell integration. When enabled, new menuitem WinMerge is added to explorer's context menu. User can select one or two files/folders and then select that menuitem to open files/folders to WinMerge. - +
    - +
    Enable advanced menu If this option is enabled there are two items shown in explorer's @@ -507,9 +507,9 @@ EOL differences. Second item (Compare...) in menu always opens WinMerge with selected path(s). - +
    - +
    Include subfolders by default Shell Integration by default does not include subfolders into @@ -518,9 +518,9 @@ EOL differences. Control key while selecting the Compare... item from the Explorer context menu. - +
    - +
    <indexterm> <primary>Configuring external editor</primary> </indexterm>External editor @@ -540,9 +540,9 @@ EOL differences. - +
    - +
    Filter Folder @@ -553,10 +553,10 @@ EOL differences. filters. By default this folder is user's My Documents folder. When new private file filter is created, it is automatically added to this folder. - - +
    +
    - +
    <indexterm> <primary>Backup files</primary> </indexterm>Backup Files @@ -564,16 +564,16 @@ EOL differences. This page allows user to select several backup-files related options. - +
    Create backup files in Selects if backup files are created for folder- and file-compares. In file compare backup files are created whenever files are saved. In folder compare backup files are created whenever files are written over (copied). - +
    - +
    Create backup files into Selects where backup files are created. The default is to create @@ -585,9 +585,9 @@ EOL differences. backup files are created. This allows easy cleanup of backup files. But if there are many files with same filename in different folders, then those files use the same backup file. - +
    - +
    Backup filename The default is to append a .bak extension to @@ -600,16 +600,16 @@ EOL differences. basically this allows tracking the work with the file as every time the file is saved, new backup copy is created. Beware that this can cause a lot of files to be created. - - +
    +
    - +
    Archive Support This page contains download link to 7-zip plugin and contains option related to archive support. - +
    Enable archive file support Enables or disables archive file support (based on 7-Zip @@ -618,9 +618,9 @@ EOL differences. Like described in Installation section of this manual, there are two different methods how 7-zip can be integrated. Integration method can be changed using this option dialog after install. - +
    - +
    Detect archive type from file signature Enabling this option allows WinMerge to recognize archive files @@ -632,17 +632,17 @@ EOL differences. Enabling this option allows WinMerge to recognize and for example Open Office files. - - +
    +
    - +
    Codepage options These options allow selecting codepage WinMerge uses for ANSI files and if codepage should be read from file contents for specific file formats. - +
    Default codepage for ANSI files These three radiobuttons can be used to select default codepage @@ -658,9 +658,9 @@ EOL differences. changes to files when saving them. Select codepage before loading the files. - +
    - +
    Detect codepage info for these files: .html .rc .xml @@ -696,10 +696,10 @@ EOL differences. copying to WinMerge, Internet Explorer offers codepage selection). - - +
    +
    - +
    Import and Export of options Options can be exported to and imported from file. Currently @@ -707,5 +707,5 @@ EOL differences. by selecting the Export... button. WinMerge asks for location and filename and then saves the file. Importing is done by selecting the Import... -button. - - \ No newline at end of file +
    +
    diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml index 68d26b01d4b..022d6d42052 100644 --- a/Docs/Users/Manual/Faq.xml +++ b/Docs/Users/Manual/Faq.xml @@ -1,8 +1,8 @@ - +
    Frequently asked questions - +
    General questions @@ -204,9 +204,9 @@ - +
    - +
    Installing @@ -223,9 +223,9 @@ - +
    - +
    File Comparing @@ -247,9 +247,9 @@ - +
    - +
    Questions about editor @@ -341,9 +341,9 @@ - +
    - +
    WinMerge as external compare or diff-tool @@ -407,9 +407,9 @@ - +
    - +
    Archive support @@ -474,9 +474,9 @@ - +
    - +
    Text encoding (codepages) @@ -579,9 +579,9 @@ - +
    - +
    Patch files @@ -615,5 +615,5 @@ - - \ No newline at end of file +
    +
    diff --git a/Docs/Users/Manual/Filters.xml b/Docs/Users/Manual/Filters.xml index 085206a77ad..1d66bf59980 100644 --- a/Docs/Users/Manual/Filters.xml +++ b/Docs/Users/Manual/Filters.xml @@ -1,12 +1,12 @@ - +
    Filters There are two kinds of filters in WinMerge: file filters for filtering files and folders in folder compare and line filters for ignoring lines from files before comparing. - +
    Regular expressions Filters are based on regular expressions (regexps). Each line filter @@ -21,7 +21,7 @@ regular expression engine. There are lots of resources for help with Perl regular expression. - +
    Help with regexps There are many guides and help sites in Web, for example: @@ -63,10 +63,10 @@ - - +
    +
    - +
    File filters A file filter is a set of rules saved to one file. Every file and @@ -97,7 +97,7 @@ one does not care about the file, WinMerge tries to minimize the effort and time for the file. - +
    Filter files Filter files are normal text files, with an extension of character (space or tabulator) and comment-marker (##). ## can be used as part of rule if there is no whitespace character before it. - - +
    +
    - +
    Line filters Line filters can be used to ignore single lines from compared files. @@ -327,5 +327,5 @@ f: ^[h,k,m] ## h*.* & k*.* & m*.* files ^# - - +
    +
    diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index 242ecd2cdd5..d2b0db2870c 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -1,5 +1,5 @@ - +
    Getting and installing WinMerge WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method. @@ -8,13 +8,13 @@ Currently the WinMerge installer works natively only for 32-bit Windows. There is no separate version of WinMerge for 64-bit Windows (WinXP/2003/Vista). 64-bit Windows versions can run the installer and WinMerge as 32-bit applications. For the shell Integration, the installer includes the 64-bit version of the extension. - +
    Getting files The latest release can be always downloaded from the WinMerge home page: WinMerge.org. Note that delays can occur in updating home pages for the latest releases, but the project status page at SourceForge.net shows the latest files. There is also a mailing list for release announcements. Stable releases are also available in several file download sites. - +
    - +
    Using the installer (recommended) @@ -164,9 +164,9 @@ After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder should be opened, and whether the WinMerge application should be started. - +
    - +
    Installing from an archive WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs. @@ -180,9 +180,9 @@ Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, the root folder created under C:\Program Files\ has the name, WinMerge-version (for example, WinMerge-2.6.0). You can rename this folder or copy its files to another folder (preserving the folder structure!). After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next section. - +
    - +
    Shell integration The installer enables shell integration when you choose the Enable Explorer context menu integration option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (ShellExtension*.dll) separately. @@ -195,16 +195,16 @@ To register the shell integration DLL (ShellExtension*.dll), run register.bat from the WinMerge directory. We recommend that you restart the computer after installing shell integration, so that Windows updates all its references. - +
    64-bit shell integration Starting with Version 2.6, WinMerge supports 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version. When you install shell integration manually from an archive file, the shell integration DLL is named ShellExtensionX64.dll. You can register and unregister this file by using register.bat and unregister.bat, as with 32-bit versions. - - +
    +
    - +
    <indexterm> <primary>installing archive support</primary> </indexterm>7-Zip and archive support @@ -227,7 +227,7 @@ Archive Support Disabled . - +
    Merge7zInstaller Merge7zInstaller is a stand-alone installer for 7-Zip integration. @@ -289,6 +289,6 @@ - - - +
    +
    +
    diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 00795c7ab90..56914560730 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -1,10 +1,10 @@ - +
    Overview of file comparing and merging This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations. - +
    Comparing files If you compare two files, you can easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge can make this work much easier and more efficient. @@ -15,7 +15,7 @@ It's easy to identify individual lines that are different. But sometimes it is useful to treat an entire block of lines that are different as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too. - +
    Simple compare operation This section offers a simple example that demonstrates how to compare line difference between two files in WinMerge: @@ -164,10 +164,10 @@ Believe it or not. You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences, and there are other ways to compare differences in WinMerge — but it demonstrates the efficiency of using the WinMerge navigation controls. - - +
    +
    - +
    Merging files The purpose of merging is to combine changes from two files into one file. Merging concepts and functions build on the comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single target version. @@ -180,7 +180,7 @@ Believe it or not. Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through each difference. Resolve each difference by copying either its left or right candidate to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging. - +
    Simple merge operation This short exercise demonstrates how use the controls in the File Compare window to merge the simple files shown earlier, in only a few steps: @@ -262,9 +262,9 @@ Believe it or not. to save your changes. - +
    - +
    Choosing a merge result file You control where your merge result is preserved. The WinMerge Compare window does not have a separate result pane, unlike some merge tools. So the simplest strategy is to save your changes in one or both source files. Press @@ -288,6 +288,6 @@ Believe it or not. . For example, your target file might be the difference or conflict file generated by a version control system. Similarly, in the WinMerge command line, you can leave both source versions unchanged by using the optional argument, as described in Command Line. - - - +
    +
    +
    diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 8e20da114b9..9483cf9a283 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -1,5 +1,5 @@ - +
    Locale support WinMerge allows translating the user interface to other languages than @@ -118,7 +118,7 @@ Panel.) - +
    Selecting language In order to change the current user interface language, do the @@ -142,9 +142,9 @@ Note that the WinMerge user interface instantly updates to the selected language. - +
    - +
    Installing translation The easiest way to install translations is to select them in the @@ -193,18 +193,18 @@ OK - +
    - +
    Reporting error in translation Please submit errors you find in translations as bugs to our bug-list. It would be great if you can provide a corrected version of the translated text also. - +
    - +
    Submitting a new translation If you would like to add your language to the list, look at the @@ -216,5 +216,5 @@ from above link. And if you have problems ask help from us in one of WinMerge forums. - - +
    +
    diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 5dbaa570d28..d32ce3802c7 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -1,18 +1,18 @@ - +
    Opening Files and Folders WinMerge allows selecting/opening paths in several ways. Using Open-dialog is just one of them. - +
    Open-Dialog Basic use of Open-dialog is described in Quick start. Here is some more detailed information and tips about how to use Open-dialog more efficiently. - +
    Environment variables Environment variables can be used as (part of) paths. An @@ -27,9 +27,9 @@ %WORKDIR%\project1 is expanded to path c:\workfiles\project1 . - +
    - +
    Opening archive files Archive file support requires 7-Zip plugin to be installed. See @@ -55,9 +55,9 @@ automatically copy the same filename to both sides and open the archive file. - +
    - +
    Filter selection Third edit field in Open dialog is for @@ -93,10 +93,10 @@ WinMerge selects all files (i.e. uses *.* as extension list). - - +
    +
    - +
    <indexterm> <primary>Shell Integration</primary> </indexterm>Shell Integration @@ -124,7 +124,7 @@ Simple WinMerge context menu - +
    Advanced Shell Integration Selecting "Enable advanced menu" for Shell @@ -182,9 +182,9 @@ when you need to compare one file/folder against several files/folders. - +
    - +
    Including Subfolders Shell Integration by default does not include subfolders into @@ -193,10 +193,10 @@ behavior can be also changed by holding down Control -key while selecting Compare-item from the Explorer context menu. - - +
    +
    - +
    <indexterm> <primary>Drag and Drop</primary> </indexterm>Drag and Drop @@ -231,9 +231,9 @@ empty - +
    - +
    <indexterm> <primary>Project Files</primary> </indexterm>Project Files @@ -242,7 +242,7 @@ (and filter). The user can easily save currently open paths as project file for later use. - +
    Opening Project File Project file can be given to command line like normal file or @@ -280,9 +280,9 @@ are compared. - +
    - +
    Editing and Saving Project File Project files can be edited and saved using Project @@ -302,9 +302,9 @@ Project File -dialog - +
    - +
    Format Project files are simple XML files with None of the fields are required and they can be empty (<left></left>). - - - \ No newline at end of file +
    +
    +
    diff --git a/Docs/Users/Manual/Plugins.xml b/Docs/Users/Manual/Plugins.xml index b3fd0a447bb..b64d7dc1428 100644 --- a/Docs/Users/Manual/Plugins.xml +++ b/Docs/Users/Manual/Plugins.xml @@ -1,5 +1,5 @@ - +
    Plugins Plugins are extra-features for WinMerge. They are not included in the @@ -26,14 +26,14 @@ - +
    Three categories of plugins "Plugins" is a generic name for extra-feature dll or scriptlets. Plugins features are spread over three categories: - +
    Editor complement Operate custom operations on the currently selected text from the @@ -42,9 +42,9 @@ Example plugin: editor addin.sct (Turn the selection to UPPER CASE or lower case.) - +
    - +
    Unpacker - Transform a file to a text format The plugin transform a file in a viewable format (for example, @@ -71,9 +71,9 @@ linkend="DisplayXMLFiles">DisplayXMLFiles.dll (Display XML files nicely, by consistently inserting tabs and linebreaks.) - +
    - +
    Prediffer - Preprocess files to hide some differences The plugin is not apply to the files displayed in the editor. It @@ -84,13 +84,13 @@ linkend="IgnoreColumns">IgnoreColumns.dll (Ignore the differences inside given columns, while displaying the characters in these columns.) - - +
    +
    - +
    Select and apply a plugin - +
    "<guilabel>Suggested plugin</guilabel>" and "<guilabel>Automatic mode</guilabel>" @@ -109,15 +109,15 @@ "Auto prediffer" are two separate options. There is no option for editor complements. - +
    - +
    Editor complement in folder view Not available - +
    - +
    Editor complement in editor view Access list from @@ -127,9 +127,9 @@ ... in the main menu. - +
    - +
    Unpacker in folder view Check @@ -139,9 +139,9 @@ in the main menu. You need to update the results (F5). Each file is loaded again with its suggested unpacker and compared. - +
    - +
    Unpacker in editor view @@ -177,9 +177,9 @@ view. - +
    - +
    Prediffer in folder view When the files are selected, right-click to open the context menu. @@ -199,9 +199,9 @@ non-recursive compare, the mode is always reset to "No prediffer". - +
    - +
    Prediffer in editor view @@ -225,13 +225,13 @@ compared again after the selection, you don't need to rescan. - - +
    +
    - +
    Available plugins - +
    <filename>CompareMSExcelFiles.dll</filename> Displays the text content of a - +
    - +
    <filename>CompareMSWordFiles.dll</filename> Displays the text content of a - +
    - +
    <filename>DisplayXMLFiles.dll</filename> This plugin display XML files nicely, by consistently inserting @@ -317,9 +317,9 @@ No - +
    - +
    <filename>editor addin.sct</filename> Add two functions to the @@ -347,9 +347,9 @@ Editor complement - +
    - +
    <filename>IgnoreColumns.dll</filename> The plugin ignore the characters at specified columns. It does not @@ -414,9 +414,9 @@ *.txt - +
    - +
    <filename>IgnoreCommentsC.dll</filename> The plugin ignores comments (//... and @@ -440,9 +440,9 @@ class="extension">*.js, - +
    - +
    <filename>IgnoreFieldsComma.dll</filename> The plugin is for files with fields and comma @@ -463,9 +463,9 @@ *.csv - +
    - +
    <filename>IgnoreFieldsTab.dll</filename> The plugin is for files with fields and @@ -488,9 +488,9 @@ *.txt - +
    - +
    <filename>IgnoreLeadingLineNumbers.dll</filename> This plugin ignores the leading line numbers in text files (for @@ -512,9 +512,9 @@ Basic runtime library - +
    - +
    <filename>insert datetime.sct</filename> Add two functions to the @@ -542,9 +542,9 @@ Editor complement - +
    - +
    <filename>RCLocalizationHelper.dll</filename>, <filename>RCLocalizationHelperU.dll</filename> @@ -566,9 +566,9 @@ *.rc - +
    - +
    <filename>WatchBeginningOfLog.dll</filename>, <filename>WatchEndOfLog.dll</filename> @@ -606,13 +606,13 @@ Developers may find information and code of examples in the source package, under the folder "Plugins". - - +
    +
    - +
    Requirements - +
    Windows Script Host Some editor complements need this optional component from @@ -625,9 +625,9 @@ MSDN Library. - +
    - +
    <application>Visual Basic</application> runtime library Some plugins require Visual Basic @@ -640,6 +640,6 @@ Redistribution Pack from Microsoft. If you don't need the plugin, you can safely remove it. - - - +
    +
    +
    diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index 0cdafd45b98..6dd1cec3ccf 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -1,8 +1,8 @@ - +
    Quick start - +
    <indexterm> <primary>Open dialog</primary> </indexterm>Opening files and folders @@ -165,7 +165,7 @@ - +
    Other ways to open files and folders The Select Files or Folders dialog is the main interface for opening files and folders. But you can use many other ways, too: @@ -211,10 +211,10 @@ You can drag and drop files and folders directly into the WinMerge window or on the WinMerge desktop shortcut. - - +
    +
    - +
    Comparing folders @@ -260,9 +260,9 @@ up arrow at the top of the Filename column. If you compare a file, WinMerge opens File Compare window with a new tab, as shown in the figure in the next section. Then, if you make changes in the File Compare window, the file's data is updated in the Folder Compare window. - +
    - +
    Comparing files @@ -290,5 +290,5 @@ Refresh button toolbar button, or pressing F5. - - +
    +
    diff --git a/Docs/Users/Manual/Text_encoding.xml b/Docs/Users/Manual/Text_encoding.xml index c5a4840354b..d403e6beabc 100644 --- a/Docs/Users/Manual/Text_encoding.xml +++ b/Docs/Users/Manual/Text_encoding.xml @@ -1,6 +1,6 @@ - +
    Text Encoding (codepages) - +
    Common scenarios @@ -31,8 +31,8 @@ or a western European language, you may get by with You should use WinMergeU.exe (if you are on NT/2000/XP/2003) in order to correctly display double-wide characters. See the Font section for font recommendations. If you are on Win95/98/ME, then you may attempt to view the files in WinMerge.exe, but it is recommended that you do not attempt to merge them. - - +
    +
    Explanation Characters (such as "a" or "1" or "&") are represented by computers as numbers, and there is more than one way to do this. A text encoding method is a way to encode the characters into the numbers (bytes) of which a file is comprised. There are four main text encoding families: @@ -76,5 +76,5 @@ or a western European language, you may get by with Each character may be one, two, three, four, five, or six bytes in the file. This supports the full range of Unicode 3.x. - - +
    +
    diff --git a/Docs/Users/Manual/Version_control.xml b/Docs/Users/Manual/Version_control.xml index 60f3822d7cb..a75348b690c 100644 --- a/Docs/Users/Manual/Version_control.xml +++ b/Docs/Users/Manual/Version_control.xml @@ -1,5 +1,5 @@ - +
    Version control integration WinMerge provides basic integration with Visual SourceSafe and @@ -13,7 +13,7 @@ version control integration is enabled WinMerge assumes file is version controlled and shows checkout dialog. - +
    Visual SourceSafe To enable Visual SourceSafe integration for version controlled @@ -96,5 +96,5 @@ Your connection to the VSS server computer may be hosed - - +
    +
    diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index e9e347a618e..ba603133547 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -19,8 +19,8 @@ ]> -
    - + + WinMerge 2.8 Manual WinMerge @@ -75,7 +75,7 @@ and all others who helped with this. - + &AboutDoc; @@ -112,4 +112,4 @@ &ShortCuts; -
    + diff --git a/Docs/Users/Manual/build/build_html.xsl b/Docs/Users/Manual/build/build_html.xsl index 5e7eefe950e..49b7273df08 100644 --- a/Docs/Users/Manual/build/build_html.xsl +++ b/Docs/Users/Manual/build/build_html.xsl @@ -12,7 +12,10 @@ - + + + book toc,title article noop + 1 diff --git a/Docs/Users/Manual/build/build_htmlhelp.xsl b/Docs/Users/Manual/build/build_htmlhelp.xsl index 3ed684d35db..a316cd6f1f8 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.xsl +++ b/Docs/Users/Manual/build/build_htmlhelp.xsl @@ -12,6 +12,7 @@ css/help.css + diff --git a/Docs/Users/Manual/css/all.css b/Docs/Users/Manual/css/all.css index 1db6345791c..fcfb809e1a8 100644 --- a/Docs/Users/Manual/css/all.css +++ b/Docs/Users/Manual/css/all.css @@ -34,13 +34,32 @@ div.navfooter { border-bottom: 1px solid black; } +div.navheader>table>tbody>tr>th { + display:none; +} + div.article, -div.sect1, +div.section, div.appendix, div.index { padding: 5px; } +/* topic title */ +div.article>div>div>div>h2 { + font-size: 160%; + text-align: center; + color: #3333cc; +} + +div.section h2 { + font-size: 140%; +} + +div.section h3 { + font-size: 120%; +} + #ads { padding-top: 10px; text-align: center; @@ -157,9 +176,10 @@ div.index { margin-top: 0; } -.toc .sect1, +/*.toc .sect1,*/ +.toc .article, .toc .appendix, .toc .index { font-size: 120%; font-weight: bold; -} \ No newline at end of file +} From 3ed7d0347a159d09c5e15f02ebbc1d88ae3f73c6 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 9 Jul 2008 09:17:38 +0000 Subject: [PATCH 008/168] PATCH: [ 2008581 ] Convert paths using system codepage Fixed memory handling, problem(s) noticed by Jochen --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/AnsiConvert.cpp | 36 ++++++++++++++++++++++++++---------- Src/DiffFileData.cpp | 3 ++- Src/DiffWrapper.cpp | 4 ++-- Src/DirCmpReport.cpp | 2 ++ 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index cd06a83d080..8463097dde1 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.9.1.6 Manual: Introduction update (#2011365) Manual: Reorganize structure (#2011924) Add ShellExtension menu for drive letters (root folders) (#2011602) + BugFix: Use system codepage for paths (#1979429, #2008581) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/AnsiConvert.cpp b/Src/AnsiConvert.cpp index e967638f5b8..ba896a9416f 100644 --- a/Src/AnsiConvert.cpp +++ b/Src/AnsiConvert.cpp @@ -7,7 +7,9 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include + +static LPCSTR convert(LPCTSTR str, UINT codepage); /** * @brief Convert from Unicode to Ansi using system codepage. @@ -19,13 +21,7 @@ */ LPCSTR ansiconvert_SystemCP(LPCTSTR str) { - // These lines replace USES_CONVERSION macro - int _convert = 0; - UINT _acp = GetACP(); - LPCWSTR _lpw = 0; - LPCSTR _lpa = 0; - - return T2CA(str); + return convert(str, CP_ACP); } /** @@ -37,8 +33,28 @@ LPCSTR ansiconvert_SystemCP(LPCTSTR str) */ LPCSTR ansiconvert_ThreadCP(LPCTSTR str) { - USES_CONVERSION; - return T2CA(str); + return convert(str, CP_THREAD_ACP); } +/** + * @brief Convert from Unicode to Ansi using given codepage. + * @param [in] str String to convert. + * @param [in] codepage Codepage to use in conversion. + * @return Ansi string. + */ +LPCSTR convert(LPCTSTR str, UINT codepage) +{ +#ifndef UNICODE + return str; +#else + int len = WideCharToMultiByte(codepage, 0, str, -1, 0, 0, 0, 0); + if (len) + { + char * ansi = (char *)malloc(len); + WideCharToMultiByte(codepage, 0, str, -1, ansi, len, NULL, NULL); + return ansi; + } + return NULL; +#endif +} diff --git a/Src/DiffFileData.cpp b/Src/DiffFileData.cpp index cf4eba383d6..baf30ca314d 100644 --- a/Src/DiffFileData.cpp +++ b/Src/DiffFileData.cpp @@ -87,7 +87,7 @@ bool DiffFileData::DoOpenFiles() // Actual paths are m_FileLocation[i].filepath // but these are often temporary files // Displayable (original) paths are m_sDisplayFilepath[i] - m_inf[i].name = strdup(ansiconvert_SystemCP(m_sDisplayFilepath[i])); + m_inf[i].name = ansiconvert_SystemCP(m_sDisplayFilepath[i]); if (m_inf[i].name == NULL) return false; @@ -241,3 +241,4 @@ bool DiffFileData::Filepath_Transform(FileLocation & fpenc, const String & filep + diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp index 71498305f6e..69601477473 100644 --- a/Src/DiffWrapper.cpp +++ b/Src/DiffWrapper.cpp @@ -1202,8 +1202,8 @@ void CDiffWrapper::WritePatchFile(struct change * script, file_data * inf) path2 = m_s2File; replace_char(&*path1.begin(), '\\', '/'); replace_char(&*path2.begin(), '\\', '/'); - inf_patch[0].name = strdup(ansiconvert_SystemCP(path1.c_str())); - inf_patch[1].name = strdup(ansiconvert_SystemCP(path2.c_str())); + inf_patch[0].name = ansiconvert_SystemCP(path1.c_str()); + inf_patch[1].name = ansiconvert_SystemCP(path2.c_str()); outfile = NULL; if (!m_sPatchFile.IsEmpty()) diff --git a/Src/DirCmpReport.cpp b/Src/DirCmpReport.cpp index ce8c17da784..949167e5d53 100644 --- a/Src/DirCmpReport.cpp +++ b/Src/DirCmpReport.cpp @@ -236,6 +236,7 @@ void DirCmpReport::WriteString(LPCTSTR pszText) cchAhead -= cchLine; } m_pFile->Write(pchOctets, cchAhead); + free((void*)pchOctets); } /** @@ -433,3 +434,4 @@ void DirCmpReport::GenerateXmlFooter() WriteString(_T("\n")); } + From 4d99ac455076e55a11a3b4e551aef62fc9d8f5fd Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 9 Jul 2008 09:25:27 +0000 Subject: [PATCH 009/168] PATCH: [ 2013576 ] Remove BuildAll.bat --HG-- branch : R2_10 --- Docs/Developers/Compiling.html | 21 +-------------------- Docs/Users/ChangeLog.txt | 1 + buildall.bat | 20 -------------------- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/Docs/Developers/Compiling.html b/Docs/Developers/Compiling.html index 0a87bfd91bc..14e60e60d26 100644 --- a/Docs/Developers/Compiling.html +++ b/Docs/Developers/Compiling.html @@ -57,7 +57,6 @@

    Compiling WinMerge

    Table of Contents

    1. Environment
      2. -
    2. BuildAll.bat
    3. Project Files
    4. Compiling expat
    5. Compiling SCEW
      6. @@ -141,24 +140,6 @@
      Platform SDK components
      "Visual Studio Registration\Register PSDK directories with Visual Studio" item from the "Platform SDK" start menu folder.

      -

      buildall.bat

      -

      There is a buildall.bat in the root folder of source tree. This batch file invokes -devenv.exe to build (almost) all projects in WinMerge tree. However, it has -a couple -of restrictions: -

        -
      • It cannot convert project files from VS2003 format to newer formats. This must be done first - by opening every project to Visual Studio.
        • -
      • It cannot build 64-bit shell extension
        • -

      - -

      To use buildall.bat: -

        -
      • Open Visual Studio Command Prompt (or run vcvars32.bat from Command Prompt).
        • -
      • Go to root folder of WinMerge folder structure.
        • -
      • Run the batch file.
        • -

      -

      Project files

      Project file for WinMerge executable (in /Src) and other projects like ShellExtension (in /ShellExtension) have their own project files. There is no one @@ -311,4 +292,4 @@

      Visual Studio 2005 & 2008 Manifest File

      Manifests in VS2005-- What are they? -thread in Microsoft forum.

      - \ No newline at end of file + diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 8463097dde1..494f5d43519 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.9.1.6 Manual: Introduction update (#2011365) Manual: Reorganize structure (#2011924) Add ShellExtension menu for drive letters (root folders) (#2011602) + Remove buildall.bat (#2013576) BugFix: Use system codepage for paths (#1979429, #2008581) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/buildall.bat b/buildall.bat index 1700564f7c2..e69de29bb2d 100644 --- a/buildall.bat +++ b/buildall.bat @@ -1,20 +0,0 @@ -: WinMerge build "script" using Visual Studio commandline to build -: all needed WinMerge files. This batch must be run from Visual Studio -: command prompt or vcvars32.bat must be run first! - -: $Id: $ - -@echo off - -: Projects contain proper dependencies, so all needed projects are -: compiled by compiling the main project. Also, WinMerge project file -: calls Src/PreLink.bat and Src/PostBuild.bat to compile all dependent -: libraries and copy files to Build folder. - -: Remove temp files -: expat, scew and pcre also now use BuildTmp -del /S /Q BuildTmp - -: Build WinMerge executables -devenv Src\Merge.dsp /rebuild Release -devenv Src\Merge.dsp /rebuild UnicodeRelease From 9183cb3c1d1c8433871019f312f11d4f26964dfb Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 9 Jul 2008 16:41:43 +0000 Subject: [PATCH 010/168] Fix article id in Intro_diffs.xml. --HG-- branch : R2_10 --- Docs/Users/Manual/Intro_diffs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 56914560730..d37f58656cc 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -1,5 +1,5 @@ -
      +
      Overview of file comparing and merging This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations. From e886cc0eb611bf54376578f2e858b71bee8e3a6b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 9 Jul 2008 20:29:28 +0000 Subject: [PATCH 011/168] PATCH: [ 2014387 ] Fix minor coding errors in help files Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Intro_diffs.xml | 2 +- Docs/Users/Manual/Introduction.xml | 38 ++++++++++++++--------------- Docs/Users/Manual/WinMerge_help.xml | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index d37f58656cc..1a367234ffb 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -94,7 +94,7 @@ Believe it or not. Notice that in the left comparison pane, the second line has text: the other pane has a blank gray line in the same location. This blank line does not exist in the File2 source file, so what is it doing in WinMerge? - WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right versions of differences vertically aligned. Thus in our example, the text, WinMerge compares lines, appears side by side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge than in a conventional editor. + WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right versions of differences vertically aligned. Thus in our example, the text, WinMerge compares lines, appears side by side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge than in a conventional editor. One consequence of the blank lines is that both panes in the File Compare window always display the same total number of lines, even if their source files do not. diff --git a/Docs/Users/Manual/Introduction.xml b/Docs/Users/Manual/Introduction.xml index a932c5cbdd0..4f3be39e2d5 100644 --- a/Docs/Users/Manual/Introduction.xml +++ b/Docs/Users/Manual/Introduction.xml @@ -1,5 +1,5 @@ - +
      Introduction to WinMerge WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle. @@ -14,36 +14,36 @@ Please note that WinMerge is not freeware (as many sites on the Web have stated): it is GPL licensed. We provide you with a good tool for free, so please honor your license agreement and submit improvements to us. We are happy to get help improving WinMerge, to the advantage of all WinMerge users. - +
      WinMerge versions There are three kind of versions available in the downloads page. - +
      <indexterm> <primary>Stable versions</primary> </indexterm>Stable versions Stable versions are recommended for most users. If you are unsure about what version to use, use the latest stable version. Stable versions have an even second number, for example, 2.4, 2.6 and 2.8. - +
      - +
      <indexterm> <primary>Beta versions</primary> </indexterm>Beta versions Beta versions are for people who want to test latest features and improvements made after last stable version. Beta versions are not tested as extensively as stable versions and probably have some bugs. Beta versions have an odd second number, for example 2.5 and 2.7. Beta versions can be used in production, because they are not expected to have major bugs. But there is always a risk with using beta-level releases, so consider it carefully. We have tried to release a new stable series once a year, so it may be worth waiting for few months for the next stable release... - +
      - +
      <indexterm> <primary>Experimental versions</primary> </indexterm>Experimental versions Experimental versions are snapshot releases from our version control system (Subversion). They have all the latest features and improvements. Some features may still be buggy or incomplete. These releases are made available to allow users to try out the current code without needing to compile, and to participate in development discussions concerning new and changing features. We also appreciate any help testing the current code. Use experimental versions with care and enable backups! And please report bugs that you find while using these builds: it really helps with WinMerge development! - +
      - +
      Version tree All this talk about different versions might be confusing if you never have worked with this kind of model. Lets illustrate with a picture: @@ -65,10 +65,10 @@ This branching also means that stable versions don't get many new features after a branch is created. Stable versions 2.6.0 and 2.6.14 had pretty similar features. After the 2.6 stable branch, we created a new stable branch, 2.8, where we added many improvements and fixes. Many software vendors always increase their version numbers and advise people to use the version with the biggest number. If WinMerge were developed as proprietary software, users would see only versions from stable branches. But because WinMerge is an open source software project, we want to keep our development as open as possible and to release many development versions. The latest development version can have version number 2.9.1.0 and the latest stable version can be version 2.6.14. - - +
      +
      - +
      <indexterm> <primary>support</primary> @@ -92,18 +92,18 @@ </important> <para>We prefer that you <ulink url="https://sourceforge.net/account/registration/">register</ulink> with <ulink url="http://sourceforge.net/">SourceForge.net</ulink> before posting a bug report (registration is public and free), so that you receive email notifications if we post follow-up questions to your bug. Registration is not currently required for you to post a bug report. However, we generally give less priority to unregistered bug reports, because it has been our experience that unregistered posters often do not return to answer follow-up questions.</para> - </sect2> + </section> - <sect2> + <section> <title><indexterm> <primary>WinMerge development</primary> </indexterm>WinMerge source code and development WinMerge source code is available in the downloads page and from the public Subversion server. Anyone can download the sources, study them, and alter them. If you find (and fix) bugs, improve something, and so on, please submit your changes to us as patches and help improve this product! If you publish your altered version, you are required to publish the changes to source code too. This is what the GPL license is about: please respect it. - While WinMerge development has been fast in the last couple of years, all this work is done by people in their spare time. Nobody gets paid for improving WinMerge. We try to fix bugs as we find them or when somebody reports them to us. We really try — we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any help with WinMerge, be it testing, documenting, translating, or coding. + While WinMerge development has been fast in the last couple of years, all this work is done by people in their spare time. Nobody gets paid for improving WinMerge. We try to fix bugs as we find them or when somebody reports them to us. We really try — we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any help with WinMerge, be it testing, documenting, translating, or coding. - +
      Participating in WinMerge development As mentioned above, we look for help in many areas, not just coding. Translation, documentation, and testing are important too. @@ -111,6 +111,6 @@ The Development Wiki is a good source of information if you want to help with WinMerge development. The Help Needed page in the wiki has more information about how to help with WinMerge development. The development-mailing list is the preferred place for development discussions. Another place is in the developers-forum. If you are interested in helping with WinMerge development, let us know. If you want to fix one of our bugs or implement a new feature, let us know. - - - +
      +
      +
      diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index ba603133547..32d41e6ecc7 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -1,5 +1,5 @@ - From 7a3b543baecaeb715dac8f4cab1920c55a3caac3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 10 Jul 2008 09:31:41 +0000 Subject: [PATCH 012/168] Really remove buildall.bat - applying the patch only made the file empty but didn't remove it. --HG-- branch : R2_10 --- buildall.bat | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildall.bat diff --git a/buildall.bat b/buildall.bat deleted file mode 100644 index e69de29bb2d..00000000000 From 08d02467d1b40d4580863156396e31ca366caf2f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 10 Jul 2008 16:59:25 +0000 Subject: [PATCH 013/168] Changelog: BugFix: ANSI build crash in folder compare (#2010053) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 494f5d43519..7ffe9794865 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -9,6 +9,7 @@ WinMerge 2.9.1.6 Add ShellExtension menu for drive letters (root folders) (#2011602) Remove buildall.bat (#2013576) BugFix: Use system codepage for paths (#1979429, #2008581) + BugFix: ANSI build crash in folder compare (#2010053) WinMerge 2.10.x (R2_10) branch created (r5561) From 63b10480b9dc1e14c087a4569c82ad8e166da3e5 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 10 Jul 2008 17:01:15 +0000 Subject: [PATCH 014/168] BUG: [ 2010053 ] Folder compare crashed since WinMerge 2.9.1.3 Fix ANSI build crash from AnsiConvert.cpp. --HG-- branch : R2_10 --- Src/AnsiConvert.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Src/AnsiConvert.cpp b/Src/AnsiConvert.cpp index ba896a9416f..cabacfe925a 100644 --- a/Src/AnsiConvert.cpp +++ b/Src/AnsiConvert.cpp @@ -41,11 +41,13 @@ LPCSTR ansiconvert_ThreadCP(LPCTSTR str) * @param [in] str String to convert. * @param [in] codepage Codepage to use in conversion. * @return Ansi string. + * @note Function must allocate a new string, as DiffFileData gets the + * filename and expects it can be freed with free(). */ LPCSTR convert(LPCTSTR str, UINT codepage) { #ifndef UNICODE - return str; + return strdup(str); #else int len = WideCharToMultiByte(codepage, 0, str, -1, 0, 0, 0, 0); if (len) @@ -58,3 +60,4 @@ LPCSTR convert(LPCTSTR str, UINT codepage) #endif } + From a896457822778b8e1f791fecafd0c80844052d2a Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 10 Jul 2008 17:12:44 +0000 Subject: [PATCH 015/168] PATCH: [ 2015155 ] PreLink.Bat Was using wrong wrong variable when deleting Submitted by Robert Grange --HG-- branch : R2_10 --- Src/PreLink.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/PreLink.bat b/Src/PreLink.bat index ca9acae588a..5eae2a296a2 100644 --- a/Src/PreLink.bat +++ b/Src/PreLink.bat @@ -32,7 +32,7 @@ REM Enable echo lines below if you need to debug this script REM echo %0 REM echo $(IntDir) = %1 REM echo $(TargetPath) = %2 -del $(TargetPath) +del %2 REM Create build directories mkdir ..\Build\expat From 3da8202562bed9834ab72e0ac303e70e5864175c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 10 Jul 2008 19:52:22 +0000 Subject: [PATCH 016/168] Build AnsiConvert.cpp without precompiled headers. --HG-- branch : R2_10 --- Src/Merge.vcproj | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj index f6fd287b5d8..f2475dd173f 100644 --- a/Src/Merge.vcproj +++ b/Src/Merge.vcproj @@ -395,7 +395,9 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)"/> + PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough=""/> @@ -404,6 +406,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + PrecompiledHeaderThrough="" BrowseInformation="1"/> - + PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough=""/> + + Date: Thu, 10 Jul 2008 20:16:56 +0000 Subject: [PATCH 017/168] BUG: [ 2015174 ] Insert-/Update mode is not shown --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/MainFrm.cpp | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 7ffe9794865..a96edcdcd1f 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -10,6 +10,7 @@ WinMerge 2.9.1.6 Remove buildall.bat (#2013576) 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) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 7b6a6c7e47a..18e9fdf25e9 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -222,14 +222,14 @@ END_MESSAGE_MAP() /** * @brief MainFrame statusbar panels/indicators */ -static UINT indicators[] = +static UINT StatusbarIndicators[] = { ID_SEPARATOR, // status line indicator ID_SEPARATOR, // Merge mode ID_SEPARATOR, // Diff number - ID_INDICATOR_CAPS, - ID_INDICATOR_NUM, - ID_INDICATOR_SCRL, + ID_INDICATOR_CAPS, // Caps Lock + ID_INDICATOR_NUM, // Num Lock + ID_INDICATOR_OVR, // Insert }; /** @brief Timer ID for window flashing timer. */ @@ -405,8 +405,9 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) TRACE0("Failed to create status bar\n"); return -1; // fail to create } - theApp.SetIndicators(m_wndStatusBar, indicators, sizeof(indicators)/sizeof(UINT)); - + theApp.SetIndicators(m_wndStatusBar, StatusbarIndicators, + countof(StatusbarIndicators)); + m_wndStatusBar.SetPaneInfo(1, ID_STATUS_MERGINGMODE, 0, 100); m_wndStatusBar.SetPaneInfo(2, ID_STATUS_DIFFNUM, 0, 150); if (GetOptionsMgr()->GetBool(OPT_SHOW_STATUSBAR) == false) From 8e7f62ea1f329b18d247f1aa768d51af96860493 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 11 Jul 2008 07:02:54 +0000 Subject: [PATCH 018/168] BUG: [ 2012377 ] UTF-8 encoding shown as 65001 --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/FileTextEncoding.cpp | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index a96edcdcd1f..8e9c649cfee 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -11,6 +11,7 @@ WinMerge 2.9.1.6 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) + BugFix: Detected UTF-8 encoding shown as 65001 (#2012377) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/FileTextEncoding.cpp b/Src/FileTextEncoding.cpp index a0e08189e62..227307cd372 100644 --- a/Src/FileTextEncoding.cpp +++ b/Src/FileTextEncoding.cpp @@ -74,10 +74,18 @@ String FileTextEncoding::GetName() const String str; if (m_codepage > -1) { - str.resize(32); - LPTSTR s = &*str.begin(); //GetBuffer(32); - int len = _sntprintf(s, 32, _T("%d"), m_codepage); - str.resize(len); + if (m_codepage == CP_UTF8) + { + // We detected codepage to be UTF-8, but unicoding was not set + str = LoadResString(IDS_UNICODING_UTF8); + } + else + { + str.resize(32); + LPTSTR s = &*str.begin(); //GetBuffer(32); + int len = _sntprintf(s, 32, _T("%d"), m_codepage); + str.resize(len); + } } return str; } From dc665cf56e2f7b44ffa2e8259f82871af93c32e1 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 11 Jul 2008 07:24:34 +0000 Subject: [PATCH 019/168] Update Subversion document: add AnkhSVN plugin, add tags URL. (trunk r5602) --HG-- branch : R2_10 --- Docs/Developers/readme-Subversion.html | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Docs/Developers/readme-Subversion.html b/Docs/Developers/readme-Subversion.html index 1ec05bc1aa7..290f9ff38b2 100644 --- a/Docs/Developers/readme-Subversion.html +++ b/Docs/Developers/readme-Subversion.html @@ -37,15 +37,13 @@

      Why Subversion?

      service. And after short discussion WinMerge developers agreed to switch to Subversion. It fits better to our needs than CVS. So we switched from CVS to Subversion in August 2006.

      -

      But CVS is better! I Want to use CVS!

      -

      We decided subversion is better for us. We keep using Subversion for now on.

      -

      What happened to code in CVS?

      -

      Nothing. It is still there. We don't just checkin anymore to CVS. And CVS page is not -visible in our project page.

      +

      Where are old branches and tags?

      +

      They are in CVS. We did not import them to Subversion. If you need (codes of) +old stable version you get them from project downloads.

      Web access

      Easiest way to browse our source code is through web. SourceForge.net utilizes -ViewVC to access CVS/Subversion repositories via Web. +ViewVC to access Subversion repositories via Web. WinMerge Subversion repository is available at: http://winmerge.svn.sourceforge.net/viewvc/winmerge/.

      @@ -60,6 +58,10 @@

      Subversion client programs

      Subversion The Thing. If you want to use commandline or if you want your own local Subversion repository, you need it. Not needed for TortoiseSVN. +
    6. + AnkhSVN is a Subversion plugin + for Visual Studio (VS2005+). +

      7. Subversion documentation

      @@ -81,7 +83,7 @@

      Repository URLs

      WinMerge Subversion repository URL is:
      https://winmerge.svn.sourceforge.net/svnroot/winmerge

      -

      Using above URL will checkout all branches and tags also. WinMerge development happens in +

      Using above URL will checkout all branches and tags. WinMerge development happens in trunk and URL is:
      https://winmerge.svn.sourceforge.net/svnroot/winmerge/trunk

      @@ -98,6 +100,9 @@

      Repository URLs

      https://winmerge.svn.sourceforge.net/svnroot/winmerge/branches/R2_10

      Old branches (2.0 - 2.4 releases) are in CVS repository.

      +

      For every beta- and stable-release we add a tag. Tags are in folder:
      +https://winmerge.svn.sourceforge.net/svnroot/winmerge/tags +

      Quick intro to using TortoiseSVN

      Checkout

      From a42785943271cc371c932c1398a5ae16493a39c3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 12 Jul 2008 08:04:16 +0000 Subject: [PATCH 020/168] Add Keith Rule (CMemDC - memory DC developer) to contributors list. --HG-- branch : R2_10 --- Docs/Users/Contributors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt index 0c031e9fa08..bce3b05d03d 100644 --- a/Docs/Users/Contributors.txt +++ b/Docs/Users/Contributors.txt @@ -167,6 +167,7 @@ WinMerge includes code from: * Michael P. Mehl (CMessageBoxDialog) * Cristi Posea (CSizingControlBar) * Ferdinand Prantl (CrystalEditor syntax rules) +* Keith Rule (CMemDC - memory DC) * Henry Spencer (CRegExp) * Andrei Stcherbatchenko (CrystalEditor) From a8a1c07285537c947096c1b7e41412f74d9f7ae3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 15 Jul 2008 11:16:10 +0000 Subject: [PATCH 021/168] PATCH: [ 2017901 ] Copy edit help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Open_paths.xml | 474 +++++++++++++++---------------- 1 file changed, 228 insertions(+), 246 deletions(-) diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index d32ce3802c7..05eb1ee6928 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -1,74 +1,58 @@
      - Opening Files and Folders + Opening files and folders - WinMerge allows selecting/opening paths in several ways. Using - Open-dialog is just one of them. + WinMerge provides several ways to specify paths and open files or folders: -
      - Open-Dialog + + + + - Basic use of Open-dialog is described in Quick start. Here is some more detailed - information and tips about how to use Open-dialog more efficiently. + + + -
      - Environment variables + + + - Environment variables can be used as (part of) paths. An - environment variable is expanded when its name is put between two - %:s. + + + + - - Using environment variables +
      + Select Files or Folders dialog - If an environment variable named WORKDIR contains - the path c:\workfiles then - %WORKDIR%\project1 is expanded to path c:\workfiles\project1 . - + Quick start describes the Select Files or Folders dialog. This section providesmore details, and some tips for usiing the Select Files or Folders dialog more efficiently. + +
      + Environment variables + + You can use environment variables in your paths. Windows expands the variable name between % (percent) delimiters. For example, if an environment variable named WORKDIR has the value c:\workfiles, then the path %WORKDIR%\project1 is expanded to c:\workfiles\project1 .
      Opening archive files - Archive file support requires 7-Zip plugin to be installed. See - Installing instructions. + WinMerge archive support is provided in the 7-Zip plugin. See Installing instructions to install this plugin. - Opening two archive files is similar to normal files: select two - archive files to Open-dialog's "Left" and - "Right" fields. If WinMerge recognizes the archive - format, it opens the contents of the archive files to folder - compare. + Opening two archive files is similar to opening normal files: specify two archive files in the Open-dialog's Left and Right fields. If WinMerge recognizes the archive format, it opens the contents of the archive files in the Folder Compare window. - Folder Compare chapter - describes how to work with archive files. If the archive file contains - subfolders Original/ and - Altered/ it must be opened by - selecting same filename to both sides in - Open-dialog or command line. Then WinMerge can - compare contents of those two subfolders. + The Folder Compare topic describes how to work with archive files. For example, if an archive file contains two subfolders named Original/ and Altered/, you can compare the contents of the two subfolders by specifying the same archive file in both sides in the Select Files or Folders dialog or WinMerge command line. - When dragging an archive file to WinMerge window, press - Shift when dropping the file and WinMerge will - automatically copy the same filename to both sides and open the - archive file. + When you drag an archive file to the WinMerge window, press Shift when dropping the file: WinMerge automatically copies the same filename to both sides and opens the archive file.
      Filter selection - Third edit field in Open dialog is for - filter. This field can contain list of file extensions to include or - file filter name. + The third edit field in the Select Files or Folders dialog, Filter, enables you to restrict the files that are included in a folder compare. You can specify a list of file extensions to include, or a file filter. A list is one or more extensions separated by spaces, commas, colons or semicolons, using this syntax: - Extensions must always be in format - *.extension. So file extension list cannot be used - for more advanced selecting, file filters are there for it. Different - extensions can be separated by spaces, commas, colons or - semicolons. + *.[extension][delimiter *.extension ...] Extension list @@ -77,290 +61,288 @@ - *. (star, dot and no extension) selects - files without any extension, for example - "README". + *. (star, dot and no extension) selects files without any extension, for example "README". - Field can also contain file filter name. Easiest way to select - file filter is using Filters-dialog which can be - opened with "Select..." button next to field. - That dialog allows also creating, editing and deleting of filter - files. + A file extension list can be used only for simple selections; for more advanced selecting, use file filters. Different extensions can be separated by . + + You can also enter a file filter name in the Filter field. The easiest way is to click Select and use the Filters dialog to select a file filter. You can also create, edit, and delete filter files using the Filters dialog. - If filter cannot be found by name or extension list is not valid - WinMerge selects all files (i.e. uses *.* as - extension list). + If the specified filter cannot be found or if the extension list is not valid, WinMerge selects all files (that is, it uses uses the default *.* extension list).
      -
      +
      <indexterm> - <primary>Shell Integration</primary> - </indexterm>Shell Integration - - The Shell Integration is a convenient way to select the paths using - Windows Explorer. Installer enables Shell Integration if chosen so. Shell - Integration can be enabled or disabled from - Options/System. When the Shell - Integration is enabled item WinMerge is added - to the Explorer context menu (click right mouse button over file or folder - in Explorer). - - WinMerge accepts one or two paths. When one path is selected through - Shell Integration WinMerge places it as "Left" path - and open Open-dialog for user to select "Right" path. - Also if two paths are selected but another path couldn't be opened for - reason or another WinMerge shows Open-dialog for selecting valid - paths. - - + shell integration + Shell integration + + The WinMerge shell Integration is a convenient way to select paths and open WinMerge directly from Windows Explorer. It adds a WinMerge shortcut in the Explorer context menu (available when you right-click one or two files or folders in Explorer). For example: + + + + + + + Simple WinMerge context menu + + + You can enable the shell integration when you install WinMerge. After installing WinMerge, you can enable or disable the shell integration in the System page of the Options dialog. + + To use the shell integration, begin by selecting either one or two paths in Windows Explorer: + + + + If you select a single path, WinMerge opens the Select Files or Folders dialog. It places the selected file or folder in the Left field, leaving the Right path for you to specify. + + + + If you select two files or folders, WinMerge opens them directly in the File Compare or Folder Compare window. However, if one or more paths cannot be opened for any reason, WinMerge opens the Select Files or Folders dialog for you to reselect the paths. + + + +
      + Advanced shell integration + + The advanced shell integration enables you to control the order in which paths are compared when you launch WinMerge from the Windows Explorer context menu. To configure the advanced shell integration, select Enable advanced menu in the System page of WinMerge options. + + In the standard shell integration, when you select two paths in Windows Explorer and then right-click and choose WinMerge, the order of comparison in WinMerge is determined by the sort order in Windows Explorer. For example, if your Windows Explorer file list is sorted by name descending, and you select File1 and File2, WinMerge opens with File1 on the left side and File2 on the right. You can change the order only within WinMerge, after it opens. + + The advanced shell integration replaces the standard WinMerge shortcut in the Windows Explorer context menu with a set of shortcuts that enable you to control the comparison order before launching WinMerge: + + - + - Simple WinMerge context menu - + Advanced WinMerge context menu + -
      - Advanced Shell Integration - - Selecting "Enable advanced menu" for Shell - Integration from options adds more choices for path selection. Now - WinMerge adds two menu items to Explorer context menu: - "Compare To" and - "Compare...". Compare - To selects path as first ("Left") - path. When one path is already selected (memorized) WinMerge adds items - "Compare" and 'Re-select - First" to context menu. Now - Compare selects path as - "Right" path and compares it with previously - selected path. Re-select First allows - re-selecting first path. Handy when wrong item got accidentally selected - as first path. - - Sounds complicated, but luckily it is not - in practice: + + + Compare To + + + Designates the selected path as the first (Left) path in the comparison. + + + + + Compare + + + Designates the selected path as the second (Right) path in the comparison, and opens WinMerge in one of these ways: + + + + If you previously designated the first path (using Compare To), WinMerge opens the File Compare or Folder Compare window, and compares the first and second paths you have specified. + + + + If you click Compare before designating the first path, the Select Files or Folders dialog is opened, with your selection as the first (Left) path. Specify the second path in the Right field to continue with the comparison. + + + + + + + + + Re-select First + + + Available in the context menu only after you apply Compare To. Designates the selected path as the first path, overriding the previous Compare To selection. This is useful, for example, if you accidentally select the wrong first path. + + + + + The shell integration paths that you map are stored in memory only until you use them to open WinMerge. They are discarded after a compare operation. This means that you cannot select one Compare To path and compare it against several paths. + + Here is a simple method of using the advanced integration נthere are other scenarios, of course. In Windows Explorer: - Select first item you want to compare, open context menu - and select first "Compare To" item. Path - is now in memory. + Right-click the first item you want to compare and choose the Compare To shortcut in the context menu. The path is now in memory. - Browse to location of second item you want to compare and - select it. Open context menu and move menu selection over first - "Compare" item. Now Explorer's status bar - shows memorized path to which you are comparing newly selected - path. + Locate the second item you want to compare. Right-click the item and choose Compare to launch WinMerge and perform the comparison. - - - - - - - Advanced WinMerge context menu - - - After memorized path is used for compare it is forgotten. So user - cannot select one item to memorize and then compare it against several - paths. - - - Take benefit of Open dialog's MRU lists! - Compare... Item selects path - as"Left" path and opens - Open-dialog. Now you can select - "Right" path from MRU list. This is very handy - when you need to compare one file/folder against several - files/folders. -
      Including Subfolders - Shell Integration by default does not include subfolders into - comparison. This default behavior can be changed using Include - Subfolders by Default option in System options. Default - behavior can be also changed by holding down Control - -key while selecting Compare-item from the - Explorer context menu. + By default, WinMerge does not include subfolders in compare operations. To change the default behavior, enable Include subfolders by befault in the System page of WinMerge options. To change include subfolders while using the shell integration, press and hold the Control key while selecting Compare in the Windows Explorer context menu.
      -
      +
      <indexterm> - <primary>Drag and Drop</primary> - </indexterm>Drag and Drop - - One or two paths can be drag and dropped to WinMerge window from - Windows Explorer, Desktop or whatever source Windows allows dragging paths - from. If only one path is dropped to the WinMerge window, the Open dialog - is opened for selecting the second path. If the single path is a path to - the project file, then the project file is opened. - - WinMerge does not by default include subfolders in compare. - Subfolders can be included by pressing Control-key while - dropping paths. Another useful key when dropping paths is - Shift. When there is only one path dropped and - Shift is pressed that same path is opened to both sides. - This is a handy way to open archive files, see Opening archive files. - - Paths can be drag and dropped into the Open dialog. The usual use - case is to first drag and drop first path to the WinMerge window and then - drag and drop second path to the Open dialog. When the path is dropped - into the Open dialog, it is placed into: + drag and drop + Drag and drop - - - left path - if left path edit field is empty, or both path edit - fields have already a path - + From any Windows source that allows you to drag objects, such as Windows Explorer or the Desktop, you can drag and drop one or two paths into the WinMerge window. If you drop only one path into WinMerge, the Select Files or Folders dialog opens for you to select the second path. If the single path specifies a project file, then the project file is opened. - - right path - if left path is not empty and right path is - empty - - + By default, WinMerge does not include subfolders in compare operations. To include subfolders, press and hold Control while dropping paths. Another useful key when dropping paths is Shift: To open the same path in both sides of a Compare window, press and hold Shift while dropping only one path. This is a handy way to open archive files (see Opening archive files). + + You can drop paths into the Select Files or Folders dialog. A typical procedure is to drag and drop the first path into the WinMerge window, and then drag and drop the second path into the Select Files or Folders dialog. When a path is dropped into the Select Files or Folders dialog, it is loaded into either the left or right path field: + + + + Left + + + If the left field is empty or both path fields already contain paths + + + + + Right + + + If the left path is not empty and the right path is empty + + +
      -
      +
      <indexterm> - <primary>Project Files</primary> - </indexterm>Project Files + project files + Project files - Project files allow fast and easy opening of commonly used paths - (and filter). The user can easily save currently open paths as project - file for later use. + You can save the currently open paths and filters in a project file. Then, you can easily open the project later to compare the same files. Project files are handy if you compare the same files repeatedly.
      - Opening Project File + Project files - Project file can be given to command line like normal file or - opened from + You can specify a project file as a command line argument, just like a normal file. In the WinMerge window, click File - Open Project... - WinMerge reads paths from project file and if two paths - are given opens them. If only one path is given or one of paths is - invalid, the Open-dialog is shown for user to - select the second path or valid paths. + Open Project + . WinMerge reads the paths from the project file. If the project file has two paths, both paths are opened. If only one path is given or one of paths is invalid, WinMerge opens the Select Files or Folders dialog, where you can add or correct the path information. - Project file can be selected also in Open - dialog. There are couple of things to remember: + A project file can also be opened in the Select Files or Folders dialog. Here are a few things to consider: - If two project files are selected, project files themselves - are compared. + If you specifiy two project files, the project files themselves are compared. - If project file is selected as left-side file, and - right-side file is empty, project file is opened like using - + If you specify a project file as the left file but do not specify a right file, the single project file is opened as if you had used the File - Open Project... - dialog. + Open Project + command. - If project file is selected as left-side file and any other - file as right-side file, contents of project file and another file - are compared. + If you specify a project file as the left file and any other file on the right side, the contents of the project file and the other file are compared.
      - Editing and Saving Project File + Editing and saving project files - Project files can be edited and saved using Project - File -dialog that can be opened from + To save a project file, click File - Save Project... - When opened, the dialog is initialized with values from - the current compare. Values can be edited and saved to the project file - with Save... button. One can also load existing - project file with Open... button. + Save Project + . The Project File dialog provides fields and options that you can easily edit to build a project file. If a compare window is currently open, the Project File dialog is initialized with values from the current compare; otherwise, you provide the values yourself. To use an existing project, click Open and select a project to load its values (any existing values are overwritten in the dialog). + + When you finished editing, click Save to store the file. - Project File -dialog + Project File dialog
      - Format + Project file format - Project files are simple XML files with .WinMerge extension. + Project files are simple XML files with a .WinMerge extension. For example: <?xml version='1.0' encoding='UTF-8'?> <project> - <paths> - <left>c:\work\project1</left> - <left-readonly>1</left-readonly> - <right>c:\work\project2</right> - <right-readonly>0</right-readonly> - <filter>Visual C++ loose</filter> - <subfolders>0</subfolders> - </paths> + <paths> + <left>c:\work\project1</left> + <left-readonly>1</left-readonly> + <right>c:\work\project2</right> + <right-readonly>0</right-readonly> + <filter>Visual C++ loose</filter> + <subfolders>0</subfolders> + </paths> </project> - The project file has six fields: + A project file contains a paths element that can contain one of each of these elements: - - - <left>...</left> - : Left side path to open - + + + left - - <left-readonly>...</left-readonly> - : 1 if left side path is opened as readonly, 0 to open - normally - + + Left path to open + + - - <right>...</right> - : Right side path to open - + + left-readonly - - <right-readonly>...</right-readonly> - : 1 if right side path is opened as readonly, 0 to open - normally. - + + 1 = Open read only - - <filter>...</filter> - : file filter name or list of extensions - + 0 = Open normally + + - - <subfolders>...</subfolders> - : 0 if subfolders are not included and 1 if they are - included - - + + right + + + Right path to open + + + + + right-readonly + + + 1 = Open read only + + 0 = Open normally + + + + + filter + + + File filter name or list of extensions + + + + + subfolders + + + 0 = Subfolders not included + + 1 = Subfolders included + + + - None of the fields are required and they can be empty - (<left></left>). + None of the fields is required, and they can be empty (for example, <left></left> or <left/>).
      From 7353ea372e1a2faf784752d1f33019fde0ce4110 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 15 Jul 2008 14:03:14 +0000 Subject: [PATCH 022/168] PATCH: [ 2017901 ] Copy edit help topic Fix typos, minor edit to two topics Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Intro_diffs.xml | 44 ++++++++++++++----------------- Docs/Users/Manual/Open_paths.xml | 2 +- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 1a367234ffb..6177f99c1ae 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -7,18 +7,18 @@
      Comparing files - If you compare two files, you can easily identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge can make this work much easier and more efficient. + We usually compare two files that are related in some way, such as two versions that were edited at different times, or by different people. If you examine two such files you can usually see some similar areas, and also identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying to understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge are designed make this work more systematic and efficient. - A spell checker is a useful difference utility: it can systematically step you through a document, highlight words that are different from those in its dictionary, and help you resolve each spelling problem. However, looking only at characters and words is not an effective way to do more complicated comparisons: many text utilities use lines as the basic unit of comparison instead. + For example, a spell checker is a difference utility that most people have used: it can systematically step you through a document, highlight words that are different from those in its dictionary, and help you resolve each spelling problem. However, looking only at characters and words is not an effective way to do more complicated comparisons: many text utilities use lines as the basic unit of comparison instead. - WinMerge also uses lines as its basic unit of difference. Words and spaces are not treated individually in comparing and merging operations. To illustrate: if two files have identical lines except that in one file, the last line has four different words and an extra space, then we say that the file has one difference, not five. + WinMerge also uses lines as its basic unit of difference. Words and spaces are not treated individually in comparing and merging operations. To illustrate, consider two files that are identical except for one line that is different. If the two versions of the line have four words that are different and one version has an extra space, then we say that the file has one difference, not five. - It's easy to identify individual lines that are different. But sometimes it is useful to treat an entire block of lines that are different as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too. + If it's quicker to compare lines than characters, sometimes it's also useful to treat an entire block of lines as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too.
      Simple compare operation - This section offers a simple example that demonstrates how to compare line difference between two files in WinMerge: + This section offers a simple example that demonstrates how to compare line differences between two files in WinMerge: @@ -40,8 +40,6 @@ Believe it or else. WinMerge compares lines. Believe it or not. - - The files are similar enough that they might be later versions of the same file. @@ -76,7 +74,7 @@ Believe it or not. Number of differences - The message in the status bar (at the bottom) tells you that two differences were detected. Read on to learn how to identify them. + The message in the status bar (at the bottom) tells you that two differences were detected. @@ -84,7 +82,7 @@ Believe it or not. Difference colors - WinMerge marks detected differences with various background colors (which you can configure in WinMerge options). The basic difference color is gold, by default. Within each line difference, WinMerge marks words and characters that are different with a lighter background color. Identical lines (like the third line in the example) are unmarked: they have white backgrounds. + WinMerge marks differences with various background colors (which you can configure in WinMerge options). The basic difference color is gold, by default. Within each line difference, WinMerge marks words and characters that are different with a lighter background color. Identical lines (like the third line in the example) are unmarked: they have white backgrounds. @@ -119,7 +117,7 @@ Believe it or not. Alt Enter - ). If this button is not enabled (for example, if your cursor is in a different line of the file), click + ). If this button is not enabled (for example, if your cursor is in a different line), click @@ -133,7 +131,7 @@ Believe it or not. Home ) instead. - When you select a difference, the two versions are loaded in the Diff pane. The Diff pane is useful for confirming which lines are included, and for examining them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines. + When you select a difference, the two versions are loaded in the Diff pane. The Diff pane confirms which lines are included in a difference, and lets you examine them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines. @@ -161,7 +159,7 @@ Believe it or not. Enter ). This jumps over the identical line (which is not a difference) and selects the last line. - You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences, and there are other ways to compare differences in WinMerge — but it demonstrates the efficiency of using the WinMerge navigation controls. + You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences — and there are other ways to compare differences in WinMerge. But it demonstrates the efficiency of using the WinMerge navigation controls.
      @@ -170,20 +168,18 @@ Believe it or not.
      Merging files - The purpose of merging is to combine changes from two files into one file. Merging concepts and functions build on the comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single target version. - - An environment without merging is simple but constrained: you must always update files sequentially. Two people cannot work on the same file concurrently, and once you create two versions of a file, they must be maintained separately. + The purpose of merging is to combine changes from two files into one file. Merging extends the concepts and functions used in comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single target version. - Merging files makes concurrent development possible, and it is a common occurrence in team environments. For example, suppose you and another person want to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor. + Merging files makes concurrent development possible, and it is a common task in team environments. For example, suppose you and another person want to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor. - Merging can be prompted (or even initiated) by version control systems like Subversion and ClearCase. For example, your version control system might prevent you from submitting changes to its repository because of a conflict. A conflict can occur if someone else checked in a different version of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated difference and merge tools, but you might prefer to use WinMerge instead. + Merging can be prompted (or even initiated) by version control systems like Subversion and ClearCase. For example, your version control system might prevent you from submitting changes to its repository because of merge conflicts. A conflict can occur if someone else checked in a different version of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated difference and merge tools, but you might prefer to use WinMerge instead. - Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through each difference. Resolve each difference by copying either its left or right candidate to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging. + Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through the differences. Resolve each difference by copying either its left or right candidate to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging.
      Simple merge operation - This short exercise demonstrates how use the controls in the File Compare window to merge the simple files shown earlier, in only a few steps: + This short exercise demonstrates how to use the controls in the File Compare window in a systematic way to merge the simple files shown earlier: @@ -203,7 +199,7 @@ Believe it or not. First Difference button - First Difference instead. + First Difference instead. @@ -215,7 +211,7 @@ Believe it or not. Copy Right button - Copy Right to merge difference 1 from File1 to File2. In File 2, notice that the single difference line is replaced by the two lines from File1, and the gray blank line is now gone. + Copy Right to merge difference 1 from File1 to File2. In File2, notice that the single difference line is replaced by the two lines from File1, and the gray blank line is now gone. @@ -227,7 +223,7 @@ Believe it or not. Next Difference button - Next Difference to select difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any. + Next Difference to select Difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any. @@ -239,7 +235,7 @@ Believe it or not. Copy Left button - Copy Left to merge difference 2 from File2 to File1. + Copy Left to merge Difference 2 from File2 to File1. The message that the the files are identical tells you that the merge is complete: @@ -251,7 +247,7 @@ Believe it or not. - Click OK to dismiss the message. The status Difference message changes from Difference of 1 to identical. + Click OK to dismiss the message. The status Difference message changes from Difference 1 of 1 to identical. diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 05eb1ee6928..cffbc3f634d 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -83,7 +83,7 @@ - + Simple WinMerge context menu From aa01c18600ad84c36c2282d451a69904ea0f836d Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 15 Jul 2008 20:04:26 +0000 Subject: [PATCH 023/168] PATCH: [ 2017901 ] Copy edit help topic Fix one paragraph, use 80 char lines. Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Open_paths.xml | 238 ++++++++++++++++++++++++------- 1 file changed, 186 insertions(+), 52 deletions(-) diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index cffbc3f634d..265d64084ab 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -2,7 +2,8 @@
      Opening files and folders - WinMerge provides several ways to specify paths and open files or folders: + WinMerge provides several ways to specify paths and open files or + folders: @@ -25,32 +26,58 @@
      Select Files or Folders dialog - Quick start describes the Select Files or Folders dialog. This section providesmore details, and some tips for usiing the Select Files or Folders dialog more efficiently. + Quick start describes the Select + Files or Folders dialog. This section providesmore details, and some tips + for using the Select Files or Folders dialog more efficiently.
      Environment variables - You can use environment variables in your paths. Windows expands the variable name between % (percent) delimiters. For example, if an environment variable named WORKDIR has the value c:\workfiles, then the path %WORKDIR%\project1 is expanded to c:\workfiles\project1 . + You can use environment variables in your paths. Windows expands the + variable name between % (percent) delimiters. For example, if an + environment variable named WORKDIR has the value c:\workfiles, then the path + %WORKDIR%\project1 is expanded to c:\workfiles\project1 .
      Opening archive files - WinMerge archive support is provided in the 7-Zip plugin. See Installing instructions to install this plugin. + WinMerge archive support is provided in the 7-Zip plugin. See Installing instructions to install this + plugin. - Opening two archive files is similar to opening normal files: specify two archive files in the Open-dialog's Left and Right fields. If WinMerge recognizes the archive format, it opens the contents of the archive files in the Folder Compare window. + Opening two archive files is similar to opening normal files: + specify two archive files in the Open-dialog's Left + and Right fields. If WinMerge recognizes the archive + format, it opens the contents of the archive files in the Folder Compare + window. - The Folder Compare topic describes how to work with archive files. For example, if an archive file contains two subfolders named Original/ and Altered/, you can compare the contents of the two subfolders by specifying the same archive file in both sides in the Select Files or Folders dialog or WinMerge command line. + The Folder Compare topic + describes how to work with archive files. For example, if an archive file + contains two subfolders named Original/ and Altered/, you can compare the contents of the + two subfolders by specifying the same archive file in both sides in the + Select Files or Folders dialog or WinMerge command line. - When you drag an archive file to the WinMerge window, press Shift when dropping the file: WinMerge automatically copies the same filename to both sides and opens the archive file. + When you drag an archive file to the WinMerge window, press + Shift when dropping the file: WinMerge automatically + copies the same filename to both sides and opens the archive + file.
      Filter selection - The third edit field in the Select Files or Folders dialog, Filter, enables you to restrict the files that are included in a folder compare. You can specify a list of file extensions to include, or a file filter. A list is one or more extensions separated by spaces, commas, colons or semicolons, using this syntax: + The third edit field in the Select Files or Folders dialog, + Filter, enables you to restrict the files that are + included in a folder compare. You can specify a list of file extensions to + include, or a file filter. A list is one or more extensions separated by + spaces, commas, colons or semicolons, using this syntax: *.[extension][delimiter *.extension ...] @@ -61,15 +88,24 @@ - *. (star, dot and no extension) selects files without any extension, for example "README". + *. (star, dot and no extension) selects files + without any extension, for example "README". - A file extension list can be used only for simple selections; for more advanced selecting, use file filters. Different extensions can be separated by . + A file extension list can be used only for simple selections; for + more advanced selecting, use file filters. Different extensions can be + separated by spaces, commas, colons, or semicolons. - You can also enter a file filter name in the Filter field. The easiest way is to click Select and use the Filters dialog to select a file filter. You can also create, edit, and delete filter files using the Filters dialog. + You can also enter a file filter name in the + Filter field. The easiest way is to click + Select and use the Filters dialog to select a file + filter. You can also create, edit, and delete filter files using the + Filters dialog. - If the specified filter cannot be found or if the extension list is not valid, WinMerge selects all files (that is, it uses uses the default *.* extension list). + If the specified filter cannot be found or if the extension list + is not valid, WinMerge selects all files (that is, it uses uses the + default *.* extension list).
      @@ -79,38 +115,67 @@ shell integration Shell integration - The WinMerge shell Integration is a convenient way to select paths and open WinMerge directly from Windows Explorer. It adds a WinMerge shortcut in the Explorer context menu (available when you right-click one or two files or folders in Explorer). For example: + The WinMerge shell Integration is a convenient way to select paths and + open WinMerge directly from Windows Explorer. It adds a + WinMerge shortcut in the Explorer context menu + (available when you right-click one or two files or folders in Explorer). + For example: - + Simple WinMerge context menu - You can enable the shell integration when you install WinMerge. After installing WinMerge, you can enable or disable the shell integration in the System page of the Options dialog. + You can enable the shell integration when you install WinMerge. After + installing WinMerge, you can enable or disable the shell integration in the + System page of the Options dialog. - To use the shell integration, begin by selecting either one or two paths in Windows Explorer: + To use the shell integration, begin by selecting either one or two + paths in Windows Explorer: - If you select a single path, WinMerge opens the Select Files or Folders dialog. It places the selected file or folder in the Left field, leaving the Right path for you to specify. + If you select a single path, WinMerge opens the Select Files or + Folders dialog. It places the selected file or folder in the + Left field, leaving the Right + path for you to specify. - If you select two files or folders, WinMerge opens them directly in the File Compare or Folder Compare window. However, if one or more paths cannot be opened for any reason, WinMerge opens the Select Files or Folders dialog for you to reselect the paths. + If you select two files or folders, WinMerge opens them directly + in the File Compare or Folder Compare window. However, if one or more + paths cannot be opened for any reason, WinMerge opens the Select Files + or Folders dialog for you to reselect the paths.
      Advanced shell integration - The advanced shell integration enables you to control the order in which paths are compared when you launch WinMerge from the Windows Explorer context menu. To configure the advanced shell integration, select Enable advanced menu in the System page of WinMerge options. - - In the standard shell integration, when you select two paths in Windows Explorer and then right-click and choose WinMerge, the order of comparison in WinMerge is determined by the sort order in Windows Explorer. For example, if your Windows Explorer file list is sorted by name descending, and you select File1 and File2, WinMerge opens with File1 on the left side and File2 on the right. You can change the order only within WinMerge, after it opens. - - The advanced shell integration replaces the standard WinMerge shortcut in the Windows Explorer context menu with a set of shortcuts that enable you to control the comparison order before launching WinMerge: + The advanced shell integration enables you to control the order in + which paths are compared when you launch WinMerge from the Windows + Explorer context menu. To configure the advanced shell integration, select + Enable advanced menu in the System page of WinMerge + options. + + In the standard shell integration, when you select two paths in + Windows Explorer and then right-click and choose + WinMerge, the order of comparison in WinMerge + is determined by the sort order in Windows Explorer. For example, if your + Windows Explorer file list is sorted by name descending, and you select + File1 and File2, WinMerge opens + with File1 on the left side and + File2 on the right. You can change the order only + within WinMerge, after it opens. + + The advanced shell integration replaces the standard + WinMerge shortcut in the Windows Explorer + context menu with a set of shortcuts that enable you to control the + comparison order before launching WinMerge: @@ -125,7 +190,8 @@ Compare To - Designates the selected path as the first (Left) path in the comparison. + Designates the selected path as the first + (Left) path in the comparison. @@ -133,19 +199,31 @@ Compare - Designates the selected path as the second (Right) path in the comparison, and opens WinMerge in one of these ways: + Designates the selected path as the second + (Right) path in the comparison, and opens + WinMerge in one of these ways: - If you previously designated the first path (using Compare To), WinMerge opens the File Compare or Folder Compare window, and compares the first and second paths you have specified. + If you previously designated the first path (using + Compare To), WinMerge opens the File Compare + or Folder Compare window, and compares the first and second + paths you have specified. - If you click Compare before designating the first path, the Select Files or Folders dialog is opened, with your selection as the first (Left) path. Specify the second path in the Right field to continue with the comparison. + If you click Compare before + designating the first path, the Select Files or Folders dialog + is opened, with your selection as the first + (Left) path. Specify the second path in the + Right field to continue with the + comparison. - + @@ -153,22 +231,34 @@ Re-select First - Available in the context menu only after you apply Compare To. Designates the selected path as the first path, overriding the previous Compare To selection. This is useful, for example, if you accidentally select the wrong first path. + Available in the context menu only after you apply + Compare To. Designates the selected path as the + first path, overriding the previous Compare To + selection. This is useful, for example, if you accidentally select + the wrong first path. - The shell integration paths that you map are stored in memory only until you use them to open WinMerge. They are discarded after a compare operation. This means that you cannot select one Compare To path and compare it against several paths. + The shell integration paths that you map are stored in memory only + until you use them to open WinMerge. They are discarded after a compare + operation. This means that you cannot select one Compare + To path and compare it against several paths. - Here is a simple method of using the advanced integration נthere are other scenarios, of course. In Windows Explorer: + Here is a simple method of using the advanced integration נthere are + other scenarios, of course. In Windows Explorer: - Right-click the first item you want to compare and choose the Compare To shortcut in the context menu. The path is now in memory. + Right-click the first item you want to compare and choose the + Compare To shortcut in the context menu. + The path is now in memory. - Locate the second item you want to compare. Right-click the item and choose Compare to launch WinMerge and perform the comparison. + Locate the second item you want to compare. Right-click the + item and choose Compare to launch WinMerge + and perform the comparison.
      @@ -176,7 +266,13 @@
      Including Subfolders - By default, WinMerge does not include subfolders in compare operations. To change the default behavior, enable Include subfolders by befault in the System page of WinMerge options. To change include subfolders while using the shell integration, press and hold the Control key while selecting Compare in the Windows Explorer context menu. + By default, WinMerge does not include subfolders in compare + operations. To change the default behavior, enable Include + subfolders by befault in the System page of WinMerge options. + To change include subfolders while using the shell integration, press and + hold the Control key while selecting + Compare in the Windows Explorer context + menu.
      @@ -185,18 +281,34 @@ drag and drop Drag and drop - From any Windows source that allows you to drag objects, such as Windows Explorer or the Desktop, you can drag and drop one or two paths into the WinMerge window. If you drop only one path into WinMerge, the Select Files or Folders dialog opens for you to select the second path. If the single path specifies a project file, then the project file is opened. - - By default, WinMerge does not include subfolders in compare operations. To include subfolders, press and hold Control while dropping paths. Another useful key when dropping paths is Shift: To open the same path in both sides of a Compare window, press and hold Shift while dropping only one path. This is a handy way to open archive files (see Opening archive files). - - You can drop paths into the Select Files or Folders dialog. A typical procedure is to drag and drop the first path into the WinMerge window, and then drag and drop the second path into the Select Files or Folders dialog. When a path is dropped into the Select Files or Folders dialog, it is loaded into either the left or right path field: + From any Windows source that allows you to drag objects, such as + Windows Explorer or the Desktop, you can drag and drop one or two paths into + the WinMerge window. If you drop only one path into WinMerge, the Select + Files or Folders dialog opens for you to select the second path. If the + single path specifies a project file, then the project file is + opened. + + By default, WinMerge does not include subfolders in compare + operations. To include subfolders, press and hold Control + while dropping paths. Another useful key when dropping paths is + Shift: To open the same path in both sides of a Compare + window, press and hold Shift while dropping only one path. + This is a handy way to open archive files (see Opening archive files). + + You can drop paths into the Select Files or Folders dialog. A typical + procedure is to drag and drop the first path into the WinMerge window, and + then drag and drop the second path into the Select Files or Folders dialog. + When a path is dropped into the Select Files or Folders dialog, it is loaded + into either the left or right path field: Left - If the left field is empty or both path fields already contain paths + If the left field is empty or both path fields already contain + paths @@ -215,26 +327,36 @@ project files Project files - You can save the currently open paths and filters in a project file. Then, you can easily open the project later to compare the same files. Project files are handy if you compare the same files repeatedly. + You can save the currently open paths and filters in a project file. + Then, you can easily open the project later to compare the same files. + Project files are handy if you compare the same files repeatedly.
      Project files - You can specify a project file as a command line argument, just like a normal file. In the WinMerge window, click + You can specify a project file as a command line argument, just like + a normal file. In the WinMerge window, click File Open Project - . WinMerge reads the paths from the project file. If the project file has two paths, both paths are opened. If only one path is given or one of paths is invalid, WinMerge opens the Select Files or Folders dialog, where you can add or correct the path information. + . WinMerge reads the paths from the project file. If the + project file has two paths, both paths are opened. If only one path is + given or one of paths is invalid, WinMerge opens the Select Files or + Folders dialog, where you can add or correct the path information. - A project file can also be opened in the Select Files or Folders dialog. Here are a few things to consider: + A project file can also be opened in the Select Files or Folders + dialog. Here are a few things to consider: - If you specifiy two project files, the project files themselves are compared. + If you specifiy two project files, the project files + themselves are compared. - If you specify a project file as the left file but do not specify a right file, the single project file is opened as if you had used the + If you specify a project file as the left file but do not + specify a right file, the single project file is opened as if you had + used the File Open Project @@ -242,7 +364,9 @@ - If you specify a project file as the left file and any other file on the right side, the contents of the project file and the other file are compared. + If you specify a project file as the left file and any other + file on the right side, the contents of the project file and the other + file are compared.
      @@ -254,9 +378,16 @@ File Save Project - . The Project File dialog provides fields and options that you can easily edit to build a project file. If a compare window is currently open, the Project File dialog is initialized with values from the current compare; otherwise, you provide the values yourself. To use an existing project, click Open and select a project to load its values (any existing values are overwritten in the dialog). + . The Project File dialog provides + fields and options that you can easily edit to build a project file. If a + compare window is currently open, the Project File + dialog is initialized with values from the current compare; otherwise, you + provide the values yourself. To use an existing project, click + Open and select a project to load its values (any + existing values are overwritten in the dialog). - When you finished editing, click Save to store the file. + When you finished editing, click Save to + store the file. @@ -270,7 +401,8 @@
      Project file format - Project files are simple XML files with a .WinMerge extension. For example: + Project files are simple XML files with a .WinMerge extension. For example: <?xml version='1.0' encoding='UTF-8'?> <project> @@ -284,7 +416,8 @@ </paths> </project> - A project file contains a paths element that can contain one of each of these elements: + A project file contains a paths element that can + contain one of each of these elements: @@ -342,7 +475,8 @@ - None of the fields is required, and they can be empty (for example, <left></left> or <left/>). + None of the fields is required, and they can be empty (for + example, <left></left> or <left/>).
      From 14116413e6632fcf8ef1a154e818f12a975d2fac Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Thu, 17 Jul 2008 21:50:29 +0000 Subject: [PATCH 024/168] PATCH: [ 2015434 ] Manual: Use own build tool package for building the manual --HG-- branch : R2_10 --- Docs/Developers/readme-manual.html | 15 ++++----------- Docs/Users/Manual/WinMerge_help.xml | 4 ++-- Docs/Users/Manual/build/build_html.bat | 2 +- Docs/Users/Manual/build/build_html.xsl | 2 +- Docs/Users/Manual/build/build_htmlhelp.bat | 2 +- Docs/Users/Manual/build/build_htmlhelp.xsl | 2 +- Docs/Users/Manual/build/configuration.bat | 15 +++++++++------ 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/Docs/Developers/readme-manual.html b/Docs/Developers/readme-manual.html index abc2f239336..f12a442cb3b 100644 --- a/Docs/Developers/readme-manual.html +++ b/Docs/Developers/readme-manual.html @@ -93,16 +93,16 @@

      Installing conversion tools needed:

      Our preferred build system is based on Java and Saxon

      Our preferred build system uses the following tools:

      -

      The easiest way is to install eDE, -because it install all required tools (except of Java).

      +

      The easiest way is to download our manual build tools package v1 +(it includes all required tools except of Java) and unzip it to the build subdirectory at the Manual directory.

      -

      The batch files are located at the build subdirectory at the Manual directory. +

      The batch files are also located at the build subdirectory at the Manual directory. The main file ist build.bat. Paths to the installed tools are written in the configuration.bat file.

      build.bat html or build_html.bat
      @@ -115,13 +115,6 @@

      Our preferred build system is based on Java and Sax
      Is the same like build.bat html.

      -

      Note: If you use a other path than C:\docbook\xsl for the XSL StyleSheets -you must change the files build_html.xsl and build_htmlhelp.xsl:

      -

      build_html.xsl:

      -
      <xsl:import href="file:/C:/docbook/xsl/html/chunk.xsl"/>
      -

      build_htmlhelp.xsl:

      -
      <xsl:import href="file:/C:/docbook/xsl/htmlhelp/htmlhelp.xsl"/>
      -

      Docbook support in SourceForge

      SourceForge has Docbook tools installed, and they can be used from shell server. Tools we are interested in:

      diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 32d41e6ecc7..020aa7dd03f 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -1,6 +1,6 @@ - diff --git a/Docs/Users/Manual/build/build_html.bat b/Docs/Users/Manual/build/build_html.bat index 04033b7c8b7..152e024bda6 100644 --- a/Docs/Users/Manual/build/build_html.bat +++ b/Docs/Users/Manual/build/build_html.bat @@ -42,7 +42,7 @@ copy "..\css\all.css" "%docbook_outputdir%\css\all.css" copy "..\css\print.css" "%docbook_outputdir%\css\print.css" echo Create HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_saxon_xsl% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ +%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ echo Finished! diff --git a/Docs/Users/Manual/build/build_html.xsl b/Docs/Users/Manual/build/build_html.xsl index 49b7273df08..cb17f1c06c4 100644 --- a/Docs/Users/Manual/build/build_html.xsl +++ b/Docs/Users/Manual/build/build_html.xsl @@ -1,6 +1,6 @@ - + diff --git a/Docs/Users/Manual/build/build_htmlhelp.bat b/Docs/Users/Manual/build/build_htmlhelp.bat index 392fb120808..1126f3cf9da 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.bat +++ b/Docs/Users/Manual/build/build_htmlhelp.bat @@ -28,7 +28,7 @@ if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" copy "..\css\help.css" "%docbook_outputdir%\css\help.css" echo Create HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_saxon_xsl% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ +%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ if exist "htmlhelp.hhp" goto compile :compile diff --git a/Docs/Users/Manual/build/build_htmlhelp.xsl b/Docs/Users/Manual/build/build_htmlhelp.xsl index a316cd6f1f8..bf0bc9eed94 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.xsl +++ b/Docs/Users/Manual/build/build_htmlhelp.xsl @@ -1,6 +1,6 @@ - + set nop diff --git a/Docs/Users/Manual/build/configuration.bat b/Docs/Users/Manual/build/configuration.bat index c533c9aed4a..374f246c83f 100644 --- a/Docs/Users/Manual/build/configuration.bat +++ b/Docs/Users/Manual/build/configuration.bat @@ -1,16 +1,19 @@ -rem DocBook... -set docbook_path=c:\docbook - rem Java... set docbook_java_exe=java.exe set docbook_java_parameters=-Xms8m -Xmx256m rem Saxon... -set docbook_saxon_jar=c:\docbook\saxon\saxon.jar -set docbook_saxon_xsl=c:\docbook\xsl\extensions\saxon651.jar +set docbook_saxon_jar=.\saxon\saxon.jar +set docbook_saxon_xsl=.\xsl\extensions\saxon655.jar + +rem Xerces2 Java Parser... +set DBFACTORY=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl +set SPFACTORY=org.apache.xerces.jaxp.SAXParserFactoryImpl +set XINCLUDE=org.apache.xerces.parsers.XIncludeParserConfiguration +set docbook_xerces_jar=.\xerces\xercesImpl.jar rem HTML Help Compiler... -set docbook_hhc_exe=c:\docbook\bin\hhc.exe +set docbook_hhc_exe=.\hhc\hhc.exe rem Build directory... rem Use "." for the current directory. From 3883e239fa3ba46ab0b652c8449e5808c22950ae Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 18 Jul 2008 18:36:02 +0000 Subject: [PATCH 025/168] PATCH: [ 2021431 ] add common stylesheet to DocBook XSL customization layer Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/build/build_common.xsl | 64 +++++++++++++++++++ Docs/Users/Manual/build/build_html.xsl | 40 ++++++------ .../Users/Manual/build/build_html_withads.xsl | 63 ++++++++++++------ Docs/Users/Manual/build/build_htmlhelp.xsl | 44 ++++++++----- 4 files changed, 153 insertions(+), 58 deletions(-) create mode 100644 Docs/Users/Manual/build/build_common.xsl diff --git a/Docs/Users/Manual/build/build_common.xsl b/Docs/Users/Manual/build/build_common.xsl new file mode 100644 index 00000000000..c8d41fa6a1c --- /dev/null +++ b/Docs/Users/Manual/build/build_common.xsl @@ -0,0 +1,64 @@ + + + + + + + + + + + +images/ +.gif + + + + +book toc,title article nop +1 + + + + + + + + + + + + + + + + + + + diff --git a/Docs/Users/Manual/build/build_html.xsl b/Docs/Users/Manual/build/build_html.xsl index cb17f1c06c4..39440bc2488 100644 --- a/Docs/Users/Manual/build/build_html.xsl +++ b/Docs/Users/Manual/build/build_html.xsl @@ -1,23 +1,21 @@ + - - - - - - - - images/ - .gif - - - - - - book toc,title article noop - 1 - - - - + version="1.0"> + + + + + + diff --git a/Docs/Users/Manual/build/build_html_withads.xsl b/Docs/Users/Manual/build/build_html_withads.xsl index 6567f198098..8a645496290 100644 --- a/Docs/Users/Manual/build/build_html_withads.xsl +++ b/Docs/Users/Manual/build/build_html_withads.xsl @@ -1,23 +1,44 @@ + - - -
      - - -
      -       + version="1.0"> + + + + + + + + +
      + + +
      +       +       diff --git a/Docs/Users/Manual/build/build_htmlhelp.xsl b/Docs/Users/Manual/build/build_htmlhelp.xsl index bf0bc9eed94..32a8fa0a48d 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.xsl +++ b/Docs/Users/Manual/build/build_htmlhelp.xsl @@ -1,18 +1,30 @@ + - - - set nop - - - - images/ - .gif - - css/help.css - - - - - + version="1.0"> + + + + + + + + +set nop +css/help.css + + + From fa0e0eb9da2ae3428a2c24edf540a323edc419ef Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 19 Jul 2008 17:23:48 +0000 Subject: [PATCH 026/168] BUG: [ 2010463 ] False warning: about to close several compare windows --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/MainFrm.cpp | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 8e9c649cfee..f3e5606fbd6 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -12,6 +12,8 @@ WinMerge 2.9.1.6 BugFix: ANSI build crash in folder compare (#2010053) BugFix: Add insert/overtype mode indicator to statusbar (#2015174) BugFix: Detected UTF-8 encoding shown as 65001 (#2012377) + Bugfix: Don't warn about closing multiple windows when only one + window is open (#2010463) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 18e9fdf25e9..efa2a1df593 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -3343,6 +3343,14 @@ bool CMainFrame::AskCloseConfirmation() const int count = dirdocs.GetCount() + mergedocs.GetCount(); if (count > 1) { + // Check that we don't have one empty dirdoc + mergedoc situation. + // That happens since we open "hidden" dirdoc for every file compare. + if (dirdocs.GetCount() == 1) + { + CDirDoc *pDoc = dirdocs.GetHead(); + if (!pDoc->HasDiffs()) + return true; + } ret = LangMessageBox(IDS_CLOSEALL_WINDOWS, MB_YESNO | MB_ICONWARNING); } return (ret == IDYES); From 82a661d756b0990ce79689982e3a6cd426060d5f Mon Sep 17 00:00:00 2001 From: Jochen Tucht Date: Sun, 20 Jul 2008 16:22:24 +0000 Subject: [PATCH 027/168] Patch #1885119 - Semaphore, LIST_ENTRY --HG-- branch : R2_10 --- Src/DiffContext.cpp | 48 +------------- Src/DiffContext.h | 8 +-- Src/DiffItem.cpp | 45 +------------ Src/DiffItem.h | 13 ++-- Src/DiffItemList.cpp | 77 ++++++++++++---------- Src/DiffItemList.h | 42 ++++++++++-- Src/DiffThread.cpp | 141 ++++++++++------------------------------ Src/DiffThread.h | 32 ++++++++- Src/DirDoc.cpp | 6 +- Src/DirDoc.h | 2 +- Src/DirScan.cpp | 150 +++++++++++++++++-------------------------- Src/DirScan.h | 15 ++--- Src/DirView.cpp | 41 +++++------- Src/DirView.h | 5 +- 14 files changed, 242 insertions(+), 383 deletions(-) diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp index cbac4c8d90d..2462fdcb1c1 100644 --- a/Src/DiffContext.cpp +++ b/Src/DiffContext.cpp @@ -65,7 +65,6 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/ , m_nCompMethod(-1) , m_bIgnoreSmallTimeDiff(FALSE) , m_pCompareStats(NULL) -, m_pList(&m_dirlist) , m_piAbortable(NULL) , m_bStopAfterFirstDiff(FALSE) , m_pFilterList(NULL) @@ -74,37 +73,6 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/ { m_paths.SetLeft(pszLeft); m_paths.SetRight(pszRight); - InitializeCriticalSection(&m_criticalSect); -} - -/** - * @brief Construct copy of existing CDiffContext. - * - * @param [in] pszLeft Initial left-side path. - * @param [in] pszRight Initial right-side path. - * @param [in] src Existing CDiffContext whose data is copied. - */ -CDiffContext::CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight, CDiffContext& src) -{ - // This is used somehow in recursive comparisons - // I think that it is only used during rescan to copy into temporaries - // which modify the original (because pointers are copied below) - // and then the temporary goes away - // so the temporary never exists while the user is interacting with the GUI - - m_paths.SetLeft(pszLeft); - m_paths.SetRight(pszRight); - m_pList = src.m_pList; - m_piFilterGlobal = src.m_piFilterGlobal; - m_nCompMethod = src.m_nCompMethod; - m_bIgnoreSmallTimeDiff = src.m_bIgnoreSmallTimeDiff; - m_bStopAfterFirstDiff = src.m_bStopAfterFirstDiff; - m_pFilterList = src.m_pFilterList; - - EnterCriticalSection(&src.m_criticalSect); - InitializeCriticalSection(&m_criticalSect); - LeaveCriticalSection(&src.m_criticalSect); - DeleteCriticalSection(&src.m_criticalSect); } /** @@ -115,17 +83,6 @@ CDiffContext::~CDiffContext() delete m_pOptions; delete m_pCompareOptions; delete m_pFilterList; - DeleteCriticalSection(&m_criticalSect); -} - -/** - * @brief Add new result item to result list. - * @param [in] di DIFFITEM to add. - */ -void CDiffContext::AddDiff(const DIFFITEM & di) -{ - DiffItemList::AddDiff(di); - m_pCompareStats->AddItem(di.diffcode.diffcode); } /** @@ -138,7 +95,7 @@ void CDiffContext::AddDiff(const DIFFITEM & di) */ void CDiffContext::UpdateStatusFromDisk(POSITION diffpos, BOOL bLeft, BOOL bRight) { - DIFFITEM &di = m_pList->GetAt(diffpos); + DIFFITEM &di = GetDiffRefAt(diffpos); if (bLeft) { di.left.ClearPartial(); @@ -268,7 +225,6 @@ BOOL CDiffContext::CreateCompareOptions(int compareMethod, const DIFFOPTIONS & o else return FALSE; - m_nCompMethod = compareMethod; m_pCompareOptions = GetCompareOptions(compareMethod); if (m_pCompareOptions == NULL) { @@ -320,6 +276,8 @@ CompareOptions * CDiffContext::GetCompareOptions(int compareMethod) break; } + m_nCompMethod = compareMethod; + if (m_pCompareOptions == NULL) return NULL; diff --git a/Src/DiffContext.h b/Src/DiffContext.h index 4db7716f5cb..657116b04dd 100644 --- a/Src/DiffContext.h +++ b/Src/DiffContext.h @@ -54,11 +54,8 @@ class CDiffContext : public DiffItemList }; CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight); - CDiffContext(LPCTSTR pszLeft, LPCTSTR pszRight, CDiffContext& src); ~CDiffContext(); - // add & remove differences - virtual void AddDiff(const DIFFITEM & di); void UpdateVersion(DIFFITEM & di, BOOL bLeft) const; //@{ @@ -88,7 +85,8 @@ class CDiffContext : public DiffItemList /** * Get right-side compare path in normalized form. * @return full path in left-side. - */ String GetNormalizedRight() const { return m_paths.GetRight(); } + */ + String GetNormalizedRight() const { return m_paths.GetRight(); } //@} // change an existing difference @@ -155,10 +153,8 @@ class CDiffContext : public DiffItemList */ int m_nQuickCompareLimit; FilterList * m_pFilterList; /**< Filter list for line filters */ - CRITICAL_SECTION m_criticalSect; /**< Critical section protecting list access. */ private: - CList *m_pList; /**< Pointer to list, used to access list */ DIFFOPTIONS *m_pOptions; /**< Generalized compare options. */ CompareOptions *m_pCompareOptions; /**< Per compare method compare options. */ PathContext m_paths; /**< (root) paths for this context */ diff --git a/Src/DiffItem.cpp b/Src/DiffItem.cpp index f49642dc758..c9133e3375e 100644 --- a/Src/DiffItem.cpp +++ b/Src/DiffItem.cpp @@ -16,50 +16,7 @@ static char THIS_FILE[]=__FILE__; #define new DEBUG_NEW #endif -/** - * @brief Copy constructor. - * @param [in] di Object to copy. - */ -DIFFITEM::DIFFITEM(const DIFFITEM& di) -{ - diffcode = di.diffcode; - left = di.left; - right = di.right; - nsdiffs = di.nsdiffs; - nidiffs = di.nidiffs; - errorDesc = di.errorDesc; - customFlags1 = di.customFlags1; - empty = di.empty; -} - -/** - * @brief Assignment operator override. - * @param [in] di Object to copy. - * @return Copy of given object. - */ -DIFFITEM& DIFFITEM::operator=(const DIFFITEM& di) -{ - if (this != &di) - { - diffcode = di.diffcode; - left = di.left; - right = di.right; - nsdiffs = di.nsdiffs; - nidiffs = di.nidiffs; - errorDesc = di.errorDesc; - customFlags1 = di.customFlags1; - empty = di.empty; - } - return *this; -} - -/** @brief Make and return a diffitem with no data */ -DIFFITEM DIFFITEM::MakeEmptyDiffItem() // static -{ - DIFFITEM di; - di.empty = true; - return di; -} +DIFFITEM DIFFITEM::emptyitem; /** @brief Return path to left file, including all but file name */ String DIFFITEM::getLeftFilepath(const String &sLeftRoot) const diff --git a/Src/DiffItem.h b/Src/DiffItem.h index e7ae2d701dc..3421aaf967c 100644 --- a/Src/DiffItem.h +++ b/Src/DiffItem.h @@ -9,6 +9,7 @@ #ifndef _DIFF_ITEM_H_ #define _DIFF_ITEM_H_ +#include "ListEntry.h" #include "DiffFileInfo.h" /** @@ -118,7 +119,7 @@ struct DIFFCODE * @note times in fileinfo's are seconds since January 1, 1970. * See Dirscan.cpp/fentry and Dirscan.cpp/LoadFiles() */ -struct DIFFITEM +struct DIFFITEM : ListEntry { DiffFileInfo left; /**< Fileinfo for left file */ DiffFileInfo right; /**< Fileinfo for right file */ @@ -126,15 +127,15 @@ struct DIFFITEM int nidiffs; /**< Amount of ignored differences */ String errorDesc; /**< technical note about error */ UINT customFlags1; /**< Custom flags set 1 */ - bool empty; /**< flag to mark diffitem that doesn't have any data */ DIFFCODE diffcode; /**< Compare result */ - static DIFFITEM MakeEmptyDiffItem(); + static DIFFITEM emptyitem; /**< singleton to represent a diffitem that doesn't have any data */ - DIFFITEM() : nidiffs(-1), nsdiffs(-1), customFlags1(0), empty(false) { } - DIFFITEM(const DIFFITEM& di); - DIFFITEM& operator=(const DIFFITEM& di); + DIFFITEM() : nidiffs(-1), nsdiffs(-1), customFlags1(0) + { + } + bool isEmpty() const { return this == &emptyitem; } String getLeftFilepath(const String &sLeftRoot) const; String getRightFilepath(const String &sRightRoot) const; }; diff --git a/Src/DiffItemList.cpp b/Src/DiffItemList.cpp index 9887b9782a4..5893b8c8ae0 100644 --- a/Src/DiffItemList.cpp +++ b/Src/DiffItemList.cpp @@ -15,12 +15,31 @@ static char THIS_FILE[]=__FILE__; #define new DEBUG_NEW #endif +/** + * @brief Constructor + */ +DiffItemList::DiffItemList() +: m_count(0) +{ +} + +/** + * @brief Destructor + */ +DiffItemList::~DiffItemList() +{ + RemoveAll(); +} + /** * @brief Add new diffitem to CDiffContext array */ -void DiffItemList::AddDiff(const DIFFITEM & di) +DIFFITEM &DiffItemList::AddDiff() { - m_dirlist.AddTail(const_cast(di)); + DIFFITEM *p = new DIFFITEM; + m_root.Append(p); + ++m_count; + return *p; } /** @@ -29,7 +48,10 @@ void DiffItemList::AddDiff(const DIFFITEM & di) */ void DiffItemList::RemoveDiff(POSITION diffpos) { - m_dirlist.RemoveAt(diffpos); + DIFFITEM *p = (DIFFITEM *)diffpos; + p->RemoveSelf(); + --m_count; + delete p; } /** @@ -37,7 +59,8 @@ void DiffItemList::RemoveDiff(POSITION diffpos) */ void DiffItemList::RemoveAll() { - m_dirlist.RemoveAll(); + while (m_root.IsSibling(m_root.Flink)) + RemoveDiff((POSITION)m_root.Flink); } /** @@ -45,7 +68,7 @@ void DiffItemList::RemoveAll() */ POSITION DiffItemList::GetFirstDiffPosition() const { - return m_dirlist.GetHeadPosition(); + return (POSITION)m_root.IsSibling(m_root.Flink); } /** @@ -53,37 +76,23 @@ POSITION DiffItemList::GetFirstDiffPosition() const * @param diffpos position of current item, updated to next item position * @return Diff Item in current position */ -DIFFITEM DiffItemList::GetNextDiffPosition(POSITION & diffpos) const -{ - return m_dirlist.GetNext(diffpos); -} - -/** - * @brief Get copy of Diff Item at given position of CDiffContext array - * @param diffpos position of item to return - */ -DIFFITEM DiffItemList::GetDiffAt(POSITION diffpos) const +const DIFFITEM &DiffItemList::GetNextDiffPosition(POSITION & diffpos) const { - DIFFITEM di = m_dirlist.GetAt(diffpos); - return di; + DIFFITEM *p = (DIFFITEM *)diffpos; + diffpos = (POSITION)m_root.IsSibling(p->Flink); + return *p; } /** - * @brief Get Diff Item (by reference) at given position of CDiffContext array - * @param diffpos position of item to return - */ -DIFFITEM & DiffItemList::GetDiffRefAt(POSITION diffpos) -{ - DIFFITEM & di = m_dirlist.GetAt(diffpos); - return di; -} - -/** - * @brief Get number of items in CDiffContext array + * @brief Get position of next item in CDiffContext array + * @param diffpos position of current item, updated to next item position + * @return Diff Item (by reference) in current position */ -int DiffItemList::GetDiffCount() const +DIFFITEM &DiffItemList::GetNextDiffRefPosition(POSITION & diffpos) { - return m_dirlist.GetCount(); + DIFFITEM *p = (DIFFITEM *)diffpos; + diffpos = (POSITION)m_root.IsSibling(p->Flink); + return *p; } /** @@ -102,7 +111,7 @@ int DiffItemList::GetDiffCount() const void DiffItemList::SetDiffStatusCode(POSITION diffpos, UINT diffcode, UINT mask) { ASSERT(diffpos); - DIFFITEM & di = m_dirlist.GetAt(diffpos); + DIFFITEM & di = GetDiffRefAt(diffpos); ASSERT(! ((~mask) & diffcode) ); // make sure they only set flags in their mask di.diffcode.diffcode &= (~mask); // remove current data di.diffcode.diffcode |= diffcode; // add new data @@ -114,7 +123,7 @@ void DiffItemList::SetDiffStatusCode(POSITION diffpos, UINT diffcode, UINT mask) void DiffItemList::SetDiffCounts(POSITION diffpos, UINT diffs, UINT ignored) { ASSERT(diffpos); - DIFFITEM & di = m_dirlist.GetAt(diffpos); + DIFFITEM & di = GetDiffRefAt(diffpos); di.nidiffs = ignored; // see StoreDiffResult() in DirScan.cpp di.nsdiffs = diffs; } @@ -127,7 +136,7 @@ void DiffItemList::SetDiffCounts(POSITION diffpos, UINT diffs, UINT ignored) UINT DiffItemList::GetCustomFlags1(POSITION diffpos) const { ASSERT(diffpos); - const DIFFITEM & di = m_dirlist.GetAt(diffpos); + const DIFFITEM & di = GetDiffAt(diffpos); return di.customFlags1; } @@ -139,6 +148,6 @@ UINT DiffItemList::GetCustomFlags1(POSITION diffpos) const void DiffItemList::SetCustomFlags1(POSITION diffpos, UINT flag) { ASSERT(diffpos); - DIFFITEM & di = m_dirlist.GetAt(diffpos); + DIFFITEM & di = GetDiffRefAt(diffpos); di.customFlags1 = flag; } diff --git a/Src/DiffItemList.h b/Src/DiffItemList.h index 92f84503f33..96ef4724f03 100644 --- a/Src/DiffItemList.h +++ b/Src/DiffItemList.h @@ -17,15 +17,18 @@ class DiffItemList { public: + DiffItemList(); + ~DiffItemList(); // add & remove differences - virtual void AddDiff(const DIFFITEM & di); - virtual void RemoveDiff(POSITION diffpos); - virtual void RemoveAll(); + DIFFITEM &AddDiff(); + void RemoveDiff(POSITION diffpos); + void RemoveAll(); // to iterate over all differences on list POSITION GetFirstDiffPosition() const; - DIFFITEM GetNextDiffPosition(POSITION & diffpos) const; - DIFFITEM GetDiffAt(POSITION diffpos) const; + const DIFFITEM & GetNextDiffPosition(POSITION & diffpos) const; + DIFFITEM & GetNextDiffRefPosition(POSITION & diffpos); + const DIFFITEM & GetDiffAt(POSITION diffpos) const; DIFFITEM & GetDiffRefAt(POSITION diffpos); int GetDiffCount() const; @@ -36,7 +39,34 @@ class DiffItemList void SetCustomFlags1(POSITION diffpos, UINT flag); protected: - CList m_dirlist; /**< List of diffitems */ + int m_count; + ListEntry m_root; /**< Root of list of diffitems */ }; +/** + * @brief Get copy of Diff Item at given position of CDiffContext array + * @param diffpos position of item to return + */ +inline const DIFFITEM & DiffItemList::GetDiffAt(POSITION diffpos) const +{ + return *reinterpret_cast(diffpos); +} + +/** + * @brief Get Diff Item (by reference) at given position of CDiffContext array + * @param diffpos position of item to return + */ +inline DIFFITEM & DiffItemList::GetDiffRefAt(POSITION diffpos) +{ + return *reinterpret_cast(diffpos); +} + +/** + * @brief Get number of items in CDiffContext array + */ +inline int DiffItemList::GetDiffCount() const +{ + return m_count; +} + #endif // _DIFF_ITEM_LIST_H_ diff --git a/Src/DiffThread.cpp b/Src/DiffThread.cpp index 5cfc0eb71fc..ca9281b178e 100644 --- a/Src/DiffThread.cpp +++ b/Src/DiffThread.cpp @@ -23,17 +23,16 @@ // $Id$ #include "stdafx.h" -#include +#include "UnicodeString.h" #include "diffcontext.h" #include "diffthread.h" #include "DirScan.h" #include "Plugins.h" +#include "DiffItemList.h" #include "PathContext.h" #include "CompareStats.h" #include "IAbortable.h" -using namespace std; - /** * @brief Force compare to be single-threaded. * Set this to true in order to single step through entire compare process all @@ -46,37 +45,6 @@ using namespace std; */ static bool bSinglethreaded = false; -/** - * @brief Structure used in sending data to the threads. - * As thread functions have only one parameter we must pack all - * the data we need inside structure. - */ -struct DiffFuncStruct -{ - CDiffContext * context; /**< Compare context. */ - UINT msgUIUpdate; /**< Windows message for updating GUI. */ - HWND hWindow; /**< Window getting status updates. */ - CDiffThread::ThreadState nThreadState; /**< Thread state. */ - BOOL bRecursive; /**< Is compare recursive (subfolders included)? */ - DiffThreadAbortable * m_pAbortgate; /**< Interface for aborting compare. */ - bool bOnlyRequested; /**< Compare only requested items? */ - std::vector *pItemList; /**< List of items to compare. */ - HANDLE hEvent; /**< Event for synchronizing thread start. */ - - DiffFuncStruct() - : context(NULL) - , msgUIUpdate(0) - , hWindow(0) - , nThreadState(CDiffThread::THREAD_NOTSTARTED) - , bRecursive(FALSE) - , m_pAbortgate(NULL) - , bOnlyRequested(false) - , pItemList(NULL) - , hEvent(NULL) - {} -}; - - /** @brief abort handler for CDiffThread -- just a gateway to CDiffThread */ class DiffThreadAbortable : public IAbortable { @@ -109,7 +77,7 @@ CDiffThread::CDiffThread() */ CDiffThread::~CDiffThread() { - CloseHandle(m_pDiffParm->hEvent); + CloseHandle(m_pDiffParm->hSemaphore); delete m_pDiffParm; delete m_pAbortgate; } @@ -141,11 +109,13 @@ bool CDiffThread::ShouldAbort() const /** * @brief Start and run directory compare thread. + * @param [in] dir1 First directory to compare. + * @param [in] dir2 Second directory to compare. * @param [in] bRecursive Is the compare recursive (subfolders included)? * @return Success (1) or error for thread. Currently always 1. - * @note Folders names to compare are passed in the compare context. */ -UINT CDiffThread::CompareDirectories(BOOL bRecursive) +UINT CDiffThread::CompareDirectories(const String & dir1, + const String & dir2, BOOL bRecursive) { ASSERT(m_pDiffParm->nThreadState != THREAD_COMPARING); @@ -155,21 +125,24 @@ UINT CDiffThread::CompareDirectories(BOOL bRecursive) m_pDiffParm->hWindow = m_hWnd; m_pDiffParm->m_pAbortgate = m_pAbortgate; m_pDiffParm->bOnlyRequested = m_bOnlyRequested; - m_pDiffParm->pItemList = &m_diffList; m_bAborting = FALSE; m_pDiffParm->nThreadState = THREAD_COMPARING; - m_pDiffParm->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + m_pDiffParm->hSemaphore = CreateSemaphore(0, 0, LONG_MAX, 0); + + m_pDiffParm->context->m_pCompareStats->SetCompareState(CompareStats::STATE_START); if (bSinglethreaded) { - DiffThreadCollect(m_pDiffParm); + if (m_bOnlyRequested == FALSE) + DiffThreadCollect(m_pDiffParm); DiffThreadCompare(m_pDiffParm); } else { - m_threads[0] = AfxBeginThread(DiffThreadCollect, m_pDiffParm); + if (m_bOnlyRequested == FALSE) + m_threads[0] = AfxBeginThread(DiffThreadCollect, m_pDiffParm); m_threads[1] = AfxBeginThread(DiffThreadCompare, m_pDiffParm); } @@ -223,8 +196,8 @@ UINT DiffThreadCollect(LPVOID lpParam) { PathContext paths; DiffFuncStruct *myStruct = (DiffFuncStruct *) lpParam; - UINT msgID = myStruct->msgUIUpdate; - bool bOnlyRequested = myStruct->bOnlyRequested; + + ASSERT(myStruct->bOnlyRequested == FALSE); // Stash abortable interface into context myStruct->context->SetAbortable(myStruct->m_pAbortgate); @@ -239,51 +212,28 @@ UINT DiffThreadCollect(LPVOID lpParam) paths.SetLeft(myStruct->context->GetNormalizedLeft().c_str()); paths.SetRight(myStruct->context->GetNormalizedRight().c_str()); - if (bOnlyRequested) - { - // Tell compare thread it can start comparing. - SetEvent(myStruct->hEvent); - - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_COMPARE); - DirScan_CompareItems(myStruct->context); - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE); - } - else - { - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_START); + String subdir; // blank to start at roots specified in diff context #ifdef _DEBUG - _CrtMemState memStateBefore; - _CrtMemState memStateAfter; - _CrtMemState memStateDiff; - _CrtMemCheckpoint(&memStateBefore); + _CrtMemState memStateBefore; + _CrtMemState memStateAfter; + _CrtMemState memStateDiff; + _CrtMemCheckpoint(&memStateBefore); #endif - // Tell compare thread it can start comparing. - SetEvent(myStruct->hEvent); - - // Build results list (except delaying file comparisons until below) - // Empty subdirs to start compare from root folders in diff context - DirScan_GetItems(paths, _T(""), _T(""), myStruct->pItemList, - casesensitive, depth, myStruct->context); + // Build results list (except delaying file comparisons until below) + DirScan_GetItems(paths, subdir, subdir, myStruct, casesensitive, depth); #ifdef _DEBUG - _CrtMemCheckpoint(&memStateAfter); - _CrtMemDifference(&memStateDiff, &memStateBefore, &memStateAfter); - _CrtMemDumpStatistics(&memStateDiff); + _CrtMemCheckpoint(&memStateAfter); + _CrtMemDifference(&memStateDiff, &memStateBefore, &memStateAfter); + _CrtMemDumpStatistics(&memStateDiff); #endif - } - - // Add sentinel to ItemList - EnterCriticalSection(&myStruct->context->m_criticalSect); - DIFFITEM *di = new DIFFITEM(); - di->empty = true; - myStruct->pItemList->push_back(di); - LeaveCriticalSection(&myStruct->context->m_criticalSect); + // ReleaseSemaphore() once again to signal that collect phase is ready + ReleaseSemaphore(myStruct->hSemaphore, 1, 0); return 1; } - /** * @brief Folder compare thread function. * @@ -295,9 +245,6 @@ UINT DiffThreadCollect(LPVOID lpParam) UINT DiffThreadCompare(LPVOID lpParam) { DiffFuncStruct *myStruct = (DiffFuncStruct *) lpParam; - HWND hWnd = myStruct->hWindow; - UINT msgID = myStruct->msgUIUpdate; - bool bOnlyRequested = myStruct->bOnlyRequested; // Stash abortable interface into context myStruct->context->SetAbortable(myStruct->m_pAbortgate); @@ -306,37 +253,19 @@ UINT DiffThreadCompare(LPVOID lpParam) // when we exit the thread, we delete this and release the scripts CAssureScriptsForThread scriptsForRescan; - // Give another thread at max one second head start for initialization. - WaitForSingleObject(myStruct->hEvent, 1000); + myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_COMPARE); - if (bOnlyRequested) - { - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_COMPARE); - DirScan_CompareItems(myStruct->context); - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE); - } + // Now do all pending file comparisons + if (myStruct->bOnlyRequested) + DirScan_CompareRequestedItems(myStruct); else - { + DirScan_CompareItems(myStruct); - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_COMPARE); - - // Now do all pending file comparisons - DirScan_CompareItems(myStruct->pItemList, myStruct->context); - - myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE); - } - - // Empty the list - while (!myStruct->pItemList->empty()) - { - DIFFITEM * di = myStruct->pItemList->back(); - delete di; - myStruct->pItemList->pop_back(); - } + myStruct->context->m_pCompareStats->SetCompareState(CompareStats::STATE_IDLE); // Send message to UI to update myStruct->nThreadState = CDiffThread::THREAD_COMPLETED; // msgID=MSG_UI_UPDATE=1025 (2005-11-29, Perry) - PostMessage(hWnd, msgID, NULL, NULL); + PostMessage(myStruct->hWindow, myStruct->msgUIUpdate, NULL, NULL); return 1; } diff --git a/Src/DiffThread.h b/Src/DiffThread.h index b18911d6995..636056540f0 100644 --- a/Src/DiffThread.h +++ b/Src/DiffThread.h @@ -25,7 +25,6 @@ #ifndef _DIFFTHREAD_H #define _DIFFTHREAD_H -#include #include "diffcontext.h" struct DiffFuncStruct; @@ -53,7 +52,7 @@ class CDiffThread CDiffThread(); ~CDiffThread(); void SetContext(CDiffContext * pCtx); - UINT CompareDirectories(BOOL bRecursive); + UINT CompareDirectories(const String & dir1, const String & dir2, BOOL bRecursive); void SetHwnd(HWND hWnd); void SetMessageIDs(UINT updateMsg); void SetCompareSelected(bool bSelected = false); @@ -71,13 +70,40 @@ class CDiffThread CWinThread * m_threads[2]; /**< Compare threads. */ DiffFuncStruct * m_pDiffParm; /**< Structure for sending data to threads. */ DiffThreadAbortable * m_pAbortgate; - std::vector m_diffList; /**< Compare-time list for compared items. */ UINT m_msgUpdateUI; /**< UI-update message number */ HWND m_hWnd; /**< Handle to folder compare GUI window */ bool m_bAborting; /**< Is compare aborting? */ bool m_bOnlyRequested; /**< Are we comparing only requested items (Update?) */ }; +/** + * @brief Structure used in sending data to the threads. + * As thread functions have only one parameter we must pack all + * the data we need inside structure. + */ +struct DiffFuncStruct +{ + CDiffContext * context; /**< Compare context. */ + UINT msgUIUpdate; /**< Windows message for updating GUI. */ + HWND hWindow; /**< Window getting status updates. */ + CDiffThread::ThreadState nThreadState; /**< Thread state. */ + BOOL bRecursive; /**< Is compare recursive (subfolders included)? */ + DiffThreadAbortable * m_pAbortgate; /**< Interface for aborting compare. */ + bool bOnlyRequested; /**< Compare only requested items? */ + HANDLE hSemaphore; /**< Semaphore for synchronizing threads. */ + + DiffFuncStruct() + : context(NULL) + , msgUIUpdate(0) + , hWindow(0) + , nThreadState(CDiffThread::THREAD_NOTSTARTED) + , bRecursive(FALSE) + , m_pAbortgate(NULL) + , bOnlyRequested(false) + , hSemaphore(NULL) + {} +}; + // Thread functions UINT DiffThreadCollect(LPVOID lpParam); UINT DiffThreadCompare(LPVOID lpParam); diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp index 5dd42ed1e1c..a17ef4bf75e 100644 --- a/Src/DirDoc.cpp +++ b/Src/DirDoc.cpp @@ -362,15 +362,13 @@ void CDirDoc::Rescan() // Show active filter name in statusbar pf->SetFilterStatusDisplay(theApp.m_globalFileFilter.GetFilterNameOrMask()); - // Empty display before new compare - m_pDirView->DeleteAllDisplayItems(); - // Folder names to compare are in the compare context m_diffThread.SetContext(m_pCtxt); m_diffThread.SetHwnd(m_pDirView->GetSafeHwnd()); m_diffThread.SetMessageIDs(MSG_UI_UPDATE); m_diffThread.SetCompareSelected(!!m_bMarkedRescan); - m_diffThread.CompareDirectories(m_bRecursive); + m_diffThread.CompareDirectories(m_pCtxt->GetNormalizedLeft(), + m_pCtxt->GetNormalizedRight(), m_bRecursive); m_bMarkedRescan = FALSE; } diff --git a/Src/DirDoc.h b/Src/DirDoc.h index 46818e3b227..9e68b3e7330 100644 --- a/Src/DirDoc.h +++ b/Src/DirDoc.h @@ -123,7 +123,7 @@ class CDirDoc : public CDocument BOOL HasDiffs() const { return m_pCtxt != NULL; } const CDiffContext & GetDiffContext() const { return *m_pCtxt; } - DIFFITEM GetDiffByKey(POSITION key) const { return m_pCtxt->GetDiffAt(key); } + const DIFFITEM & GetDiffByKey(POSITION key) const { return m_pCtxt->GetDiffAt(key); } DIFFITEM & GetDiffRefByKey(POSITION key) { return m_pCtxt->GetDiffRefAt(key); } String GetLeftBasePath() const { return m_pCtxt->GetNormalizedLeft(); } String GetRightBasePath() const { return m_pCtxt->GetNormalizedRight(); } diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp index 445c4115928..b506a62ff4c 100644 --- a/Src/DirScan.cpp +++ b/Src/DirScan.cpp @@ -7,13 +7,12 @@ // $Id$ #include "stdafx.h" -#include #include "UnicodeString.h" #include "Merge.h" #include "LogFile.h" #include "DirScan.h" #include "CompareStats.h" -#include "DiffContext.h" +#include "DiffThread.h" #include "FolderCmp.h" #include "FileFilterHelper.h" #include "codepage.h" @@ -29,21 +28,14 @@ static char THIS_FILE[] = __FILE__; #endif -using namespace std; - // Static functions (ie, functions only used locally) -void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt); +void CompareDiffItem(DIFFITEM &di, CDiffContext * pCtxt); static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt, const FolderCmp * pCmpData); -static void AddToList(LPCTSTR sLeftDir, LPCTSTR sRightDir, const DirItem * lent, const DirItem * rent, - int code, vector * pList, CDiffContext *pCtxt); +static void AddToList(const String &sLeftDir, const String &sRightDir, const DirItem * lent, const DirItem * rent, + UINT code, DiffFuncStruct *myStruct); static void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt); -/** @brief cmpmth is a typedef for a pointer to a method */ -typedef int (CString::*cmpmth)(LPCTSTR sz) const; -/** @brief CALL_MEMBER_FN calls a method through a pointer to a method */ -#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember)) - /** * @brief Help minimize memory footprint by sharing CStringData if possible. * @@ -71,33 +63,31 @@ typedef int (CString::*cmpmth)(LPCTSTR sz) const; * @param [in] paths Root paths of compare * @param [in] leftsubdir Left side subdirectory under root path * @param [in] rightsubdir Right side subdirectory under root path - * @param [in,out] pList List where found items are added * @param [in] casesensitive Is filename compare casesensitive? * @param [in] depth Levels of subdirectories to scan, -1 scans all * @param [in] pCtxt Compare context * @return 1 normally, -1 if compare was aborted */ -int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, - LPCTSTR rightsubdir, vector * pList, - bool casesensitive, int depth, CDiffContext * pCtxt) +int DirScan_GetItems(const PathContext &paths, const String &leftsubdir, + const String &rightsubdir, DiffFuncStruct *myStruct, + bool casesensitive, int depth) { static const TCHAR backslash[] = _T("\\"); - + CDiffContext *pCtxt = myStruct->context; String sLeftDir(paths.GetLeft()); String sRightDir(paths.GetRight()); String leftsubprefix; String rightsubprefix; - if (_tcslen(leftsubdir) > 0) + if (leftsubdir.length()) { sLeftDir = paths_ConcatPath(sLeftDir, leftsubdir); sRightDir = paths_ConcatPath(sRightDir, rightsubdir); - leftsubprefix = leftsubdir; - leftsubprefix += backslash; + leftsubprefix = leftsubdir + backslash; // minimize memory footprint by having left/rightsubprefix share CStringData if possible rightsubprefix = OPTIMIZE_SHARE_CSTRINGDATA ( - _tcsicmp(leftsubdir, rightsubdir) == 0 ? leftsubprefix : - ) String(rightsubdir) + backslash; + leftsubdir.c_str() == rightsubdir.c_str() ? leftsubprefix : + ) rightsubdir + backslash; } DirItemArray leftDirs, leftFiles, rightDirs, rightFiles; @@ -134,7 +124,7 @@ int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, if (i0)) { const UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR; - AddToList(leftsubdir, rightsubdir, 0, &rightDirs[j], nDiffCode, pList, pCtxt); + AddToList(leftsubdir, rightsubdir, 0, &rightDirs[j], nDiffCode, myStruct); // Advance right pointer over right-only entry, and then retest with new pointers ++j; continue; @@ -157,7 +147,7 @@ int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, // We are only interested about list of subdirectories to show - user can open them // TODO: scan one level deeper to see if directories are identical/different const UINT nDiffCode = DIFFCODE::BOTH | DIFFCODE::DIR; - AddToList(leftsubdir, rightsubdir, &leftDirs[i], &rightDirs[j], nDiffCode, pList, pCtxt); + AddToList(leftsubdir, rightsubdir, &leftDirs[i], &rightDirs[j], nDiffCode, myStruct); } else { @@ -166,21 +156,21 @@ int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, // minimize memory footprint by having left/rightnewsub share CStringData if possible String rightnewsub = OPTIMIZE_SHARE_CSTRINGDATA ( - leftsubprefix == rightsubprefix + leftsubprefix.c_str() == rightsubprefix.c_str() && leftDirs[i].filename == rightDirs[j].filename ? leftnewsub : ) rightsubprefix + rightDirs[j].filename; // Test against filter so we don't include contents of filtered out directories // Also this is only place we can test for both-sides directories in recursive compare if (!pCtxt->m_piFilterGlobal->includeDir(leftnewsub.c_str(), rightnewsub.c_str())) { - const int nDiffCode = DIFFCODE::BOTH | DIFFCODE::DIR | DIFFCODE::SKIPPED; - AddToList(leftsubdir, rightsubdir, &leftDirs[i], &rightDirs[j], nDiffCode, pList, pCtxt); + const UINT nDiffCode = DIFFCODE::BOTH | DIFFCODE::DIR | DIFFCODE::SKIPPED; + AddToList(leftsubdir, rightsubdir, &leftDirs[i], &rightDirs[j], nDiffCode, myStruct); } else { // Scan recursively all subdirectories too, we are not adding folders - if (DirScan_GetItems(paths, leftnewsub.c_str(), rightnewsub.c_str(), pList, casesensitive, - depth - 1, pCtxt) == -1) + if (DirScan_GetItems(paths, leftnewsub, rightnewsub, myStruct, casesensitive, + depth - 1) == -1) { return -1; } @@ -208,7 +198,7 @@ int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, collstr(leftFiles[i].filename, rightFiles[j].filename, casesensitive) < 0)) { const UINT nDiffCode = DIFFCODE::LEFT | DIFFCODE::FILE; - AddToList(leftsubdir, rightsubdir, &leftFiles[i], 0, nDiffCode, pList, pCtxt); + AddToList(leftsubdir, rightsubdir, &leftFiles[i], 0, nDiffCode, myStruct); // Advance left pointer over left-only entry, and then retest with new pointers ++i; continue; @@ -217,7 +207,7 @@ int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, collstr(leftFiles[i].filename, rightFiles[j].filename, casesensitive) > 0)) { const UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::FILE; - AddToList(leftsubdir, rightsubdir, 0, &rightFiles[j], nDiffCode, pList, pCtxt); + AddToList(leftsubdir, rightsubdir, 0, &rightFiles[j], nDiffCode, myStruct); // Advance right pointer over right-only entry, and then retest with new pointers ++j; continue; @@ -226,7 +216,7 @@ int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, { ASSERT(j * pList, CDiffContext * pCtxt) +int DirScan_CompareItems(DiffFuncStruct *myStruct) { + CDiffContext *pCtxt = myStruct->context; int res = 1; - - // Wait until we have items in list - while (pList->empty()) - Sleep(100); - - vector::const_iterator iter = pList->begin(); - - // Compare whole list - // Normally compare ends with sentinel item, but aborted compare - // may not add it. So we need to check both cases. - while (iter != pList->end() && !(*iter)->empty) + WaitForSingleObject(myStruct->hSemaphore, INFINITE); + POSITION pos = pCtxt->GetFirstDiffPosition(); + while (pos) { if (pCtxt->ShouldAbort()) { res = -1; break; } - - if ((*iter)->empty) - break; // found sentinel - CompareDiffItem(*(*iter), pCtxt); - - // Some compare methods can be faster than collecting, - // so we can reach the end of list while collect is running. - // In this case we must wait for a while for new items to be - // added to the list. On - while (iter == pList->end() - 1) - Sleep(200); - ++iter; + WaitForSingleObject(myStruct->hSemaphore, INFINITE); + DIFFITEM &di = pCtxt->GetNextDiffRefPosition(pos); + CompareDiffItem(di, pCtxt); } - return res; } @@ -286,8 +259,9 @@ int DirScan_CompareItems(vector * pList, CDiffContext * pCtxt) * @param pCtxt [in,out] Compare context: contains list of items. * @return 1 if compare finished, -1 if compare was aborted */ -int DirScan_CompareItems(CDiffContext * pCtxt) +int DirScan_CompareRequestedItems(DiffFuncStruct *myStruct) { + CDiffContext *pCtxt = myStruct->context; int res = 1; POSITION pos = pCtxt->GetFirstDiffPosition(); @@ -300,11 +274,10 @@ int DirScan_CompareItems(CDiffContext * pCtxt) } POSITION oldPos = pos; - DIFFITEM di = pCtxt->GetNextDiffPosition(pos); + DIFFITEM &di = pCtxt->GetNextDiffRefPosition(pos); if (di.diffcode.isScanNeeded()) { BOOL bItemsExist = TRUE; - pCtxt->RemoveDiff(oldPos); UpdateDiffItem(di, bItemsExist, pCtxt); if (bItemsExist) CompareDiffItem(di, pCtxt); @@ -366,7 +339,7 @@ void UpdateDiffItem(DIFFITEM & di, BOOL & bExists, CDiffContext *pCtxt) * @todo For date compare, maybe we should use creation date if modification * date is missing? */ -void CompareDiffItem(DIFFITEM di, CDiffContext * pCtxt) +void CompareDiffItem(DIFFITEM &di, CDiffContext * pCtxt) { // Clear rescan-request flag (not set by all codepaths) di.diffcode.diffcode &= ~DIFFCODE::NEEDSCAN; @@ -462,8 +435,8 @@ static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt, CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"), di.left.filename.c_str(), di.left.path.c_str(), di.right.path.c_str(), di.diffcode ); - - pCtxt->AddDiff(di); + pCtxt->m_pCompareStats->AddItem(di.diffcode.diffcode); + //pCtxt->AddDiff(di); } /** @@ -472,65 +445,60 @@ static void StoreDiffData(DIFFITEM &di, CDiffContext * pCtxt, * @param [in] sRightDir Right subdirectory. * @param [in] lent Left item data to add. * @param [in] rent Right item data to add. - * @param [in] pList List to where to add item. * @param [in] pCtxt Compare context. */ -static void AddToList(LPCTSTR sLeftDir, LPCTSTR sRightDir, +static void AddToList(const String &sLeftDir, const String &sRightDir, const DirItem * lent, const DirItem * rent, - int code, vector * pList, CDiffContext *pCtxt) + UINT code, DiffFuncStruct *myStruct) { // We must store both paths - we cannot get paths later // and we need unique item paths for example when items // change to identical + DIFFITEM &di = myStruct->context->AddDiff(); - DIFFITEM *di = new DIFFITEM(); - - di->left.path = sLeftDir; - di->right.path = sRightDir; + di.left.path = sLeftDir; + di.right.path = sRightDir; if (lent) { - di->left.filename = lent->filename; - di->left.mtime = lent->mtime; - di->left.ctime = lent->ctime; - di->left.size = lent->size; - di->left.flags.attributes = lent->flags.attributes; + di.left.filename = lent->filename; + di.left.mtime = lent->mtime; + di.left.ctime = lent->ctime; + di.left.size = lent->size; + di.left.flags.attributes = lent->flags.attributes; } else { // Don't break CDirView::DoCopyRightToLeft() - di->left.filename = rent->filename; + di.left.filename = rent->filename; } if (rent) { - di->right.filename = OPTIMIZE_SHARE_CSTRINGDATA + di.right.filename = OPTIMIZE_SHARE_CSTRINGDATA ( - di->left.filename.c_str() == rent->filename.c_str() ? di->left.filename : + di.left.filename.c_str() == rent->filename.c_str() ? di.left.filename : ) rent->filename; - di->right.mtime = rent->mtime; - di->right.ctime = rent->ctime; - di->right.size = rent->size; - di->right.flags.attributes = rent->flags.attributes; + di.right.mtime = rent->mtime; + di.right.ctime = rent->ctime; + di.right.size = rent->size; + di.right.flags.attributes = rent->flags.attributes; } else { // Don't break CDirView::DoCopyLeftToRight() - di->right.filename = lent->filename; + di.right.filename = lent->filename; } - di->diffcode = code; + di.diffcode = code; GetLog()->Write ( CLogFile::LCOMPAREDATA, _T("name=<%s>, leftdir=<%s>, rightdir=<%s>, code=%d"), - di->left.filename.c_str(), di->left.path.c_str(), di->right.path.c_str(), code + di.left.filename.c_str(), di.left.path.c_str(), di.right.path.c_str(), code ); - pCtxt->m_pCompareStats->IncreaseTotalItems(); - - EnterCriticalSection(&pCtxt->m_criticalSect); - pList->push_back(di); - LeaveCriticalSection(&pCtxt->m_criticalSect); + myStruct->context->m_pCompareStats->IncreaseTotalItems(); + ReleaseSemaphore(myStruct->hSemaphore, 1, 0); } void // static diff --git a/Src/DirScan.h b/Src/DirScan.h index 225e8654e06..7bc8c55cd86 100644 --- a/Src/DirScan.h +++ b/Src/DirScan.h @@ -9,18 +9,17 @@ #ifndef DirScan_h_included #define DirScan_h_included -#include - class CDiffContext; +class DiffItemList; class PathContext; -struct DIFFITEM; +class IAbortable; +struct DiffFuncStruct; -int DirScan_GetItems(const PathContext &paths, LPCTSTR leftsubdir, - LPCTSTR rightsubdir, std::vector * pList, - bool casesensitive, int depth, CDiffContext * pCtxt); +int DirScan_GetItems(const PathContext &paths, const String &leftsubdir, const String &rightsubdir, DiffFuncStruct *myStruct, + bool casesensitive, int depth); -int DirScan_CompareItems(std::vector * pList, CDiffContext * pCtxt); -int DirScan_CompareItems(CDiffContext * pCtxt); +int DirScan_CompareItems(DiffFuncStruct *); +int DirScan_CompareRequestedItems(DiffFuncStruct *); void DirScan_InitializeDefaultCodepage(); diff --git a/Src/DirView.cpp b/Src/DirView.cpp index a5215a273b2..19e1e93e95d 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -1503,22 +1503,11 @@ DIFFITEM & CDirView::GetDiffItemRef(int sel) // for whatever these special items are // because here we have to hope client does not modify this // static (shared) item - static DIFFITEM emptyItem = DIFFITEM::MakeEmptyDiffItem(); - return emptyItem; + return DIFFITEM::emptyitem; } return GetDocument()->GetDiffRefByKey(diffpos); } -/** - * Given index in list control, get modifiable reference to its DIFFITEM data - */ -const DIFFITEM & CDirView::GetDiffItemConstRef(int sel) const -{ - CDirView * pDirView = const_cast(this); - return pDirView->GetDiffItemRef(sel); - -} - void CDirView::DeleteAllDisplayItems() { // item data are just positions (diffposes) @@ -1782,13 +1771,10 @@ int CDirView::GetFirstSelectedInd() * - OUT new index of found item * @return DIFFITEM in found index. */ -DIFFITEM CDirView::GetNextSelectedInd(int &ind) +DIFFITEM &CDirView::GetNextSelectedInd(int &ind) { - DIFFITEM di; - int sel =- 1; - - sel = m_pList->GetNextItem(ind, LVNI_SELECTED); - di = GetDiffItem(ind); + int sel = m_pList->GetNextItem(ind, LVNI_SELECTED); + DIFFITEM &di = GetDiffItemRef(ind); ind = sel; return di; @@ -1799,10 +1785,10 @@ DIFFITEM CDirView::GetNextSelectedInd(int &ind) * @param [in] ind Index from where DIFFITEM is wanted. * @return DIFFITEM in given index. */ -DIFFITEM CDirView::GetItemAt(int ind) +DIFFITEM &CDirView::GetItemAt(int ind) { ASSERT(ind != -1); // Trap programmer errors in debug - return GetDiffItem(ind); + return GetDiffItemRef(ind); } // Go to first diff @@ -2174,13 +2160,16 @@ LRESULT CDirView::OnUpdateUIMessage(WPARAM wParam, LPARAM lParam) m_pCmpProgressDlg = NULL; pDoc->CompareReady(); - Redisplay(); - - if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST)) - OnFirstdiff(); - else - MoveFocus(0, 0, 0); + // Don't Redisplay() if triggered by OnMarkedRescan() + if (GetListCtrl().GetItemCount() == 0) + { + Redisplay(); + if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST)) + OnFirstdiff(); + else + MoveFocus(0, 0, 0); + } // If compare took more than TimeToSignalCompare seconds, notify user clock_t elapsed = clock() - m_compareStart; TCHAR text[200]; diff --git a/Src/DirView.h b/Src/DirView.h index 863053a80a1..3bb0929ddec 100644 --- a/Src/DirView.h +++ b/Src/DirView.h @@ -116,8 +116,8 @@ class CDirView : public CListView UINT GetSelectedCount() const; int GetFirstSelectedInd(); - DIFFITEM GetNextSelectedInd(int &ind); - DIFFITEM GetItemAt(int ind); + DIFFITEM & GetNextSelectedInd(int &ind); + DIFFITEM & GetItemAt(int ind); void AddParentFolderItem(BOOL bEnable); void RefreshOptions(); @@ -405,7 +405,6 @@ class CDirView : public CListView POSITION GetItemKeyFromData(DWORD_PTR dw) const; const DIFFITEM & GetDiffItem(int sel) const; DIFFITEM & GetDiffItemRef(int sel); - const DIFFITEM & GetDiffItemConstRef(int sel) const; int GetSingleSelectedItem() const; bool IsItemNavigableDiff(const DIFFITEM & di) const; void MoveFocus(int currentInd, int i, int selCount); From 572628e44dc2bde9378e386741eab27b0e9f7b85 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 21 Jul 2008 09:41:45 +0000 Subject: [PATCH 028/168] PATCH: [ 2013845 ] Add option to enable plugins (disabled by default) PATCH: [ 2021722 ] Add dialog listing available plugins --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 + Src/ConfigLog.cpp | 7 +- Src/ConfigLog.h | 1 + Src/DiffContext.cpp | 1 + Src/DiffContext.h | 1 + Src/DiffWrapper.cpp | 112 +- Src/DiffWrapper.h | 2 + Src/DirDoc.cpp | 1 + Src/DirView.cpp | 11 + Src/DirView.h | 7 +- Src/FolderCmp.cpp | 49 +- Src/Languages/English.pot | 2500 +++++++++++++++++++------------------ Src/MainFrm.cpp | 14 +- Src/MainFrm.h | 8 +- Src/Merge.rc | 31 + Src/Merge.vcproj | 40 + Src/MergeDoc.cpp | 1 + Src/MergeEditView.cpp | 11 + Src/MergeEditView.h | 2 +- Src/OptionsDef.h | 3 + Src/OptionsInit.cpp | 2 + Src/PluginsListDlg.cpp | 138 ++ Src/PluginsListDlg.h | 45 + Src/resource.h | 14 +- 24 files changed, 1698 insertions(+), 1305 deletions(-) create mode 100644 Src/PluginsListDlg.cpp create mode 100644 Src/PluginsListDlg.h diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index f3e5606fbd6..07ea399aa1b 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -8,6 +8,8 @@ WinMerge 2.9.1.6 Manual: Reorganize structure (#2011924) Add ShellExtension menu for drive letters (root folders) (#2011602) Remove buildall.bat (#2013576) + New option to enable plugins (disabled by default) (#2013845) + Add dialog listing available plugins (#2021722) 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) diff --git a/Src/ConfigLog.cpp b/Src/ConfigLog.cpp index 3c176cff611..abf4e3f3480 100644 --- a/Src/ConfigLog.cpp +++ b/Src/ConfigLog.cpp @@ -508,12 +508,13 @@ BOOL CConfigLog::DoFile(bool writing, CString &sError) WriteLocaleSettings(m_file, LOCALE_SYSTEM_DEFAULT, _T("Locale (System)")); // Codepage settings - WriteItemYesNo(0, _T("Detect codepage automatically for RC and HTML files"), &m_cpSettings.bDetectCodepage); + WriteItemYesNo(1, _T("Detect codepage automatically for RC and HTML files"), &m_cpSettings.bDetectCodepage); WriteItem(m_file, 1, _T("unicoder codepage"), getDefaultCodepage()); // Plugins - FileWriteString(_T("\nPlugins: ")); - FileWriteString(_T("\n Unpackers: ")); + FileWriteString(_T("\nPlugins:\n")); + WriteItemYesNo(1, _T("Plugins enabled"), &m_miscSettings.bPluginsEnabled); + FileWriteString(_T(" Unpackers: ")); WritePluginsInLogFile(L"FILE_PACK_UNPACK", m_file); WritePluginsInLogFile(L"BUFFER_PACK_UNPACK", m_file); FileWriteString(_T("\n Prediffers: ")); diff --git a/Src/ConfigLog.h b/Src/ConfigLog.h index d57c3ce8b6b..b9cd5ff4fb9 100644 --- a/Src/ConfigLog.h +++ b/Src/ConfigLog.h @@ -67,6 +67,7 @@ struct MISCSETTINGS BOOL bSyntaxHighlight; BOOL bInsertTabs; INT nTabSize; + BOOL bPluginsEnabled; }; /** diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp index 2462fdcb1c1..5a7811d9807 100644 --- a/Src/DiffContext.cpp +++ b/Src/DiffContext.cpp @@ -70,6 +70,7 @@ CDiffContext::CDiffContext(LPCTSTR pszLeft /*=NULL*/, LPCTSTR pszRight /*=NULL*/ , m_pFilterList(NULL) , m_pCompareOptions(NULL) , m_pOptions(NULL) +, m_bPluginsEnabled(false) { m_paths.SetLeft(pszLeft); m_paths.SetRight(pszRight); diff --git a/Src/DiffContext.h b/Src/DiffContext.h index 657116b04dd..280b00387cf 100644 --- a/Src/DiffContext.h +++ b/Src/DiffContext.h @@ -152,6 +152,7 @@ class CDiffContext : public DiffItemList * cannot compare large files. And large files are usually binary files. */ int m_nQuickCompareLimit; + bool m_bPluginsEnabled; /**< Are plugins enabled? */ FilterList * m_pFilterList; /**< Filter list for line filters */ private: diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp index 69601477473..73d72b5f2d6 100644 --- a/Src/DiffWrapper.cpp +++ b/Src/DiffWrapper.cpp @@ -91,6 +91,7 @@ CDiffWrapper::CDiffWrapper() , m_bPathsAreTemp(FALSE) , m_pMovedLines(NULL) , m_pFilterList(NULL) +, m_bPluginsEnabled(false) { ZeroMemory(&m_status, sizeof(DIFFSTATUS)); // character that ends a line. Currently this is always `\n' @@ -108,6 +109,15 @@ CDiffWrapper::~CDiffWrapper() delete m_pMovedLines; } +/** + * @brief Set plugins enabled/disabled. + * @param [in] enable if true plugins are enabled. + */ +void CDiffWrapper::EnablePlugins(bool enable) +{ + m_bPluginsEnabled = enable; +} + /** * @brief Enables/disables patch-file creation and sets filename. * This function enables or disables patch file creation. When @@ -663,34 +673,53 @@ BOOL CDiffWrapper::RunFileDiff() replace_char(&*filepath2.begin(), '/', '\\'); BOOL bRet = TRUE; - String strFile1Temp = filepath1; - String strFile2Temp = filepath2; + String strFile1Temp(filepath1); + String strFile2Temp(filepath2); m_options.SetToDiffUtils(); if (m_bUseDiffList) m_nDiffs = m_pDiffList->GetSize(); - // Do the preprocessing now, overwrite the temp files - // NOTE: FileTransform_UCS2ToUTF8() may create new temp - // files and return new names, those created temp files - // are deleted in end of function. - if (m_infoPrediffer->bToBeScanned) + if (m_bPluginsEnabled) { - // this can only fail if the data can not be saved back (no more - // place on disk ???) What to do then ?? - FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer.c_str(), m_infoPrediffer, - m_bPathsAreTemp); - } - else - { - // This can fail if the prediffer has a problem - if (FileTransform_Prediffing(strFile1Temp, *m_infoPrediffer, + // Do the preprocessing now, overwrite the temp files + // NOTE: FileTransform_UCS2ToUTF8() may create new temp + // files and return new names, those created temp files + // are deleted in end of function. + if (m_infoPrediffer->bToBeScanned) + { + // this can only fail if the data can not be saved back (no more + // place on disk ???) What to do then ?? + FileTransform_Prediffing(strFile1Temp, m_sToFindPrediffer.c_str(), m_infoPrediffer, + m_bPathsAreTemp); + } + else + { + // This can fail if the prediffer has a problem + if (FileTransform_Prediffing(strFile1Temp, *m_infoPrediffer, + m_bPathsAreTemp) == FALSE) + { + // display a message box + CString sError; + LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp.c_str(), + m_infoPrediffer->pluginName.c_str()); + AfxMessageBox(sError, MB_OK | MB_ICONSTOP); + // don't use any more this prediffer + m_infoPrediffer->bToBeScanned = FALSE; + m_infoPrediffer->pluginName.erase(); + } + } + + // We use the same plugin for both files, so it must be defined before + // second file + ASSERT(m_infoPrediffer->bToBeScanned == FALSE); + if (FileTransform_Prediffing(strFile2Temp, *m_infoPrediffer, m_bPathsAreTemp) == FALSE) { // display a message box CString sError; - LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile1Temp.c_str(), + LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp.c_str(), m_infoPrediffer->pluginName.c_str()); AfxMessageBox(sError, MB_OK | MB_ICONSTOP); // don't use any more this prediffer @@ -699,22 +728,11 @@ BOOL CDiffWrapper::RunFileDiff() } } + // Comparing UTF-8 files seems to require this conversion? + // I'm still very confused about why, as what the functions + // document doing is UCS2 to UTF-8 conversion, nothing else. + // Something is wrong here. - Kimmo FileTransform_UCS2ToUTF8(strFile1Temp, m_bPathsAreTemp); - // We use the same plugin for both files, so it must be defined before - // second file - ASSERT(m_infoPrediffer->bToBeScanned == FALSE); - if (FileTransform_Prediffing(strFile2Temp, *m_infoPrediffer, - m_bPathsAreTemp) == FALSE) - { - // display a message box - CString sError; - LangFormatString2(sError, IDS_PREDIFFER_ERROR, strFile2Temp.c_str(), - m_infoPrediffer->pluginName.c_str()); - AfxMessageBox(sError, MB_OK | MB_ICONSTOP); - // don't use any more this prediffer - m_infoPrediffer->bToBeScanned = FALSE; - m_infoPrediffer->pluginName.erase(); - } FileTransform_UCS2ToUTF8(strFile2Temp, m_bPathsAreTemp); DiffFileData diffdata; @@ -793,26 +811,28 @@ BOOL CDiffWrapper::RunFileDiff() // Done with diffutils filedata diffdata.Close(); - // Delete temp files transformation functions possibly created - if (lstrcmpi(filepath1.c_str(), strFile1Temp.c_str()) != 0) + if (m_bPluginsEnabled) { - if (!::DeleteFile(strFile1Temp.c_str())) + // Delete temp files transformation functions possibly created + if (lstrcmpi(filepath1.c_str(), strFile1Temp.c_str()) != 0) { - LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"), - strFile1Temp.c_str(), GetSysError(GetLastError()))); + if (!::DeleteFile(strFile1Temp.c_str())) + { + LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"), + strFile1Temp.c_str(), GetSysError(GetLastError()))); + } + strFile1Temp.erase(); } - strFile1Temp.erase(); - } - if (lstrcmpi(filepath2.c_str(), strFile2Temp.c_str()) != 0) - { - if (!::DeleteFile(strFile2Temp.c_str())) + if (lstrcmpi(filepath2.c_str(), strFile2Temp.c_str()) != 0) { - LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"), - strFile2Temp.c_str(), GetSysError(GetLastError()))); + if (!::DeleteFile(strFile2Temp.c_str())) + { + LogErrorString(Fmt(_T("DeleteFile(%s) failed: %s"), + strFile2Temp.c_str(), GetSysError(GetLastError()))); + } + strFile2Temp.erase(); } - strFile2Temp.erase(); } - return bRet; } diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h index ac8a2c430d3..7ab6fc59ec7 100644 --- a/Src/DiffWrapper.h +++ b/Src/DiffWrapper.h @@ -168,6 +168,7 @@ class CDiffWrapper MovedLines * GetMovedLines() { return m_pMovedLines; } void SetCompareFiles(const String &OriginalFile1, const String &OriginalFile2); void SetFilterList(LPCTSTR filterStr); + void EnablePlugins(bool enable); protected: String FormatSwitchString(); @@ -202,6 +203,7 @@ class CDiffWrapper DiffList *m_pDiffList; /**< Pointer to external DiffList */ MovedLines * m_pMovedLines; FilterCommentsManager * m_FilterCommentsManager; /**< Comments filtering manager */ + bool m_bPluginsEnabled; /**< Are plugins enabled? */ }; diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp index a17ef4bf75e..e86b14f0717 100644 --- a/Src/DirDoc.cpp +++ b/Src/DirDoc.cpp @@ -343,6 +343,7 @@ void CDirDoc::Rescan() m_pCtxt->m_bIgnoreSmallTimeDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME); m_pCtxt->m_bStopAfterFirstDiff = GetOptionsMgr()->GetBool(OPT_CMP_STOP_AFTER_FIRST); m_pCtxt->m_nQuickCompareLimit = GetOptionsMgr()->GetInt(OPT_CMP_QUICK_LIMIT); + m_pCtxt->m_bPluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED); m_pCtxt->m_pCompareStats = m_pCompareStats; // Set total items count since we don't collect items diff --git a/Src/DirView.cpp b/Src/DirView.cpp index 19e1e93e95d..0c377651809 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -47,6 +47,7 @@ #include "DirCmpReport.h" #include "DirCompProgressDlg.h" #include "CompareStatisticsDlg.h" +#include "PluginsListDlg.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -222,6 +223,7 @@ BEGIN_MESSAGE_MAP(CDirView, CListView) ON_COMMAND(ID_EDIT_PASTE, OnEditPaste) ON_COMMAND(ID_EDIT_UNDO, OnEditUndo) ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo) + ON_COMMAND(ID_PLUGINS_LIST, &CDirView::OnPluginsList) //}}AFX_MSG_MAP ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick) ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged) @@ -3210,3 +3212,12 @@ void CDirView::OnUpdateEditUndo(CCmdUI* pCmdUI) pCmdUI->Enable(FALSE); } } + +/** + * @brief Show the plugins list dialog. + */ +void CDirView::OnPluginsList() +{ + PluginsListDlg dlg; + dlg.DoModal(); +} diff --git a/Src/DirView.h b/Src/DirView.h index 3bb0929ddec..ad93590308a 100644 --- a/Src/DirView.h +++ b/Src/DirView.h @@ -373,13 +373,14 @@ class CDirView : public CListView afx_msg void OnEditPaste(); afx_msg void OnEditUndo(); afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI); + afx_msg void OnItemChanged(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnPluginsList(); //}}AFX_MSG DECLARE_MESSAGE_MAP() BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult); BOOL OnHeaderEndDrag(LPNMHEADER hdr, LRESULT* pResult); - afx_msg void OnItemChanged(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnBeginLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); - afx_msg void OnEndLabelEdit(NMHDR* pNMHDR, LRESULT* pResult); private: void OpenSelection(PackingInfo * infoUnpacker = NULL); diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp index da4d2091b9d..c9d4ebdea3e 100644 --- a/Src/FolderCmp.cpp +++ b/Src/FolderCmp.cpp @@ -83,8 +83,6 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr // Unpacked files will be deleted at end of this function. plugCtxt->filepathTransformed1 = plugCtxt->filepathUnpacked1; plugCtxt->filepathTransformed2 = plugCtxt->filepathUnpacked2; - m_diffFileData.SetDisplayFilepaths(plugCtxt->origFileName1.c_str(), - plugCtxt->origFileName2.c_str()); // store true names for diff utils patch file if (!m_diffFileData.OpenFiles(plugCtxt->filepathTransformed1.c_str(), plugCtxt->filepathTransformed2.c_str())) { @@ -92,9 +90,6 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr return false; } - GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath.c_str(), - &m_diffFileData.m_FileLocation[0].encoding, pCtxt->m_bGuessEncoding); - // Invoke prediff'ing plugins if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[0], plugCtxt->filepathUnpacked1, plugCtxt->filepathTransformed1, @@ -107,9 +102,6 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr // we use the same plugins for both files, so they must be defined before second file ASSERT(plugCtxt->infoPrediffer->bToBeScanned == FALSE); - GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath.c_str(), - &m_diffFileData.m_FileLocation[1].encoding, pCtxt->m_bGuessEncoding); - if (!m_diffFileData.Filepath_Transform(m_diffFileData.m_FileLocation[1], plugCtxt->filepathUnpacked2, plugCtxt->filepathTransformed2, filteredFilenames.c_str(), plugCtxt->infoPrediffer)) @@ -140,7 +132,6 @@ bool FolderCmp::RunPlugins(CDiffContext * pCtxt, PluginsContext * plugCtxt, CStr void FolderCmp::CleanupAfterPlugins(PluginsContext *plugCtxt) { - m_diffFileData.Reset(); // delete the temp files after comparison if (plugCtxt->filepathTransformed1 != plugCtxt->filepathUnpacked1) VERIFY(::DeleteFile(plugCtxt->filepathTransformed1.c_str()) || @@ -176,21 +167,42 @@ UINT FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di) UINT code = DIFFCODE::FILE | DIFFCODE::CMPERR; - // Run plugins if (pCtxt->m_nCompMethod == CMP_CONTENT || pCtxt->m_nCompMethod == CMP_QUICK_CONTENT) { GetComparePaths(pCtxt, di, plugCtxt.origFileName1, plugCtxt.origFileName2); - CString errStr; - bool pluginsOk = RunPlugins(pCtxt, &plugCtxt, errStr); - if (!pluginsOk) + m_diffFileData.SetDisplayFilepaths(plugCtxt.origFileName1.c_str(), + plugCtxt.origFileName2.c_str()); // store true names for diff utils patch file + + // Run plugins + if (pCtxt->m_bPluginsEnabled) { - di.errorDesc = errStr; - CleanupAfterPlugins(&plugCtxt); - return code; + CString errStr; + bool pluginsOk = RunPlugins(pCtxt, &plugCtxt, errStr); + if (!pluginsOk) + { + di.errorDesc = errStr; + CleanupAfterPlugins(&plugCtxt); + return code; + } } + else + { + if (!m_diffFileData.OpenFiles(plugCtxt.origFileName1.c_str(), + plugCtxt.origFileName2.c_str())) + { + di.errorDesc = _T("Error opening compared files"); + return false; + } + } + + GuessCodepageEncoding(m_diffFileData.m_FileLocation[0].filepath.c_str(), + &m_diffFileData.m_FileLocation[0].encoding, pCtxt->m_bGuessEncoding); + GuessCodepageEncoding(m_diffFileData.m_FileLocation[1].filepath.c_str(), + &m_diffFileData.m_FileLocation[1].encoding, pCtxt->m_bGuessEncoding); } + // If either file is larger than limit compare files by quick contents // This allows us to (faster) compare big binary files if (pCtxt->m_nCompMethod == CMP_CONTENT && @@ -321,8 +333,9 @@ UINT FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di) di.errorDesc = _T("Bad compare type"); } - if (pCtxt->m_nCompMethod == CMP_CONTENT || - pCtxt->m_nCompMethod == CMP_QUICK_CONTENT) + m_diffFileData.Reset(); + if (pCtxt->m_bPluginsEnabled && (pCtxt->m_nCompMethod == CMP_CONTENT || + pCtxt->m_nCompMethod == CMP_QUICK_CONTENT)) { CleanupAfterPlugins(&plugCtxt); } diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index eb6ffb64ab0..af72c63e47f 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-06-29 21:16+0000\n" +"POT-Creation-Date: 2008-07-21 12:26+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -68,7 +68,7 @@ msgstr "" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:502 #, c-format msgid "&Copy" msgstr "" @@ -80,7 +80,7 @@ msgid "&Paste" msgstr "" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:583 #, c-format msgid "&Goto..." msgstr "" @@ -91,43 +91,43 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:519 #: Merge.rc:525 +#: Merge.rc:531 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:520 #: Merge.rc:526 +#: Merge.rc:532 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:521 #: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:307 #, c-format msgid "&File" msgstr "" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:309 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:310 #, c-format msgid "&Open...\tCtrl+O" msgstr "" @@ -138,15 +138,15 @@ msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:196 +#: Merge.rc:312 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:197 +#: Merge.rc:313 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -157,5310 +157,5356 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:204 +#: Merge.rc:345 #, c-format msgid "E&xit" msgstr "" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:206 +#: Merge.rc:347 #, c-format msgid "&Edit" msgstr "" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:210 +#: Merge.rc:381 #, c-format msgid "&Options..." msgstr "" #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:212 +#: Merge.rc:383 #, c-format msgid "&View" msgstr "" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:223 +#: Merge.rc:385 #, c-format msgid "Select &Font..." msgstr "" #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:224 +#: Merge.rc:386 #, c-format msgid "Use Default F&ont" msgstr "" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:226 +#: Merge.rc:407 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:228 +#: Merge.rc:409 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:229 +#: Merge.rc:410 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:230 +#: Merge.rc:411 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:232 +#: Merge.rc:413 #, c-format msgid "&Status Bar" msgstr "" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:233 +#: Merge.rc:414 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:236 +#: Merge.rc:418 #, c-format msgid "&Language..." msgstr "" #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:257 +#: Merge.rc:440 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:260 +#: Merge.rc:442 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:261 +#: Merge.rc:443 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:264 +#: Merge.rc:446 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:266 +#: Merge.rc:448 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:268 +#: Merge.rc:450 #, c-format msgid "&Manual Unpacking" msgstr "" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:269 +#: Merge.rc:451 #, c-format msgid "&Automatic Unpacking" msgstr "" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:271 +#: Merge.rc:453 #, c-format msgid "&Edit with Unpacker" msgstr "" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:273 +#: Merge.rc:460 #, c-format msgid "&Reload plugins" msgstr "" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:275 +#: Merge.rc:462 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:277 +#: Merge.rc:464 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:278 +#: Merge.rc:465 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:280 +#: Merge.rc:467 #, c-format msgid "&Window" msgstr "" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:282 +#: Merge.rc:469 #, c-format msgid "Cl&ose" msgstr "" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:283 +#: Merge.rc:470 #, c-format msgid "Clo&se All" msgstr "" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:285 +#: Merge.rc:472 #, c-format msgid "Change &Pane\tF6" msgstr "" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:287 +#: Merge.rc:474 #, c-format msgid "Tile &Horizontally" msgstr "" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:288 +#: Merge.rc:475 #, c-format msgid "Tile &Vertically" msgstr "" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:289 +#: Merge.rc:476 #, c-format msgid "&Cascade" msgstr "" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:291 +#: Merge.rc:478 +#: Merge.rc:1911 #, c-format msgid "&Help" msgstr "" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:293 +#: Merge.rc:480 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:295 +#: Merge.rc:482 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:296 +#: Merge.rc:483 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:297 +#: Merge.rc:484 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:298 +#: Merge.rc:485 #, c-format msgid "A&rchive Support disabled..." msgstr "" -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:300 +#: Merge.rc:487 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:301 +#: Merge.rc:488 #, c-format msgid "&About WinMerge..." msgstr "" -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:199 +#: Merge.rc:331 #, c-format msgid "L&eft Read-only" msgstr "" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:200 +#: Merge.rc:332 #, c-format msgid "Ri&ght Read-only" msgstr "" -#: Merge.rc:200 +#: Merge.rc:202 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:208 +#: Merge.rc:357 #, c-format msgid "Select &All\tCtrl+A" msgstr "" -#: Merge.rc:212 +#: Merge.rc:214 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:215 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:216 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:217 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:218 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:219 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:219 +#: Merge.rc:221 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:234 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:238 +#: Merge.rc:420 #, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:237 +#: Merge.rc:239 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:241 +#: Merge.rc:422 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:241 +#: Merge.rc:243 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:245 +#: Merge.rc:424 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:246 +#: Merge.rc:425 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:248 +#: Merge.rc:427 #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:249 +#: Merge.rc:428 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:250 +#: Merge.rc:429 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:252 +#: Merge.rc:431 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:253 +#: Merge.rc:432 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:253 +#: Merge.rc:255 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:259 +#: Merge.rc:556 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:262 +#: Merge.rc:444 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:311 +#: Merge.rc:315 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:312 +#: Merge.rc:316 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:318 +#: Merge.rc:323 #, c-format msgid "&Save" msgstr "" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:319 +#: Merge.rc:324 #, c-format msgid "Save &As..." msgstr "" -#: Merge.rc:317 +#: Merge.rc:321 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:323 +#: Merge.rc:327 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:328 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:329 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:334 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:332 +#: Merge.rc:336 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:337 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:338 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:341 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:339 +#: Merge.rc:343 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:349 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:346 +#: Merge.rc:350 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:348 +#: Merge.rc:352 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:349 +#: Merge.rc:353 #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:350 +#: Merge.rc:354 #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:352 +#: Merge.rc:356 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:355 +#: Merge.rc:359 #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:356 +#: Merge.rc:360 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:358 +#: Merge.rc:362 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:364 +#: Merge.rc:2738 #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:363 +#: Merge.rc:367 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:365 +#: Merge.rc:369 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:368 +#: Merge.rc:372 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:370 +#: Merge.rc:374 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:371 +#: Merge.rc:375 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:372 +#: Merge.rc:376 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:377 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:375 +#: Merge.rc:379 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:383 +#: Merge.rc:387 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:389 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:390 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:391 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:393 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:398 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:399 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:396 +#: Merge.rc:400 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:397 +#: Merge.rc:401 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:402 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:403 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:405 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:415 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:412 +#: Merge.rc:416 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:430 +#: Merge.rc:434 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:431 +#: Merge.rc:435 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:433 +#: Merge.rc:437 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:434 +#: Merge.rc:438 #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:449 +#: Merge.rc:455 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:490 +#: Merge.rc:496 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:491 +#: Merge.rc:497 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:499 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:504 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:499 +#: Merge.rc:505 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:500 +#: Merge.rc:506 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:501 +#: Merge.rc:507 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:503 +#: Merge.rc:509 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:505 +#: Merge.rc:511 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:506 +#: Merge.rc:512 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:508 +#: Merge.rc:514 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:516 +#: Merge.rc:1134 +#: Merge.rc:1516 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:517 +#: Merge.rc:1136 +#: Merge.rc:1519 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:512 +#: Merge.rc:518 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:514 +#: Merge.rc:520 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:521 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:517 +#: Merge.rc:523 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:523 +#: Merge.rc:529 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:530 +#: Merge.rc:536 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:532 +#: Merge.rc:538 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:533 +#: Merge.rc:539 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:534 +#: Merge.rc:540 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:536 +#: Merge.rc:542 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:538 +#: Merge.rc:544 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:546 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:541 +#: Merge.rc:547 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:548 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:543 +#: Merge.rc:549 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:546 +#: Merge.rc:552 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:558 +#: Merge.rc:564 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:559 +#: Merge.rc:565 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:565 +#: Merge.rc:571 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:567 +#: Merge.rc:573 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:568 +#: Merge.rc:574 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:576 +#: Merge.rc:582 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:579 +#: Merge.rc:585 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:580 +#: Merge.rc:586 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:581 +#: Merge.rc:587 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:650 +#: Merge.rc:656 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:656 +#: Merge.rc:662 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:663 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:658 +#: Merge.rc:664 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:667 +#: Merge.rc:699 +#: Merge.rc:789 +#: Merge.rc:975 +#: Merge.rc:1053 +#: Merge.rc:1082 +#: Merge.rc:1092 +#: Merge.rc:1258 +#: Merge.rc:1322 +#: Merge.rc:1335 +#: Merge.rc:1427 +#: Merge.rc:1442 +#: Merge.rc:1664 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:668 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:675 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:678 +#: Merge.rc:1593 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:682 +#: Merge.rc:743 +#: Merge.rc:996 +#: Merge.rc:1018 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:683 +#: Merge.rc:1597 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:687 +#: Merge.rc:1029 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:688 +#: Merge.rc:1601 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:691 +#: Merge.rc:1603 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:686 +#: Merge.rc:692 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:689 +#: Merge.rc:695 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:696 +#: Merge.rc:1604 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:692 +#: Merge.rc:698 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:700 +#: Merge.rc:730 +#: Merge.rc:790 +#: Merge.rc:820 +#: Merge.rc:852 +#: Merge.rc:862 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1093 +#: Merge.rc:1144 +#: Merge.rc:1259 +#: Merge.rc:1336 +#: Merge.rc:1428 +#: Merge.rc:1443 +#: Merge.rc:1665 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:701 +#: Merge.rc:1337 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:702 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:703 +#: Merge.rc:709 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:714 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:717 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:714 +#: Merge.rc:720 #, c-format msgid "User:" msgstr "" -#: Merge.rc:716 +#: Merge.rc:722 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:718 +#: Merge.rc:724 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:726 +#: Merge.rc:867 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:722 +#: Merge.rc:728 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:729 +#: Merge.rc:863 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:729 +#: Merge.rc:735 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:732 +#: Merge.rc:738 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:735 +#: Merge.rc:741 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:748 +#: Merge.rc:1919 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:751 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:748 +#: Merge.rc:754 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:750 +#: Merge.rc:756 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:752 +#: Merge.rc:758 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:755 +#: Merge.rc:761 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:757 +#: Merge.rc:763 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:765 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:768 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:765 +#: Merge.rc:771 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:773 +#: Merge.rc:1616 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:771 +#: Merge.rc:777 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:773 +#: Merge.rc:779 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:786 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:793 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:793 +#: Merge.rc:799 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:802 +#: Merge.rc:829 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:805 +#: Merge.rc:835 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:805 +#: Merge.rc:811 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:808 +#: Merge.rc:814 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:815 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:811 +#: Merge.rc:817 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:819 +#: Merge.rc:849 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:820 +#: Merge.rc:826 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:826 +#: Merge.rc:832 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:835 +#: Merge.rc:841 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:838 +#: Merge.rc:844 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:839 +#: Merge.rc:845 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:841 +#: Merge.rc:847 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:844 +#: Merge.rc:850 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:845 +#: Merge.rc:851 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:858 +#: Merge.rc:2154 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:861 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:866 +#: Merge.rc:1178 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:863 +#: Merge.rc:869 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:875 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:878 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:875 +#: Merge.rc:881 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:882 +#: Merge.rc:888 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:889 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:890 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:891 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:896 +#: Merge.rc:1922 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:899 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:897 +#: Merge.rc:903 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:907 +#: Merge.rc:1568 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:908 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:921 +#: Merge.rc:1363 +#: Merge.rc:1569 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:925 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:929 +#: Merge.rc:935 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:939 +#: Merge.rc:945 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:946 +#: Merge.rc:952 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:959 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:966 +#: Merge.rc:1052 +#: Merge.rc:1081 +#: Merge.rc:1181 +#: Merge.rc:1409 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:972 +#: Merge.rc:1351 +#: Merge.rc:1557 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:982 +#: Merge.rc:1925 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:985 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:981 +#: Merge.rc:987 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:988 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:984 +#: Merge.rc:990 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:986 +#: Merge.rc:992 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:994 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:991 +#: Merge.rc:997 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:999 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1000 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1001 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1003 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1006 +#: Merge.rc:1022 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1006 +#: Merge.rc:1012 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1009 +#: Merge.rc:1015 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1013 +#: Merge.rc:1019 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1017 +#: Merge.rc:1023 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1024 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1020 +#: Merge.rc:1026 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1030 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1031 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1028 +#: Merge.rc:1034 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1037 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:1038 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1040 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1036 +#: Merge.rc:1042 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1044 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1040 +#: Merge.rc:1046 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1048 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1044 +#: Merge.rc:1050 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1072 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1072 +#: Merge.rc:1078 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1079 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1089 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1088 +#: Merge.rc:1094 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1091 +#: Merge.rc:1097 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1094 +#: Merge.rc:1100 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1095 +#: Merge.rc:1101 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1106 +#: Merge.rc:1112 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1115 +#: Merge.rc:1872 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1120 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1121 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1122 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1128 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1131 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1127 +#: Merge.rc:1133 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1138 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1133 +#: Merge.rc:1139 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1135 +#: Merge.rc:1141 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1137 +#: Merge.rc:1143 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1149 +#: Merge.rc:1920 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1152 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1153 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1149 +#: Merge.rc:1155 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1151 +#: Merge.rc:1157 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1159 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1161 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1163 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1166 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1162 +#: Merge.rc:1168 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1170 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1173 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1170 +#: Merge.rc:1176 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1179 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1186 +#: Merge.rc:1921 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1189 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1185 +#: Merge.rc:1191 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1187 +#: Merge.rc:1193 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1195 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1196 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1199 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1195 +#: Merge.rc:1201 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1197 +#: Merge.rc:1203 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1205 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1207 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1209 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1224 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1230 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1231 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1232 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1233 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1228 +#: Merge.rc:1234 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1240 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1237 +#: Merge.rc:1243 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1240 +#: Merge.rc:1246 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1242 +#: Merge.rc:1248 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1244 +#: Merge.rc:1250 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1247 +#: Merge.rc:1253 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:1255 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1257 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1264 +#: Merge.rc:1512 +#: Merge.rc:1927 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1267 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1262 +#: Merge.rc:1268 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:1270 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1267 +#: Merge.rc:1273 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1275 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1271 +#: Merge.rc:1277 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1285 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1282 +#: Merge.rc:1288 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1291 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1287 +#: Merge.rc:1293 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1295 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1297 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1299 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1301 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1304 +#: Merge.rc:1307 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1305 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1308 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1310 +#: Merge.rc:1315 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1312 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1313 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1311 +#: Merge.rc:1317 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1318 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1319 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1323 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1326 +#: Merge.rc:1332 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1343 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1345 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1346 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1348 +#: Merge.rc:1354 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1349 +#: Merge.rc:1355 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1356 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1351 +#: Merge.rc:1357 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1358 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1359 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1360 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1361 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1362 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1367 +#: Merge.rc:1372 +#: Merge.rc:1377 +#: Merge.rc:1382 +#: Merge.rc:1387 +#: Merge.rc:1392 +#: Merge.rc:1397 +#: Merge.rc:1402 +#: Merge.rc:1407 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1415 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1412 +#: Merge.rc:1418 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1421 +#: Merge.rc:1595 +#: Merge.rc:1599 +#: Merge.rc:1626 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1416 +#: Merge.rc:1422 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1425 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1433 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1430 +#: Merge.rc:1436 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1432 +#: Merge.rc:1438 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1440 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1448 +#: Merge.rc:1928 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1451 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1453 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1448 +#: Merge.rc:1454 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1456 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1459 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1461 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1463 +#: Merge.rc:1469 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1472 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1467 +#: Merge.rc:1473 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1474 +#: Merge.rc:2296 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1475 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1478 +#: Merge.rc:1497 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1481 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1482 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1487 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1492 +#: Merge.rc:2291 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1501 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1506 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1515 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1518 +#: Merge.rc:1521 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1522 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1523 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1525 +#: Merge.rc:1528 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1526 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1529 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1532 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1533 +#: Merge.rc:1894 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1532 +#: Merge.rc:1538 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1541 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1543 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1545 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1547 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1551 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1552 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1554 +#: Merge.rc:1560 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1557 +#: Merge.rc:1563 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1565 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1566 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1567 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1590 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1596 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1600 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1606 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1607 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1612 +#: Merge.rc:1929 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1615 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1620 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1621 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1623 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1627 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1628 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1630 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1637 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1641 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1643 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1646 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1649 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1650 #, c-format msgid "No" msgstr "" +#: Merge.rc:1656 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1659 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1689 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1705 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1720 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1726 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1727 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1728 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1729 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1730 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1731 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1737 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1718 +#: Merge.rc:1738 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1719 +#: Merge.rc:1739 #, c-format msgid "Close the active document\nClose" msgstr "" -#: Merge.rc:1720 +#: Merge.rc:1740 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1721 +#: Merge.rc:1741 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "" -#: Merge.rc:1722 +#: Merge.rc:1742 #, c-format msgid "Change the printing options\nPage Setup" msgstr "" -#: Merge.rc:1723 +#: Merge.rc:1743 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "" -#: Merge.rc:1724 +#: Merge.rc:1744 #, c-format msgid "Print the active document\nPrint" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1745 #, c-format msgid "Display full pages\nPrint Preview" msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1750 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1756 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1757 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1758 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1759 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1760 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1761 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1762 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1767 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "" -#: Merge.rc:1748 +#: Merge.rc:1768 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1774 +#: Merge.rc:1775 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1774 +#: Merge.rc:1794 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "" -#: Merge.rc:1775 +#: Merge.rc:1795 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "" -#: Merge.rc:1781 +#: Merge.rc:1801 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "" -#: Merge.rc:1782 +#: Merge.rc:1802 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1803 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "" -#: Merge.rc:1789 +#: Merge.rc:1809 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "" -#: Merge.rc:1790 +#: Merge.rc:1810 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "" -#: Merge.rc:1791 +#: Merge.rc:1811 #, c-format msgid "Find the specified text\nFind" msgstr "" -#: Merge.rc:1792 +#: Merge.rc:1812 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "" -#: Merge.rc:1793 +#: Merge.rc:1813 #, c-format msgid "Repeat the last action\nRepeat" msgstr "" -#: Merge.rc:1794 +#: Merge.rc:1814 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "" -#: Merge.rc:1795 +#: Merge.rc:1815 #, c-format msgid "Select the entire document\nSelect All" msgstr "" -#: Merge.rc:1796 +#: Merge.rc:1816 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1797 +#: Merge.rc:1817 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:1803 +#: Merge.rc:1823 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "" -#: Merge.rc:1804 +#: Merge.rc:1824 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "" -#: Merge.rc:1805 +#: Merge.rc:1825 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1826 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1832 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1813 +#: Merge.rc:1833 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1814 +#: Merge.rc:1834 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1815 +#: Merge.rc:1835 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1816 +#: Merge.rc:1836 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1837 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1818 +#: Merge.rc:1838 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1823 +#: Merge.rc:1843 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1844 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1845 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1831 +#: Merge.rc:1851 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "" -#: Merge.rc:1838 +#: Merge.rc:1858 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1859 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1866 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1853 +#: Merge.rc:1873 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1879 +#: Merge.rc:1880 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1886 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1887 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1893 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1875 +#: Merge.rc:1895 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1876 +#: Merge.rc:1896 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1897 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1898 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1899 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1885 +#: Merge.rc:1905 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:1906 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1887 +#: Merge.rc:1907 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:1908 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1909 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:1910 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1892 +#: Merge.rc:1912 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1893 +#: Merge.rc:1913 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1923 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1904 +#: Merge.rc:1924 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1926 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1936 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1937 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1938 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1939 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1940 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1946 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:1947 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1953 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1934 +#: Merge.rc:1954 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1935 +#: Merge.rc:1955 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1936 +#: Merge.rc:1956 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1938 +#: Merge.rc:1958 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1960 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1966 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1967 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1948 +#: Merge.rc:1968 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1949 +#: Merge.rc:1969 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1971 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1977 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1978 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1979 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1985 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1986 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1987 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1988 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1994 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1995 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1996 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:1977 +#: Merge.rc:1997 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1998 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2004 +#: Merge.rc:2602 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2005 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2006 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2007 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2008 +#: Merge.rc:2604 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2009 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:2010 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:2012 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2014 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2016 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2018 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2019 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2021 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2023 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2029 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2035 #, c-format msgid "&Path to cleartool.exe :" msgstr "" -#: Merge.rc:2016 +#: Merge.rc:2036 #, c-format msgid "&Path to SS.EXE :" msgstr "" -#: Merge.rc:2022 +#: Merge.rc:2042 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2023 +#: Merge.rc:2043 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2024 +#: Merge.rc:2044 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2045 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2046 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2047 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2053 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2054 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2055 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2056 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2057 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2038 +#: Merge.rc:2058 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2039 +#: Merge.rc:2059 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2040 +#: Merge.rc:2060 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2041 +#: Merge.rc:2061 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2042 +#: Merge.rc:2062 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2068 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2049 +#: Merge.rc:2069 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2050 +#: Merge.rc:2070 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:2071 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2072 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:2073 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2054 +#: Merge.rc:2074 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2075 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2081 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2082 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2088 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2069 +#: Merge.rc:2089 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2070 +#: Merge.rc:2090 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2071 +#: Merge.rc:2091 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2092 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2073 +#: Merge.rc:2093 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2074 +#: Merge.rc:2094 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2095 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2101 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2082 +#: Merge.rc:2102 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2083 +#: Merge.rc:2103 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2104 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2105 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2111 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2092 +#: Merge.rc:2112 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2093 +#: Merge.rc:2113 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2094 +#: Merge.rc:2114 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2095 +#: Merge.rc:2115 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2117 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2118 #, 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:2099 +#: Merge.rc:2119 #, 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:2100 +#: Merge.rc:2120 #, 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:2101 +#: Merge.rc:2121 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2122 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2123 #, 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:2104 +#: Merge.rc:2124 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2125 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2131 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2137 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2138 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2139 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2140 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2141 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2142 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2143 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2124 +#: Merge.rc:2144 #, 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:2125 +#: Merge.rc:2145 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2151 +#: Merge.rc:2586 +#: Merge.rc:2774 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2152 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2153 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2155 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2156 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2162 +#: Merge.rc:2164 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2163 +#: Merge.rc:2165 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2166 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2147 +#: Merge.rc:2167 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2148 +#: Merge.rc:2168 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2149 +#: Merge.rc:2169 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2170 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2171 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2172 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2173 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2174 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2175 +#: Merge.rc:2191 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2176 +#: Merge.rc:2192 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2177 +#: Merge.rc:2193 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2178 +#: Merge.rc:2194 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2184 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2165 +#: Merge.rc:2185 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2166 +#: Merge.rc:2186 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2167 +#: Merge.rc:2187 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2188 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2189 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2190 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2175 +#: Merge.rc:2195 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2196 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2197 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2198 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2204 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2205 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2206 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2207 #, 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:2193 +#: Merge.rc:2213 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2214 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2215 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2216 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2217 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2198 +#: Merge.rc:2218 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2219 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2220 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2221 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2222 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2223 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2224 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2230 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2231 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2232 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2213 +#: Merge.rc:2233 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:2234 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2236 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2238 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2244 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2245 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2246 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2247 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2248 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2249 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2250 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2251 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2252 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2253 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2259 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2260 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2241 +#: Merge.rc:2261 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2262 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2243 +#: Merge.rc:2263 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2264 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2265 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2266 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2247 +#: Merge.rc:2267 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2268 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2274 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2275 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2276 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2277 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2278 +#: Merge.rc:2582 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2284 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2285 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2286 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2287 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2288 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2289 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2290 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2292 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2273 +#: Merge.rc:2293 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2294 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2295 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2297 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2303 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2304 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2305 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2311 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2312 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2313 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2314 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2315 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2316 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2297 +#: Merge.rc:2317 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2318 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2319 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2320 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2326 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2327 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2308 +#: Merge.rc:2328 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2329 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2330 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2331 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2332 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2333 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2334 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2335 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2341 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2342 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2343 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2344 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2345 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2351 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2352 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2353 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2354 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2355 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2357 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2358 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2359 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2365 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2366 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2367 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2368 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2369 #, 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:2350 +#: Merge.rc:2370 #, 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:2351 +#: Merge.rc:2371 #, 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:2352 +#: Merge.rc:2372 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2373 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2374 #, 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:2360 +#: Merge.rc:2380 #, 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:2361 +#: Merge.rc:2381 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2382 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2383 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2384 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2390 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2391 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2397 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2398 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2404 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2405 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2411 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2412 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2418 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2419 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2420 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2401 +#: Merge.rc:2421 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2422 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2423 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2424 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2425 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2426 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2407 +#: Merge.rc:2427 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2428 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2429 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2430 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2431 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2432 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2437 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2438 #, 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:2419 +#: Merge.rc:2439 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2440 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2441 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2442 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2443 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2444 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2445 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2446 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2447 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2453 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2454 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2455 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2456 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2457 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2458 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2459 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2460 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2461 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2462 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2463 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2464 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2465 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2466 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2467 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2468 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2473 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2479 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2480 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2481 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2482 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2483 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2484 +#: Merge.rc:2494 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2490 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2491 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2492 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2493 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2500 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2501 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2507 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2508 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2509 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2510 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2511 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2512 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2513 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2514 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2515 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2516 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2524 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2533 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2534 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2535 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2536 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2537 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2538 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2539 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2540 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2541 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2542 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2543 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2544 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2545 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2546 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2552 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2553 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2554 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2555 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2556 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2557 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2566 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2569 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2570 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2571 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2572 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2578 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2579 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2580 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2581 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2583 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2584 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2585 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2592 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2593 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2594 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2595 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2596 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2597 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2603 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2605 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2606 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2607 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2614 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2615 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2616 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2617 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2618 #, c-format msgid "Change left file/dir read-only status" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2619 #, c-format msgid "Change right file/dir read-only status" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2620 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2621 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2622 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2623 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2624 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2625 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2631 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2632 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2633 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2634 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2635 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2636 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2637 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2638 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2639 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2640 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2646 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2647 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2648 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2649 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2650 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2651 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2657 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2658 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2659 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2660 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2661 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2662 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2663 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2664 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2665 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2666 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2667 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2668 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2669 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2670 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2671 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2677 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2678 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2679 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2680 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2681 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2682 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2683 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2684 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2685 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2686 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2687 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2688 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2689 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2695 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2696 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2697 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2698 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2704 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2705 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2706 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2707 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2708 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2709 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2710 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2711 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2717 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2718 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2724 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2725 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2726 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2727 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2728 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2729 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2735 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2736 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2737 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2739 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2740 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2741 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2747 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2748 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2749 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2755 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2756 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2757 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2758 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2759 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2760 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2766 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2767 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2768 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2775 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2776 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2777 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2778 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2779 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2780 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2781 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2782 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2783 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2784 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2785 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2786 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2787 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2788 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2789 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2790 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2791 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2792 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2793 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2794 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2795 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2796 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2797 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2798 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2799 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2800 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2801 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2802 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2803 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2804 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2805 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2810 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2811 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2812 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index efa2a1df593..cab6dd0c3ad 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -71,6 +71,7 @@ #include "MergeCmdLineInfo.h" #include "FileOrFolderSelect.h" #include "PropBackups.h" +#include "PluginsListDlg.h" /* One source file must compile the stubs for multimonitor @@ -214,8 +215,9 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd) ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText) ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText) ON_COMMAND(ID_HELP_RELEASENOTES, OnHelpReleasenotes) - ON_COMMAND(ID_HELP_TRANSLATIONS, OnHelpTranslations) + ON_COMMAND(ID_HELP_TRANSLATIONS, OnHelpTranslations) ON_COMMAND(ID_FILE_OPENCONFLICT, OnFileOpenConflict) + ON_COMMAND(ID_PLUGINS_LIST, &CMainFrame::OnPluginsList) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -2356,6 +2358,7 @@ static void LoadConfigLog(CConfigLog & configLog, COptionsMgr * options, LoadConfigBoolSetting(&configLog.m_miscSettings.bSyntaxHighlight, options, OPT_SYNTAX_HIGHLIGHT, cfgdir); LoadConfigIntSetting(&configLog.m_miscSettings.bInsertTabs, options, OPT_TAB_TYPE, cfgdir); LoadConfigIntSetting(&configLog.m_miscSettings.nTabSize, options, OPT_TAB_SIZE, cfgdir); + LoadConfigBoolSetting(&configLog.m_miscSettings.bPluginsEnabled, options, OPT_PLUGINS_ENABLED, cfgdir); LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultMode, options, OPT_CP_DEFAULT_MODE, cfgdir); LoadConfigIntSetting(&configLog.m_cpSettings.nDefaultCustomValue, options, OPT_CP_DEFAULT_CUSTOM, cfgdir); @@ -3451,3 +3454,12 @@ BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile, bool checked) } return conflictCompared; } + +/** + * @brief Show the plugins list dialog. + */ +void CMainFrame::OnPluginsList() +{ + PluginsListDlg dlg; + dlg.DoModal(); +} diff --git a/Src/MainFrm.h b/Src/MainFrm.h index 5706dcf0069..f9111bdd241 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -320,6 +320,10 @@ class CMainFrame : public CMDIFrameWnd afx_msg void OnToolbarBig(); afx_msg void OnUpdateToolbarBig(CCmdUI* pCmdUI); afx_msg BOOL OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnHelpReleasenotes(); + afx_msg void OnHelpTranslations(); + afx_msg void OnFileOpenConflict(); + afx_msg void OnPluginsList(); //}}AFX_MSG DECLARE_MESSAGE_MAP() @@ -337,10 +341,6 @@ class CMainFrame : public CMDIFrameWnd CMergeEditView * GetActiveMergeEditView(); void LoadToolbarImages(); HMENU NewMenu( int view, int ID ); -public: - afx_msg void OnHelpReleasenotes(); - afx_msg void OnHelpTranslations(); - afx_msg void OnFileOpenConflict(); }; CMainFrame * GetMainFrame(); // access to the singleton main frame object diff --git a/Src/Merge.rc b/Src/Merge.rc index cfccc08036f..d53672deef1 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -147,6 +147,8 @@ BEGIN END POPUP "&Plugins" BEGIN + MENUITEM "&List...", ID_PLUGINS_LIST + MENUITEM SEPARATOR MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO MENUITEM SEPARATOR @@ -261,6 +263,8 @@ BEGIN END POPUP "&Plugins" BEGIN + MENUITEM "&List...", ID_PLUGINS_LIST + MENUITEM SEPARATOR MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO MENUITEM SEPARATOR @@ -441,6 +445,8 @@ BEGIN END POPUP "&Plugins" BEGIN + MENUITEM "&List...", ID_PLUGINS_LIST + MENUITEM SEPARATOR MENUITEM "&Manual Unpacking", ID_UNPACK_MANUAL MENUITEM "&Automatic Unpacking", ID_UNPACK_AUTO MENUITEM SEPARATOR @@ -1644,6 +1650,20 @@ BEGIN PUSHBUTTON "No",IDNO,228,79,50,14 END +IDD_PLUGINS_LIST DIALOGEX 0, 0, 370, 211 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU +CAPTION "Plugins" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "&Enable plugins",IDC_PLUGINS_ENABLE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,7,266,10 + CONTROL "",IDC_PLUGINSLIST_LIST,"SysListView32",LVS_REPORT | + LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, + 7,22,356,155 + DEFPUSHBUTTON "OK",IDOK,254,190,50,14 + PUSHBUTTON "Cancel",IDCANCEL,313,190,50,14 +END #ifndef _MAC ///////////////////////////////////////////////////////////////////////////// @@ -2577,6 +2597,16 @@ BEGIN IDS_SUFFIX_PETA " PB" END +STRINGTABLE +BEGIN + IDS_PLUGINSLIST_NAME "Name" + IDS_PLUGINSLIST_TYPE "Type" + IDS_PLUGINSLIST_DESC "Description" + IDS_PLUGINS_TYPE_UNPACKER "Unpacker" + IDS_PLUGINS_TYPE_PREDIFFER "Prediffer" + IDS_PLUGINS_TYPE_EDITSCRIPT "Editor script" +END + // MENU STRINGS // FILE MENU STRINGTABLE @@ -2671,6 +2701,7 @@ END // PLUGINS MENU STRINGTABLE BEGIN + ID_PLUGINS_LIST "Shows a list of available plugins" ID_UNPACK_MANUAL "The user selects the unpacker (no unpacking when comparing dir)" ID_UNPACK_AUTO "The adapted unpacker is applied to both files (one file only needs the extension)" ID_POPUP_OPEN_WITH_UNPACKER "Select an unpacker to edit this file" diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj index f2475dd173f..48c3e1b8054 100644 --- a/Src/Merge.vcproj +++ b/Src/Merge.vcproj @@ -4053,6 +4053,43 @@ PreprocessorDefinitions=""/> + + + + + + + + + + + + + + + + diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index d2e8e769592..4bef3991fc1 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -442,6 +442,7 @@ int CMergeDoc::Rescan(BOOL &bBinary, BOOL &bIdentical, m_diffWrapper.GetMovedLines()->Clear(); // Set paths for diffing and run diff + m_diffWrapper.EnablePlugins(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED)); m_diffWrapper.SetPaths(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath(), TRUE); m_diffWrapper.SetCompareFiles(m_filePaths.GetLeft(), m_filePaths.GetRight()); m_diffWrapper.SetCodepage(m_ptBuf[0]->m_encoding.m_unicoding ? diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index bca6e14361b..cd7bf7bd915 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -45,6 +45,7 @@ #include "OptionsDef.h" #include "SyntaxColors.h" #include "MergeLineFlags.h" +#include "PluginsListDlg.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -203,6 +204,7 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx) ON_COMMAND(ID_VIEW_ZOOMNORMAL, OnViewZoomNormal) ON_UPDATE_COMMAND_UI(ID_STATUS_LEFTFILE_ENCODING, OnUpdateStatusLeftEncoding) ON_UPDATE_COMMAND_UI(ID_STATUS_RIGHTFILE_ENCODING, OnUpdateStatusRightEncoding) + ON_COMMAND(ID_PLUGINS_LIST, &CMergeEditView::OnPluginsList) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -3364,3 +3366,12 @@ void CMergeEditView::OnUpdateStatusRightEncoding(CCmdUI* pCmdUI) const FileTextEncoding & encoding = GetDocument()->GetEncoding(1); pCmdUI->SetText(encoding.GetName().c_str()); } + +/** + * @brief Show the plugins list dialog. + */ +void CMergeEditView::OnPluginsList() +{ + PluginsListDlg dlg; + dlg.DoModal(); +} diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h index 76be2194596..c5602ac9612 100644 --- a/Src/MergeEditView.h +++ b/Src/MergeEditView.h @@ -307,9 +307,9 @@ class CMergeEditView : public CGhostTextView afx_msg void OnViewZoomNormal(); afx_msg void OnUpdateStatusLeftEncoding(CCmdUI* pCmdUI); afx_msg void OnUpdateStatusRightEncoding(CCmdUI* pCmdUI); + afx_msg void OnPluginsList(); //}}AFX_MSG DECLARE_MESSAGE_MAP() -public: }; #ifndef _DEBUG // debug version in DiffView.cpp diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h index 9f9c5396eb9..f41bd9f147f 100644 --- a/Src/OptionsDef.h +++ b/Src/OptionsDef.h @@ -151,6 +151,9 @@ const TCHAR OPT_VSS_PATH[] = _T("Settings/VssPath"); const TCHAR OPT_ARCHIVE_ENABLE[] = _T("Merge7z/Enable"); const TCHAR OPT_ARCHIVE_PROBETYPE[] = _T("Merge7z/ProbeSignature"); +// Plugins +const TCHAR OPT_PLUGINS_ENABLED[] = _T("Settings/PluginsEnabled"); + // Font options const TCHAR OPT_FONT_FILECMP_USECUSTOM[] = _T("Font/Specified"); const TCHAR OPT_FONT_DIRCMP_USECUSTOM[] = _T("FontDirCompare/Specified"); diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp index 543e7ef8211..fedc11f65b2 100644 --- a/Src/OptionsInit.cpp +++ b/Src/OptionsInit.cpp @@ -155,6 +155,8 @@ void CMergeApp::OptionsInit() m_pOptions->InitOption(OPT_ARCHIVE_ENABLE, 1); // Enable by default m_pOptions->InitOption(OPT_ARCHIVE_PROBETYPE, false); + m_pOptions->InitOption(OPT_PLUGINS_ENABLED, false); + m_pOptions->InitOption(OPT_FONT_FILECMP_USECUSTOM, false); m_pOptions->InitOption(OPT_FONT_DIRCMP_USECUSTOM, false); diff --git a/Src/PluginsListDlg.cpp b/Src/PluginsListDlg.cpp new file mode 100644 index 00000000000..2e236080d70 --- /dev/null +++ b/Src/PluginsListDlg.cpp @@ -0,0 +1,138 @@ +/** + * @file PluginsListDlg.cpp + * + * @brief Implementation file for PluginsList dialog + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#include "stdafx.h" +#include "UnicodeString.h" +#include "Merge.h" +#include "Plugins.h" +#include "dllver.h" +#include "PluginsListDlg.h" +#include "OptionsDef.h" + +IMPLEMENT_DYNAMIC(PluginsListDlg, CDialog) + +BEGIN_MESSAGE_MAP(PluginsListDlg, CDialog) + ON_BN_CLICKED(IDOK, &PluginsListDlg::OnBnClickedOk) +END_MESSAGE_MAP() + +/** + * @brief Constructor. + */ +PluginsListDlg::PluginsListDlg(CWnd* pParent /*=NULL*/) + : CDialog(PluginsListDlg::IDD, pParent) +{ +} + +/** + * @brief Destructor. + */ +PluginsListDlg::~PluginsListDlg() +{ +} + +void PluginsListDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); + DDX_Control(pDX, IDC_PLUGINSLIST_LIST, m_list); +} + +/** + * @brief Initialize the dialog. + */ +BOOL PluginsListDlg::OnInitDialog() +{ + theApp.TranslateDialog(m_hWnd); + CDialog::OnInitDialog(); + + InitList(); + AddPlugins(); + + BOOL pluginsEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED); + if (pluginsEnabled) + { + CButton *btn = (CButton *)GetDlgItem(IDC_PLUGINS_ENABLE); + btn->SetCheck(BST_CHECKED); + } + + return FALSE; // return TRUE unless you set the focus to a control + // EXCEPTION: OCX Property Pages should return FALSE +} + +/** + * @brief Set-up the list control. + */ +void PluginsListDlg::InitList() +{ + // Show selection across entire row. + DWORD newstyle = LVS_EX_FULLROWSELECT; + // Also enable infotips if they have new enough version for our + // custom draw code + // LPNMLVCUSTOMDRAW->iSubItem not supported before comctl32 4.71 + if (GetDllVersion(_T("comctl32.dll")) >= PACKVERSION(4,71)) + newstyle |= LVS_EX_INFOTIP; + m_list.SetExtendedStyle(m_list.GetExtendedStyle() | newstyle); + + String title = LoadResString(IDS_PLUGINSLIST_NAME); + m_list.InsertColumn(0, title.c_str(), LVCFMT_LEFT, 150); + title = LoadResString(IDS_PLUGINSLIST_TYPE); + m_list.InsertColumn(1, title.c_str(), LVCFMT_LEFT, 100); + title = LoadResString(IDS_PLUGINSLIST_DESC); + m_list.InsertColumn(2, title.c_str(), LVCFMT_LEFT, 300); +} + +/** + * @brief Add found plugins to the list. + */ +void PluginsListDlg::AddPlugins() +{ + String type = LoadResString(IDS_PLUGINS_TYPE_UNPACKER); + AddPluginsToList(L"FILE_PACK_UNPACK", type.c_str()); + AddPluginsToList(L"BUFFER_PACK_UNPACK", type.c_str()); + type = LoadResString(IDS_PLUGINS_TYPE_PREDIFFER); + AddPluginsToList(L"FILE_PREDIFF", type.c_str()); + AddPluginsToList(L"BUFFER_PREDIFF", type.c_str()); + type = LoadResString(IDS_PLUGINS_TYPE_EDITSCRIPT); + AddPluginsToList(L"EDITOR_SCRIPT", type.c_str()); +} + +/** + * @brief Add plugins of given event type to the list. + * @param [in] pluginEvent Event type for plugins to add. + * @param [in] pluginType String to use as type in the list. + */ +void PluginsListDlg::AddPluginsToList(LPCWSTR pluginEvent, LPCTSTR pluginType) +{ + PluginArray * piPluginArray = + CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(pluginEvent); + + for (int iPlugin = 0 ; iPlugin < piPluginArray->GetSize() ; iPlugin++) + { + PluginInfo & plugin = piPluginArray->ElementAt(iPlugin); + int ind = m_list.InsertItem(m_list.GetItemCount(), plugin.m_name.c_str()); + m_list.SetItemText(ind, 1, pluginType); + m_list.SetItemText(ind, 2, plugin.m_description); + } +} + +/** + * @brief Save plugins enabled setting when closing the dialog. + */ +void PluginsListDlg::OnBnClickedOk() +{ + CButton *btn = (CButton *)GetDlgItem(IDC_PLUGINS_ENABLE); + int check = btn->GetCheck(); + if (check == BST_CHECKED) + { + GetOptionsMgr()->SaveOption(OPT_PLUGINS_ENABLED, true); + } + else + { + GetOptionsMgr()->SaveOption(OPT_PLUGINS_ENABLED, false); + } + OnOK(); +} diff --git a/Src/PluginsListDlg.h b/Src/PluginsListDlg.h new file mode 100644 index 00000000000..7ba17fcbf24 --- /dev/null +++ b/Src/PluginsListDlg.h @@ -0,0 +1,45 @@ +/** + * @file PluginsListDlg.h + * + * @brief Declaration file for PluginsList dialog + */ +// ID line follows -- this is updated by SVN +// $Id$ + +#ifndef _PLUGINS_LIST_DIALOG_H_ +#define _PLUGINS_LIST_DIALOG_H_ + + +/** + * @brief A dialog listing plugins. + * This dialog shows a list of currently available plugins. In addition + * to the plugin (file)name it shows plugin type and description. The + * dialog also has a control to enable/disable plugins. + */ +class PluginsListDlg : public CDialog +{ + DECLARE_DYNAMIC(PluginsListDlg) + +public: + PluginsListDlg(CWnd* pParent = NULL); // standard constructor + virtual ~PluginsListDlg(); + +// Dialog Data + enum { IDD = IDD_PLUGINS_LIST }; + +protected: + void InitList(); + void AddPlugins(); + void AddPluginsToList(LPCWSTR pluginEvent, LPCTSTR pluginType); + + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + + afx_msg BOOL OnInitDialog(); + afx_msg void OnBnClickedOk(); + DECLARE_MESSAGE_MAP() + +public: + CListCtrl m_list; /**< A list control for plugins. */ +}; + +#endif // _PLUGINS_LIST_DIALOG_H_ diff --git a/Src/resource.h b/Src/resource.h index 5c29cb1a56d..11d629eecda 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -53,6 +53,7 @@ #define IDD_PROJFILES_PATHS 233 #define IDD_PROPPAGE_BACKUPS 234 #define IDD_CONFIRM_COPY 235 +#define IDD_PLUGINS_LIST 236 #define IDR_SPLASH 308 #define IDB_WINMERGE 309 #define IDB_OLDSPLASH 310 @@ -431,6 +432,8 @@ #define IDC_TMPFOLDER_SYSTEM 1338 #define IDC_TMPFOLDER_BROWSE 1339 #define IDC_TMPFOLDER_NAME 1340 +#define IDC_PLUGINS_ENABLE 1341 +#define IDC_PLUGINSLIST_LIST 1342 #define IDC_EDIT_WHOLE_WORD 8603 #define IDC_EDIT_MATCH_CASE 8604 #define IDC_EDIT_FINDTEXT 8605 @@ -862,6 +865,12 @@ #define IDS_SUFFIX_GIGA 30419 #define IDS_SUFFIX_TERA 30420 #define IDS_SUFFIX_PETA 30421 +#define IDS_PLUGINSLIST_NAME 30432 +#define IDS_PLUGINSLIST_TYPE 30433 +#define IDS_PLUGINSLIST_DESC 30434 +#define IDS_PLUGINS_TYPE_UNPACKER 30435 +#define IDS_PLUGINS_TYPE_PREDIFFER 30436 +#define IDS_PLUGINS_TYPE_EDITSCRIPT 30437 #define ID_FILE_SAVE_LEFT 32768 #define ID_FILE_SAVE_RIGHT 32769 #define ID_FILE_SAVEAS_LEFT 32770 @@ -1031,6 +1040,7 @@ #define ID_VIEW_ZOOMOUT 33170 #define ID_HELP_TRANSLATIONS 33171 #define ID_VIEW_ZOOMNORMAL 33172 +#define ID_PLUGINS_LIST 33173 // Next default values for new objects // @@ -1038,8 +1048,8 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 237 -#define _APS_NEXT_COMMAND_VALUE 33172 -#define _APS_NEXT_CONTROL_VALUE 1341 +#define _APS_NEXT_COMMAND_VALUE 33174 +#define _APS_NEXT_CONTROL_VALUE 1344 #define _APS_NEXT_SYMED_VALUE 113 #endif #endif From c2927c10ad73022916395daa23bf4f074dbbf544 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 21 Jul 2008 14:25:05 +0000 Subject: [PATCH 029/168] Fix broken "Prediffer" menu item --HG-- branch : R2_10 --- Src/MainFrm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index cab6dd0c3ad..6ee4c363698 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -460,7 +460,7 @@ HMENU CMainFrame::GetPrediffersSubmenu(HMENU mainMenu) // look for "Plugins" menu int i; for (i = 0 ; i < ::GetMenuItemCount(mainMenu) ; i++) - if (::GetMenuItemID(::GetSubMenu(mainMenu, i), 0) == ID_UNPACK_MANUAL) + if (::GetMenuItemID(::GetSubMenu(mainMenu, i), 0) == ID_PLUGINS_LIST) break; HMENU editMenu = ::GetSubMenu(mainMenu, i); From 1509ca5e7dd58d6a5c546c81406e6b74e524cd4e Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 21 Jul 2008 19:28:48 +0000 Subject: [PATCH 030/168] PATCH: [ 2017426 ] Rescan after filter change Also included trunk r5613 - Add method for getting frame type (folder/file compare). --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/English.pot | 949 +++++++++++++++++++------------------- Src/LineFiltersList.cpp | 28 +- Src/LineFiltersList.h | 5 +- Src/MainFrm.cpp | 101 +++- Src/MainFrm.h | 11 + Src/Merge.rc | 6 + Src/resource.h | 1 + 8 files changed, 608 insertions(+), 494 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 07ea399aa1b..0d9f9a85591 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -10,6 +10,7 @@ WinMerge 2.9.1.6 Remove buildall.bat (#2013576) New option to enable plugins (disabled by default) (#2013845) Add dialog listing available plugins (#2021722) + Refresh compare after changing filter (#2017426) 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) diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index af72c63e47f..15b7e5357f0 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" 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-21 12:26+0000\n" +"POT-Creation-Date: 2008-07-21 22:22+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -699,7 +699,7 @@ msgid "&Scripts" msgstr "" #: Merge.rc:364 -#: Merge.rc:2738 +#: Merge.rc:2744 #, c-format msgid "< Empty >" msgstr "" @@ -1411,7 +1411,7 @@ msgid "Replace &All" msgstr "" #: Merge.rc:858 -#: Merge.rc:2154 +#: Merge.rc:2160 #, c-format msgid "Rational ClearCase" msgstr "" @@ -2304,7 +2304,7 @@ msgid "Files:" msgstr "" #: Merge.rc:1474 -#: Merge.rc:2296 +#: Merge.rc:2302 #, c-format msgid "Different" msgstr "" @@ -2336,7 +2336,7 @@ msgid "Right:" msgstr "" #: Merge.rc:1492 -#: Merge.rc:2291 +#: Merge.rc:2297 #, c-format msgid "Identical" msgstr "" @@ -3144,7 +3144,7 @@ msgid "Size" msgstr "" #: Merge.rc:2004 -#: Merge.rc:2602 +#: Merge.rc:2608 #, c-format msgid "Name" msgstr "" @@ -3165,7 +3165,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2008 -#: Merge.rc:2604 +#: Merge.rc:2610 #, c-format msgid "Description" msgstr "" @@ -3222,2291 +3222,2296 @@ msgstr "" #: Merge.rc:2035 #, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2041 +#, c-format msgid "&Path to cleartool.exe :" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2042 #, c-format msgid "&Path to SS.EXE :" msgstr "" -#: Merge.rc:2042 +#: Merge.rc:2048 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2043 +#: Merge.rc:2049 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2044 +#: Merge.rc:2050 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2045 +#: Merge.rc:2051 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2046 +#: Merge.rc:2052 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2047 +#: Merge.rc:2053 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:2059 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2054 +#: Merge.rc:2060 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2055 +#: Merge.rc:2061 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2056 +#: Merge.rc:2062 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2057 +#: Merge.rc:2063 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2058 +#: Merge.rc:2064 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2065 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2066 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2067 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2068 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2074 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2069 +#: Merge.rc:2075 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2070 +#: Merge.rc:2076 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2071 +#: Merge.rc:2077 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2078 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2073 +#: Merge.rc:2079 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2074 +#: Merge.rc:2080 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2075 +#: Merge.rc:2081 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2087 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2082 +#: Merge.rc:2088 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2094 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2095 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2096 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2097 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2092 +#: Merge.rc:2098 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2093 +#: Merge.rc:2099 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2094 +#: Merge.rc:2100 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2095 +#: Merge.rc:2101 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2107 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2108 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2109 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2110 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2111 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2117 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2112 +#: Merge.rc:2118 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2113 +#: Merge.rc:2119 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2114 +#: Merge.rc:2120 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2115 +#: Merge.rc:2121 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2123 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2124 #, 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:2119 +#: Merge.rc:2125 #, 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:2120 +#: Merge.rc:2126 #, 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:2121 +#: Merge.rc:2127 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2128 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2129 #, 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:2124 +#: Merge.rc:2130 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2131 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2131 +#: Merge.rc:2137 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2143 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2138 +#: Merge.rc:2144 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2145 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2140 +#: Merge.rc:2146 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2141 +#: Merge.rc:2147 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2142 +#: Merge.rc:2148 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2143 +#: Merge.rc:2149 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2144 +#: Merge.rc:2150 #, 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:2145 +#: Merge.rc:2151 #, 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:2151 -#: Merge.rc:2586 -#: Merge.rc:2774 +#: Merge.rc:2157 +#: Merge.rc:2592 +#: Merge.rc:2780 #, c-format msgid "None" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2158 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2159 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2155 +#: Merge.rc:2161 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2156 +#: Merge.rc:2162 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2162 -#: Merge.rc:2164 +#: Merge.rc:2168 +#: Merge.rc:2170 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2163 -#: Merge.rc:2165 +#: Merge.rc:2169 +#: Merge.rc:2171 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2166 +#: Merge.rc:2172 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2167 +#: Merge.rc:2173 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2174 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2175 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2176 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2171 +#: Merge.rc:2177 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2172 +#: Merge.rc:2178 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2173 +#: Merge.rc:2179 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2174 +#: Merge.rc:2180 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2175 -#: Merge.rc:2191 +#: Merge.rc:2181 +#: Merge.rc:2197 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2176 -#: Merge.rc:2192 +#: Merge.rc:2182 +#: Merge.rc:2198 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2177 -#: Merge.rc:2193 +#: Merge.rc:2183 +#: Merge.rc:2199 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2178 -#: Merge.rc:2194 +#: Merge.rc:2184 +#: Merge.rc:2200 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2190 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2191 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2192 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2193 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2188 +#: Merge.rc:2194 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2189 +#: Merge.rc:2195 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2190 +#: Merge.rc:2196 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2201 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2202 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2203 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2198 +#: Merge.rc:2204 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2210 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2211 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2212 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2207 +#: Merge.rc:2213 #, 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:2213 +#: Merge.rc:2219 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:2220 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2215 +#: Merge.rc:2221 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2222 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2223 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2224 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2225 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2226 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2227 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2228 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2229 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2230 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2236 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2237 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2238 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2239 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2240 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2242 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2244 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2250 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2251 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2252 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2247 +#: Merge.rc:2253 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2254 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2249 +#: Merge.rc:2255 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:2256 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2257 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2258 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2259 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2265 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2266 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2267 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2268 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2269 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2270 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2271 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2272 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2273 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2274 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2280 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2281 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2282 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2283 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2278 -#: Merge.rc:2582 +#: Merge.rc:2284 +#: Merge.rc:2588 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2290 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2291 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2286 +#: Merge.rc:2292 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2287 +#: Merge.rc:2293 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2288 +#: Merge.rc:2294 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2295 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2296 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2298 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2299 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2300 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2301 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2297 +#: Merge.rc:2303 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:2309 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:2310 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2311 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2317 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2318 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2319 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2320 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2321 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2322 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2323 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2318 +#: Merge.rc:2324 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2319 +#: Merge.rc:2325 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2320 +#: Merge.rc:2326 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2332 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2333 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2328 +#: Merge.rc:2334 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2335 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2336 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2337 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2338 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2339 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2340 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2341 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2341 +#: Merge.rc:2347 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2342 +#: Merge.rc:2348 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2343 +#: Merge.rc:2349 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2350 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2351 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2351 +#: Merge.rc:2357 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2352 +#: Merge.rc:2358 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2359 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2360 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2361 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2363 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2364 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2365 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2371 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2372 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2367 +#: Merge.rc:2373 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2368 +#: Merge.rc:2374 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2375 #, 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:2370 +#: Merge.rc:2376 #, 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:2371 +#: Merge.rc:2377 #, 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:2372 +#: Merge.rc:2378 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2379 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2380 #, 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:2380 +#: Merge.rc:2386 #, 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:2381 +#: Merge.rc:2387 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2382 +#: Merge.rc:2388 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2383 +#: Merge.rc:2389 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2390 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2396 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2397 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2397 +#: Merge.rc:2403 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2404 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2410 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2411 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2417 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2418 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2424 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2425 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2426 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2427 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2428 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2429 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2430 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2431 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2432 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2433 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2434 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2435 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2436 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2437 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2438 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2443 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2444 #, 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:2439 +#: Merge.rc:2445 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2446 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2447 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2448 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2449 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2450 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2451 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2452 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2453 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2459 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2460 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2461 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2462 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2463 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2464 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2465 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2466 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2467 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2468 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2469 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2470 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2471 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2472 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2473 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2474 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2479 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2485 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2486 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2487 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2482 +#: Merge.rc:2488 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2483 +#: Merge.rc:2489 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2484 -#: Merge.rc:2494 +#: Merge.rc:2490 +#: Merge.rc:2500 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2496 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2497 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2498 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2499 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2500 +#: Merge.rc:2506 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2501 +#: Merge.rc:2507 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2513 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2508 +#: Merge.rc:2514 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2509 +#: Merge.rc:2515 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2510 +#: Merge.rc:2516 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2511 +#: Merge.rc:2517 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2518 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2519 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2520 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2530 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2531 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2532 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2533 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2539 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2540 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2541 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2542 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2543 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2544 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2545 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2546 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2547 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2548 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2549 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2550 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2551 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2552 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2558 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2559 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2560 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2561 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2562 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2563 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2572 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2575 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2570 +#: Merge.rc:2576 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2571 +#: Merge.rc:2577 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2578 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2584 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2579 +#: Merge.rc:2585 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2580 +#: Merge.rc:2586 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2587 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2589 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2590 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2591 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2598 #, c-format msgid " B" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2599 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2600 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2601 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2602 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2603 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2609 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2611 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2612 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2613 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2614 +#: Merge.rc:2620 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2621 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2622 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2623 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2624 #, c-format msgid "Change left file/dir read-only status" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2625 #, c-format msgid "Change right file/dir read-only status" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2626 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2627 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2628 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2629 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2630 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2631 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2637 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2638 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2639 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2640 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2641 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2642 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2643 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2644 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2645 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2646 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2652 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2653 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2654 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2655 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2656 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2657 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2663 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2664 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2665 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2666 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2667 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2668 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2669 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:2670 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2671 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2672 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2673 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2674 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2675 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2676 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2677 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2683 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2684 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2685 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2686 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2687 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2688 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2689 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2690 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2691 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2692 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2693 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2694 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2695 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2701 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2702 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2703 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2704 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2710 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2711 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2712 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2707 +#: Merge.rc:2713 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2714 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2715 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2716 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2717 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2723 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2724 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2730 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2731 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2732 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2733 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2734 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2735 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2741 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2742 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2743 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2745 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2746 #, c-format msgid "" msgstr "" -#: Merge.rc:2741 +#: Merge.rc:2747 #, c-format msgid "" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2753 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2754 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2755 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2761 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2762 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2763 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2764 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2765 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2766 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2772 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2773 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2774 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2775 +#: Merge.rc:2781 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2776 +#: Merge.rc:2782 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2777 +#: Merge.rc:2783 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2778 +#: Merge.rc:2784 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2785 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2786 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2787 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2788 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2789 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2790 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2791 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2792 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2793 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2788 +#: Merge.rc:2794 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2789 +#: Merge.rc:2795 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2796 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2797 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2798 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2799 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2800 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2801 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2802 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2803 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2804 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2805 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2806 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2807 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2808 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2809 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2810 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2811 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2816 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2817 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2818 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/LineFiltersList.cpp b/Src/LineFiltersList.cpp index d44921587cf..4f1fd487122 100644 --- a/Src/LineFiltersList.cpp +++ b/Src/LineFiltersList.cpp @@ -101,7 +101,7 @@ String LineFiltersList::GetAsString() const * @return Filter item from the index. If the index is beyond table limit, * return the last item in the list. */ -const LineFilterItem & LineFiltersList::GetAt(int ind) +const LineFilterItem & LineFiltersList::GetAt(int ind) const { if (ind < m_items.size()) return *m_items[ind]; @@ -115,7 +115,7 @@ const LineFilterItem & LineFiltersList::GetAt(int ind) * list are removed and new items added from the given list. * @param [in] list List to clone. */ -void LineFiltersList::CloneFrom(LineFiltersList *list) +void LineFiltersList::CloneFrom(const LineFiltersList *list) { Empty(); int count = list->GetCount(); @@ -127,6 +127,30 @@ void LineFiltersList::CloneFrom(LineFiltersList *list) } } +/** + * @brief Compare filter lists. + * @param [in] list List to compare. + * @return true if lists are identical, false otherwise. + */ +bool LineFiltersList::Compare(const LineFiltersList *list) const +{ + if (list->GetCount() != GetCount()) + return false; + + for (int i = 0; i < GetCount(); i++) + { + const LineFilterItem &item1 = list->GetAt(i); + const LineFilterItem &item2 = GetAt(i); + + if (item1.enabled != item2.enabled) + return false; + + if (item1.filterStr != item2.filterStr) + return false; + } + return true; +} + /** * @brief Read filter list from the options system. * @param [in] pOptionsMgr Pointer to options system. diff --git a/Src/LineFiltersList.h b/Src/LineFiltersList.h index 7a50e02c5da..9e2e8ab03df 100644 --- a/Src/LineFiltersList.h +++ b/Src/LineFiltersList.h @@ -36,8 +36,9 @@ class LineFiltersList int GetCount() const; void Empty(); String GetAsString() const; - const LineFilterItem & GetAt(int ind); - void CloneFrom(LineFiltersList *list); + const LineFilterItem & GetAt(int ind) const; + void CloneFrom(const LineFiltersList *list); + bool Compare(const LineFiltersList *list) const; void Initialize(COptionsMgr *pOptionsMgr); void SaveFilters(); diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 6ee4c363698..019b5c7a53d 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1421,20 +1421,18 @@ int CMainFrame::SyncFileToVCS(LPCTSTR pszDest, BOOL &bApplyToAll, */ void CMainFrame::OnViewSelectfont() { - CFrameWnd * pFrame = GetActiveFrame(); - BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame)); - + FRAMETYPE frame = GetFrameType(GetActiveFrame()); CHOOSEFONT cf; LOGFONT *lf = NULL; ZeroMemory(&cf, sizeof(CHOOSEFONT)); cf.lStructSize = sizeof(CHOOSEFONT); cf.Flags = CF_INITTOLOGFONTSTRUCT|CF_FORCEFONTEXIST|CF_SCREENFONTS; - if (!bDirFrame) + if (frame == FRAME_FILE) cf.Flags |= CF_FIXEDPITCHONLY; // Only fixed-width fonts for merge view // CF_FIXEDPITCHONLY = 0x00004000L // in case you are a developer and want to disable it to test with, eg, a Chinese capable font - if (bDirFrame) + if (frame == FRAME_FOLDER) lf = &m_lfDir; else lf = &m_lfDiff; @@ -1443,7 +1441,7 @@ void CMainFrame::OnViewSelectfont() if (ChooseFont(&cf)) { - if (bDirFrame) + if (frame == FRAME_FOLDER) { GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_USECUSTOM, true); GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_HEIGHT, lf->lfHeight); @@ -1480,7 +1478,7 @@ void CMainFrame::OnViewSelectfont() GetOptionsMgr()->SaveOption(OPT_FONT_FILECMP_FACENAME, lf->lfFaceName); } - if (bDirFrame) + if (frame == FRAME_FOLDER) m_lfDir = *lf; else m_lfDiff = *lf; @@ -1566,10 +1564,9 @@ void CMainFrame::GetFontProperties() */ void CMainFrame::OnViewUsedefaultfont() { - CFrameWnd * pFrame = GetActiveFrame(); - BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame)); + FRAMETYPE frame = GetFrameType(GetActiveFrame()); - if (bDirFrame) + if (frame == FRAME_FOLDER) { GetOptionsMgr()->SaveOption(OPT_FONT_DIRCMP_USECUSTOM, false); @@ -1968,10 +1965,11 @@ void CMainFrame::OnToolsGeneratePatch() { CPatchTool patcher; CFrameWnd * pFrame = GetActiveFrame(); + FRAMETYPE frame = GetFrameType(pFrame); BOOL bOpenDialog = TRUE; // Mergedoc active? - if (pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame))) + if (frame == FRAME_FILE) { CMergeDoc * pMergeDoc = (CMergeDoc *) pFrame->GetActiveDocument(); // If there are changes in files, tell user to save them first @@ -1987,7 +1985,7 @@ void CMainFrame::OnToolsGeneratePatch() } } // Dirview active - else if (pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame))) + else if (frame == FRAME_FOLDER) { CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument(); CDirView *pView = pDoc->GetMainView(); @@ -2468,6 +2466,7 @@ void CMainFrame::OnToolsFilters() FILEFILTER_INFOLIST fileFilters; LineFiltersList * lineFilters = new LineFiltersList(); CString selectedFilter; + const CString origFilter = theApp.m_globalFileFilter.GetFilterNameOrMask(); sht.AddPage(&fileFiltersDlg); sht.AddPage(&lineFiltersDlg); sht.m_psh.dwFlags |= PSH_NOAPPLYNOW; // Hide 'Apply' button since we don't need it @@ -2478,7 +2477,8 @@ void CMainFrame::OnToolsFilters() theApp.m_globalFileFilter.GetFileFilters(&fileFilters, selectedFilter); fileFiltersDlg.SetFilterArray(&fileFilters); fileFiltersDlg.SetSelected(selectedFilter); - lineFiltersDlg.m_bIgnoreRegExp = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED); + const BOOL lineFiltersEnabledOrig = GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED); + lineFiltersDlg.m_bIgnoreRegExp = lineFiltersEnabledOrig; lineFilters->CloneFrom(m_pLineFilters); lineFiltersDlg.SetList(lineFilters); @@ -2504,10 +2504,58 @@ void CMainFrame::OnToolsFilters() CString sFilter = theApp.m_globalFileFilter.GetFilterNameOrMask(); GetOptionsMgr()->SaveOption(OPT_FILEFILTER_CURRENT, sFilter); } - GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, lineFiltersDlg.m_bIgnoreRegExp == TRUE); + BOOL linefiltersEnabled = lineFiltersDlg.m_bIgnoreRegExp; + GetOptionsMgr()->SaveOption(OPT_LINEFILTER_ENABLED, linefiltersEnabled == TRUE); + + // Check if compare documents need rescanning + BOOL bFileCompareRescan = FALSE; + BOOL bFolderCompareRescan = FALSE; + CFrameWnd * pFrame = GetActiveFrame(); + FRAMETYPE frame = GetFrameType(pFrame); + if (frame == FRAME_FILE) + { + if (lineFiltersEnabledOrig != linefiltersEnabled || + !m_pLineFilters->Compare(lineFilters)) + { + bFileCompareRescan = TRUE; + } + } + else if (frame == FRAME_FOLDER) + { + const CString newFilter = theApp.m_globalFileFilter.GetFilterNameOrMask(); + if (lineFiltersEnabledOrig != linefiltersEnabled || + !m_pLineFilters->Compare(lineFilters) || origFilter != newFilter) + { + int res = LangMessageBox(IDS_FILTERCHANGED, MB_ICONWARNING | MB_YESNO); + if (res == IDYES) + bFolderCompareRescan = TRUE; + } + } + // Save new filters before (possibly) rescanning m_pLineFilters->CloneFrom(lineFilters); m_pLineFilters->SaveFilters(); + + if (bFileCompareRescan) + { + const MergeDocList &docs = GetAllMergeDocs(); + POSITION pos = docs.GetHeadPosition(); + while (pos) + { + CMergeDoc * pMergeDoc = docs.GetNext(pos); + pMergeDoc->FlushAndRescan(TRUE); + } + } + else if (bFolderCompareRescan) + { + const DirDocList &dirDocs = GetAllDirDocs(); + POSITION pos = dirDocs.GetHeadPosition(); + while (pos) + { + CDirDoc * pDirDoc = dirDocs.GetNext(pos); + pDirDoc->Rescan(); + } + } } delete lineFilters; } @@ -3027,10 +3075,9 @@ void CMainFrame::OnSaveProject() String left; String right; CFrameWnd * pFrame = GetActiveFrame(); - BOOL bMergeFrame = pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame)); - BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame)); + FRAMETYPE frame = GetFrameType(pFrame); - if (bMergeFrame) + if (frame == FRAME_FILE) { CMergeDoc * pMergeDoc = (CMergeDoc *) pFrame->GetActiveDocument(); left = pMergeDoc->m_filePaths.GetLeft(); @@ -3039,7 +3086,7 @@ void CMainFrame::OnSaveProject() pathsDlg.m_bLeftPathReadOnly = pMergeDoc->m_ptBuf[0]->GetReadOnly(); pathsDlg.m_bRightPathReadOnly = pMergeDoc->m_ptBuf[1]->GetReadOnly(); } - else if (bDirFrame) + else if (frame == FRAME_FOLDER) { // Get paths currently in compare CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument(); @@ -3455,6 +3502,24 @@ BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile, bool checked) return conflictCompared; } +/** + * @brief Get type of frame (File/Folder compare). + * @param [in] pFrame Pointer to frame to check. + * @return FRAMETYPE of the given frame. +*/ +FRAMETYPE CMainFrame::GetFrameType(const CFrameWnd * pFrame) const +{ + BOOL bMergeFrame = pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame)); + BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame)); + + if (bMergeFrame) + return FRAME_FILE; + else if (bDirFrame) + return FRAME_FOLDER; + else + return FRAME_OTHER; +} + /** * @brief Show the plugins list dialog. */ diff --git a/Src/MainFrm.h b/Src/MainFrm.h index f9111bdd241..f84dce872e9 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -62,6 +62,16 @@ enum VCS_CLEARCASE, }; +/** + * @brief Frame/View/Document types. + */ +enum FRAMETYPE +{ + FRAME_FOLDER, /**< Folder compare frame. */ + FRAME_FILE, /**< File compare frame. */ + FRAME_OTHER, /**< No frame? */ +}; + enum { WM_NONINTERACTIVE = 888 }; // timer value class BCMenu; @@ -132,6 +142,7 @@ class CMainFrame : public CMDIFrameWnd void StartFlashing(); bool AskCloseConfirmation(); BOOL DoOpenConflict(LPCTSTR conflictFile, bool checked = false); + FRAMETYPE GetFrameType(const CFrameWnd * pFrame) const; // Overrides virtual void GetMessageString(UINT nID, CString& rMessage) const; diff --git a/Src/Merge.rc b/Src/Merge.rc index d53672deef1..c2256f15f13 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -2029,6 +2029,12 @@ BEGIN IDS_FILTERLINE_REGEXP "Regular expression" END +// GENERAL FILTER STRINGS +STRINGTABLE +BEGIN + IDS_FILTERCHANGED "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +END + // VERSION CONTROL OPTIONS STRINGTABLE BEGIN diff --git a/Src/resource.h b/Src/resource.h index 11d629eecda..528717bec17 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -519,6 +519,7 @@ #define IDS_FILEFILTER_INSTALLFAIL 16460 #define IDS_FILEFILTER_OVERWRITE 16461 #define IDS_FILTERLINE_REGEXP 16480 +#define IDS_FILTERCHANGED 16496 #define IDS_CC_CMD 16720 #define IDS_VSS_CMD 16721 #define IDS_DIRECTORY_WINDOW_TITLE 16800 From 7659fd5f4452eadc5302e8034b4ceca8066b24fc Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 23 Jul 2008 12:10:00 +0000 Subject: [PATCH 031/168] PATCH: [ 2024587 ] Revised help topics Rewriting folder compare documentation. Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Compare_dirs.xml | 1480 +++++++++++------ Docs/Users/Manual/Open_paths.xml | 2 +- Docs/Users/Manual/Quick_start.xml | 280 +++- .../Manual/screenshots/ctx_menu_copy1.png | Bin 0 -> 31803 bytes .../Manual/screenshots/ctx_menu_simple2.png | Bin 0 -> 35745 bytes .../Manual/screenshots/foldercmp_unique1.png | Bin 0 -> 35104 bytes .../Manual/screenshots/foldercmp_unique2.png | Bin 0 -> 24174 bytes Docs/Users/Manual/screenshots/foldercomp1.png | Bin 41092 -> 36512 bytes .../Manual/screenshots/foldercomp_2same.png | Bin 0 -> 25314 bytes 9 files changed, 1194 insertions(+), 568 deletions(-) create mode 100644 Docs/Users/Manual/screenshots/ctx_menu_copy1.png create mode 100644 Docs/Users/Manual/screenshots/ctx_menu_simple2.png create mode 100644 Docs/Users/Manual/screenshots/foldercmp_unique1.png create mode 100644 Docs/Users/Manual/screenshots/foldercmp_unique2.png create mode 100644 Docs/Users/Manual/screenshots/foldercomp_2same.png diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index 10606670049..896216557e2 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -1,68 +1,215 @@
      - Comparing Folders - - The Folder compare window displays all of the files and subfolders - compared in a sortable list view. Files and subfolders may be synchronized - by copying or deleting, and actions may be performed on multiple items - simultaneously. The columns displayed may be changed and reordered. - - - - - - - - Folder comparison has two different modes. The mode is selected in the - Open dialog with the "Include - Subfolders"-checkbox. - - When subfolders are included, all subfolders and their contents - are compared. Files are displayed depending on the options on the - View menu (eg, Show Identical - Files). Common folders are never displayed (but all - files inside of them are). Folders only existing on one side are - displayed according to the View menu options (eg, - Show Left Unique Files). - - This mode does not allow browsing folders and can be slow if - there are many subfolders and files. But it is easy to see and handle - different files in whole folder structure. - - - - When subfolders are not included only files in selected folders - and names of subfolders are shown. - - This mode allows browsing folders by opening subfolders and - parent folders. This mode has the advantage of speed, as it may be - much faster when there are many subfolders that need not be examined. - Also the display may be easier to manage, showing only items in one - folder. - - - - In WinMerge version 2.4 and later there is a Compare by - Quick Contents -compare method which makes possible to compare - big binary files. For more information about different compare methods see - Options & configuration -chapter. - In WinMerge version 2.4 and later all files bigger than 4 MB (megabytes) are - automatically compared with Compare by Quick Contents -method. Downsides for - this method are that linefilters do not work and there is no difference - counts information in folder compare UI. For most cases this should not - matter since so big files usually are binary files. - - For advanced users: If that limit does not feel good (you have lots of - big text files) it can be changed via registry value: HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit. - As usual be careful when changing values directly to registry! + Comparing folders<indexterm> + <primary>comparing folders</primary> + </indexterm> + + This topic describes how to compare and merge folders using the Folder + Compare window. + +
      + Starting a folder compare operation + + You can begin a folder compare operation from either the WinMerge + window or a Command Prompt window. + + + + From the WinMerge window + + + Click + File + + Open + . Use the Select Files or Folders dialog to specify the + left and right folders to compare. By default, the compare includes + all files in the folders, and is nonrecursive (does not include + subfolders). To change any of these options and for more details about + the Select Files or Folder dialog, see . + + + + + From a Command Prompt window + + + Run WinMergeU.exe, which is in your WinMerge + install directory. In your command arguments, include the left and + right folders to compare. By default, the compare is includes all + files in the folders, and is nonrecursive. To change any of these + options and for information about other command options, see . + + + + + + Recursive mode is useful for detecting and manipulating different + files in an entire folder structure. However, it can be slow if there are + many subfolders and files. + + Nonrecursive mode has the advantage of speed when there are many + subfolders that need not be examined. Also, the display can be easier to + manage because it shows items in only selected folders. + + + + Compare by Quick Contents option + + WinMerge 2.4 introduced the Quick Contents + method for file comparison, described in . + This method can be useful when you compare big binary files; and it is + automatically used to compare files bigger than 4 MB. Possible + disadvantages are that line filters do not work, and there is no + difference counts information in the Folder Compare window. This should + not matter In most cases, because such large files are usually + binary. + + To use this method, configure it before your compare operation: in + the Compare page of the WinMerge options, click the File Compare + method drop-down menu and choose Quick + Contents. + + + + For advanced users + + You can change the 4 MB file size limit of the Compare by + Quick Contents, for example if you have a lot of very big text + files. To do so, run the Windows regedit command, + navigate to this keyword, and modify its value: HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimitAs + usual, be careful when changing values directly in the registry! + + +
      + Folder Compare Progress window<indexterm> + <primary>Folder Compare Progress window</primary> + </indexterm> + + When you start a folder compare operation, WinMerge displays this + status window: + + + + + + + + Folder Compare Progress window + + + + If the compare operation is quick, you might not notice the Progress + window, which closes as soon as WinMerge displays the Folder Compare + result. The Progress window shows the number of files and folders to be + included in the operation, and the number compared so far. The progress + bar graphically represents the Items compared. + + + Because the files compares are usually of different sizes, the + status data does not indicate the time used or remaining. For example, a + 50/100 ratio does not necessarily mean that half of the compare + operation time is expired. + + + You can click Stop to terminate the operation + at any time before the compare operation finishes. The Folder Compare + window is displayed with the results calculated at that time, omitting any + uncompleted results. + + + Note to users of previous WinMerge versions + + The new Progress window was one of most visible changes in + WinMerge Version 2.6. The new design is simpler, eliminating details + that were not useful for comparing. Also, the window is closed + automatically because the data is no longer needed: you can view + statistics for the current results by clicking + View + + Compare Statistics + . + +
      +
      - <indexterm> - <primary>Folder Compare Result</primary> - </indexterm>Compare Results + Folder Compare window<indexterm> + <primary>Folder Compare window</primary> + </indexterm> + + The Folder Compare window shows the result of a folder compare in a + tabular view. Each row lists a file, parent folder, or subfolder in the + result, and the columns show different types of data for each item. You can + customize the table by changing the sorting of rows or the types of column + data displayed. Here is an example of a folder compare result: + + + + + + - Files and folders are compared and divided into several categories. - Categories are easy to recognize from these icons: +
      + Recursive and nonrecursive compare results<indexterm> + <primary>recursive folder compare</primary> + + <secondary>results view</secondary> + </indexterm><indexterm> + <primary>nonrecursive folder compare</primary> + + <secondary>results view</secondary> + </indexterm> + + The Folder Compare window looks and behaves slightly differently for + recursive and nonrecursive compares: + + + + Recursive folder compare + + + The compare result includes all subfolders. You can control + the types of items displayed within the folders by choosing the + options in the View menu (for example, + Show Identical Items). The Folder column + is always empty: only the files within the folders are displayed. To + see an item's subfolder, look at its path in the Compare result + column. Folders that exist on only one side are displayed if one of + the View menu options, Show Left + Unique Files or Show Left Unique + Files, is enabled. + + + + + Nonrecursive folder compare + + + The result includes only the files and subfolders at the top + level of the selected folders. However, you can browse to any + subfolder that you want to compare. + + + +
      + +
      + File and folder icons<indexterm> + <primary>icons</primary> + + <secondary>Folder Compare window</secondary> + </indexterm> + + In the Compare Folders window, files and folders are compared and + divided into several categories. In each row, the category is clearly + identified in the left column with one of these icons : + + @@ -136,537 +283,872 @@ Aborted item. WinMerge did not finish comparing this item when compare was stopped. Result is unknown. - -
      +       +
      -
      - Folder Compare Status +
      + Navigating the Folder Compare window - During the folder comparison WinMerge shows status panel: + You can use the mouse as well as keyboard and context menu shortcuts + to navigate the Folder Compare window. You can also use the toolbar + buttons. For example, the + + + - - - - - - - The panel shows approximate status and progress of the compare. - Status is shown as a number of items and a progressbar. Numbers show how - many items (files and folders) WinMerge has found to compare. Progressbar - shows same info graphically. - - - Progressbar is for item counts. As there usually are different - sized files in compare it does not directly map to time used/remaining. - So 50/100 items does not strictly mean compare is in half by time - used. - - - Folder compare can be stopped by selecting - Stop-button and results for files and folders - compared so far are shown. When compare is stopped before it finishes, - some files may be in middle of comparison. Those files are marked as - Aborted in comparison results. It means result is not - available for them. - - When folder compare is ready status panel is closed and results are - shown. + + Next Difference button + + Next Difference button + finds the next different file or folder and selects it. - - This is one of most visible changes in WinMerge version 2.6. New - status panel may feel "just too simple" after using previous WinMerge - versions. The fact is most of the details in previous versions were - useless during the compare. So simplicity was choosen for new design. - Automatic closing may also feel weird at starters. But there is no - information visible that would be needed after the compare. - + + Unique files and folders are navigated in the same way as + different ones. + - Compare statistics are visible in separate dialog which can be - opened after compare from menu: - View + You can select multiple files and folders. However, some operations + (like Rename) are not available with multiple + selections. - Compare Statistics - . + Use the navigation buttons (Next Difference, + Previous Difference, and so on) to step through + differences in the compared files. Use WinMerge functions to merge + contents by copying, moving, or delete one or more files or + subfolders. +
      - Selecting Items to Show - - In "View" menu there are several choices for - selecting which categories to show / hide. - - - - Show identical files : shows and - hides files detected as identical - - - - Show different files : shows and - hides files detected as different - - - - Show left unique files : shows and - hides files and directories present only in left side - - - - Show right unique files : shows - and hides files and directories present only in right side - - - - Show binary files : shows and - hides files detected as binaries - - - - Show skipped files : shows and - hides files and directories filtered out by file filters - - -
      + File operations in Folder Compare<indexterm> + <primary>file operations</primary> - <section> - <title><indexterm> - <primary>Folder Compare Columns</primary> - </indexterm>Columns in Folder Compare - - By default these columns are visible: - - - - Filename - - - - Folder : Relative folder name for - compare path. If subfolders are not included this is empty. - - - - Comparison result : Verbose comparison - result (see also Short Result) - - - - Left Date & Right - Date: Modification date of item. Note that newer date is - prefixed with asterisk "*". - - - - Extension : File's extension, handy for - sorting - - - - Following columns are available through "Customize - Columns"-dialog: - - - - Short Result : Result in shorter form - ("Right Only"). - - - - Binary : Column contains an asterisk - "*" when the file is a binary file. This is handy - for sorting and to use with "Short - Result"-column. - - - - Left Attributes & Right - Attributes : Shows file attributes. - - - - Left Creation Time & Right - Creation Time : Item creation time. - - - - Left Encoding & Right - Encoding : File encoding. Shows codepage number for ANSI - files, and Unicode encoding for Unicode files. - - - - Left File Version & Right - File Version : Version number from file if present. Note - that this is read for only some binary file types known to usually - have a version resource. - - - - Left Size & Right - Size : File size in bytes. - - - - Left Size (Short) & Right - Size (Short) : Shorter versions of file sizes, rounded to - kilo-, mega- or gigabytes. - - - - Newer File : Shows which side is - newer. - - - - Differences : Amount of differences - found between files, not including possibly ignored - differences. - - - - Ignored Diff. : Amount of ignored - differences in files. These are differences ignored by line - filters. - - - - Left EOL & Right EOL : Show EOL - style (linefeed style) of files. - - - + in Folder Compare window + -
      - Browsing Folders + The Folder Compare window supports common operations on files, like + editing, copying, deleting, moving, and renaming (moving is equivalent to a + copy operation followed by a delete). You can use these file operations and + some special WinMerge functions to merge the contents of folders. You can + also open files using associated programs or external editors. - Browsing folders is only possible when subfolders are not included - to compare (Include Subfolders checkbox is not - checked in Open-dialog). Parent folders - (".."-item) and subfolders existing in both sides can - be compared by double-clicking with mouse over them or selecting them and - pressing Enter. + The most convenient way to perform most of these tasks is to + right-click one or more items and use the context menu, where all file + operations are available. - Sometimes parent folder cannot be opened (no access to it). These - two icons indicate if parent folder can be opened: +
      + Copying files<indexterm> + <primary>copying files</primary> - <simplelist type="vert"> - <member><inlinemediaobject> - <imageobject> - <imagedata fileref="screenshots/folderup.png" format="PNG" /> - </imageobject> - </inlinemediaobject> Parent folder can be opened.</member> + <secondary>in Folder Compare window</secondary> + </indexterm> + + The most common file operation in the Folder Compare window is + copying files from side to side. There are several forms of the WinMerge + copy function: all of them copy only files that are different, because + copying identical files is of no use in merging. The copy functions are + available in the context menu, in the WinMerge menu, and in the + toolbar: + +
      + Context menu Copy shortcuts + + In the Folder Compare window's context menu, the + Copy item has a submenu with four + shortcuts: - + - + - Parent folder cannot be opened. - - It is possible to browse both sides to the same folder (C:\Work\ and C:\Work\). 2.6 and earlier versions of - WinMerge prevented this, but it restricted usage in some cases. In such - case both sides contain the exactly same files and folders. + + Folder Compare window Copy context menu + + + + + + Left to Right and + Right to Left copy the selection (or just + the items in the selection that can be copied) from one side to the + other. In the example, the suffix (2 of 4) + indicates that only the two files that are different will be copied; + the identical files will not. These shortcuts available only if any + of the files you select is different: if you select only identical + files, the shortcuts are unavailable. + + + + Left to... and Right + to... enable you to specify a copy target directory in + your system, instead of a compared folder. When the Browse for + Folder dialog opens, navigate to the target directory on your system + (or create a new target folder) and click + OK. + + +
      + +
      + Toolbar and menu Copy commands + + In the Folder Compare toolbar, + + + + + + Copy Right button + + Copy Right and + + + + + + + Copy Left button + + Copy Left accomplish the + same task as the Left to Right and + Right to Left context menu shortcuts: they + copy from side to side only files that are valid to copy. However, these + commands do not directly display the number of files to be copied; + instead, they display a confirmation dialog where you can check a list + of source and target file paths. + + In the WinMerge menu, + Merge + + Copy to Right + and + Merge + + Copy to Left + behave the same way as the toolbar Copy commands. +
      +
      + +
      + Deleting files<indexterm> + <primary>deleting files</primary> + + <secondary>in Folder Compare window</secondary> + </indexterm> - It is possible to select two different folders from the folder - compare and open them to different sides. First selected folder becomes - the left-side folder and second selected folder becomes the right-side - folder. This can be used in situation explained in previous paragraph when - there is same folder compared as both sides. + You can use the Delete context menu item + to delete selected items in either or both sides. Like other file + operations, Delete has a submenu with + Left, Right, and + Both shortcuts. + + + We highly recommend that you keep the Send deleted files + into Recycle Bin option enabled See ), so that you can undo deletions in case of + accidents. In addition, you should keep Recycle Bin enabled: the + WinMerge option does not work if you disable the Recycle Bin in Windows. + Again, you cannot undo file or folder deletion unless you use both the + WinMerge Send deleted files into Recycle Bin option + and the Windows Recycle Bin! + +
      - <indexterm> - <primary>Open Unique Folders</primary> - </indexterm>Unique Folders - - WinMerge 2.6 and earlier could not open unique folders (folders - existing only in other side). An error message was shown about trying to - open unique folder. This restriction came from a fact that WinMerge - cannot compare existing folder to non-existing folder. If one wanted to - copy contents of unique folder, then whole folder structure must been - copied. - - Copying whole unique folder structure is many times not wanted. - WinMerge 2.8 allows creating the missing folder and browsing then into - that created folder. So that contents of original unique folder and - created empty folder can be compared. Now it is possible to copy just - one file (or subfolder) in unique folder. - - To navigate into unique folder, select the folder, and browse into - it as normally (press Enter -key, double-click over - foldername with mouse, or select - MergeCompare from the - menu. WinMerge shows a message asking if the missing folder should be - created. Answer Yes to create the folder, or - No to cancel the action. + Renaming files<indexterm> + <primary>renaming files</primary> + + <secondary>in Folder Compare window</secondary> + </indexterm> + + To rename a file or folder, choose Rename + in its context menu or press F2. Then change the name in + the edit box and press Return, or press + Esc to cancel. You can only rename a single file or + folder. Note that renaming changes items in both sides: it is not + currently possible to rename an item on just one side.
      -
      -
      - Navigation in Folder Compare +
      + Opening files<indexterm> + <primary>opening files</primary> + + <secondary>in Folder Compare window</secondary> + </indexterm> + + In the context menu, you can use either Open + Left and Open Right, depending on + which side you want to operate on. Each Open + menu item has a submenu with these shortcuts: + + + + with Registered Application + + + Opens the file with the application (if any) that is + registered in Windows for the file's type. + + + This shortcut usually opens a folder in a new Windows + Explorer. + + + + + + with External Editor + + + Opens the file with an external editor. The default editor is + Notepad, but you can configure a different one in WinMerge + options. + + + + + with... + + + Opens the Open With dialog, where you can + specify an application to open your file with. + + + +
      - In addition moving selection using mouse or keyboard, also - Merge-menu navigation commands, toolbar buttons and - shortcut keys can be used. For example "Next - diff" finds next different file and selects it. +
      + Copying pathnames or filenames<indexterm> + <primary>pathnames</primary> - <note> - <para>Unique files and folders are considered as different ones.</para> - </note> + <secondary>copying from Folder Compare window</secondary> + </indexterm><indexterm> + <primary>filenames</primary> + + <secondary>copying from Folder Compare window</secondary> + </indexterm> + + The context menu Copy Pathname and + Copy Filenames shortcuts copy the pathname or + filename of selected items to the Windows clipboard. You can then paste + the copied information into a file or application, for example to create a + list of changed files or a change log. + + + + Copy Pathnames has a menu with three + shortcuts, similar to other file operations. It copies the full + pathnames of one or more selected items to the clipboard, one per + line. + + + + Copy Filenames copies only filenames + without paths. + + +
      + +
      + Protecting files<indexterm> + <primary>Folder Compare window</primary> + + <secondary>protecting files in</secondary> + </indexterm> + + To protect the files and folders on either side of a compare from + changes, enable the + File + + Left Read-only + or + File + + Right Read-only + check box. + + + Setting the read-only option protects files and folders only in + the current compare view; it does not affect their Windows file + attributes. + + + This protected status is inherited by files that you open in the + folder compare. For example, if you compare two folders, set one side + read-only, and open two files for comparing, the open file on the + protected side is write-protected. Similarly, you cannot copy a file from + the unprotected side to the protected side. + + The RO code in the left or right side's pane in + the status bar (near the bottom right of the window) indicates that the + side is currently read-only. +
      + +
      + Refreshing selected items in the view<indexterm> + <primary>refreshing view</primary> + </indexterm> + + A full refresh of large folders can take a long time. In WinMerge + 2.2 and earlier, you always had to do a full refresh to update files after + editing them outside WinMerge. Starting in Version 2.4, WinMerge can + refresh just selected items: choose Refresh + from the context menu or + View + + Refresh Selected + from the main menu. +
      + +
      + Archiving files<indexterm> + <primary>archiving files</primary> + + <secondary>in Folder Compare window</secondary> + </indexterm> + + Use the context menu Zip menu item to create a + new archive file containing the items you select. + + + Archive support requires that you have installed the WinMerge + 7-Zip plugin. + - Multiple files/folders can be selected. However not all operations - are possible with multi-selection. + The Zip menu item has a submenu with four shortcuts: + + + + Left + + + Adds left-side files and folders recursively to the archive + file + + + + + Right + + + Adds right-side files and folders recursively to the archive + file + + + + + Both + + + Adds files and folders recursively from both sides to the + archive file. Because the filenames are same, they are added to + different subfolders, named Original and Altered, inside the archive: left-side + files are put to Original, + and right-side files are put into Altered. + + + + + Differences + + + Like Both, but adds only different + files (including unique files) from both sides. + + + + + When you select one of the Zip shortcuts, the + Save As dialog prompts you for the archive filename and type. WinMerge + cannot add files to existing archive files: it always creates a new + archive file. + + + + + WinMerge can compare the contents of archive files that have the + same name on both sides: WinMerge looks for the Original and Altered subfolders, and compares the + contents of those two folders. + + + If a folder compare includes the contents of an archive file, any + changes made to the included files in WinMerge (for example, using an + Open file operation to edit the file) are saved + in the archive file. But you cannot update archive contents by using the + WinMerge Copy, Move, + or Delete file operations. Instead, create a + new archive file using one of the Zip + shortcuts. +
      - File Operations in Folder Compare + Browsing folders in the Folder Compare window<indexterm> + <primary>folders</primary> - <section> - <title>Copying, moving and deleting - - Folder compare allows user to copy and delete files and folders. - File operations are available through context menu (right-click with - mouse). Also files can be opened to associated program or into external - editor. - - In file operation menu, there are one or two numbers shown, - depending on files/folders selected. If there is one number shown, for - example "Copy/Left to... (5)" that means - there is 5 items selected, and all items can be copied. But if there is - two numbers shown, for example "Copy/Left to... (3 of - 5)", that means there are 5 items selected but only 3 - items can be copied. - - Most common operation is copying files from side to side. File can - be copied from side to side using Merge-menu items, - toolbar buttons and context menu. If multiple files are selected, or - file to overwrite is read-only, confirmation dialog is shown. - - Sometimes it is useful to copy certain files and/or folders to - another folder instead of another compared folder. This can be done - selecting "Copy/Left to..." or - "Copy/Right to..." items. - - Another file/folder operation is deleting. Items in another or - both sides can be deleted. There is "Send deleted files into - Recycle Bin" option in system options (See Options & Configuration -chapter). It - is highly recommended to keep that option enabled so deletion can be - undone if accidents happen. Note however recycle bin does not help if - its disabled from Windows settings. - - Moving is just a shortcut for copy + delete. + browsing in Folder Compare window + - - File/folder deletion cannot be undone if Recycle - Bin is not used! - + This section discusses ways to browse folders that are listed in a + Compare Folder window. When you browse a folder, you perform a completely + new compare operation. Its result overwrites the current result in the + window. + +
      + Browsing folders in a nonrecursive compare + + Even though a nonrecursive folder compare does not include the + contents of subfolders, the subfolders themselves are listed as files in + the result. Similarly, the compared folder's parent folder is listed as a + file at the top of the table. By opening these folders directly in the + Folder Compare window, you can selectively browse a directory tree. This + approach — comparing just the subdirectories you are interested in — can + be more efficient than performing a recursive compare on the entire + directory tree. + + + + Browsing the parent folder + + + To compare the + + + + parent folder (the .. + path at the top), double-click its row, or select the row and press + Enter. + + Sometimes the parent folder cannot be opened (for example if + you do not have permissions to access it). These two icons indicate + whether a parent folder can be opened: + + + + + + + Parent folder can be opened. + + + + + + Parent folder cannot be opened. + + + + + + + + Browsing a single subfolder that exists on both sides + + + To compare a single subfolder that exists on both sides, + double-click the folder in the folder compare window. + + + + + + + Browsing a single subfolder that exists only one side + + + If you browse to a subfolder that exists only the left or + right side, the new result has two sides with identical files and + folders. For example, browsing to C:\work\ + opens C:\work\ as the left file and and + C:\work\ as the right file. (WinMerge 2.6 and + earlier versions prevented this usage). + + + + + + + Browsing two different subfolders + + + You cannot compare two subfolders (that is, selecting two + rows) where the subfolders on each side are different. Only if you + have previously compared identical folders (for example, by browsing + a single subfolder in a compare result) can you compare two + subfolders. First select the two folders in the Folder Compare + window, as shown in the following figure: + + + + + + + + Folder Compare window, two folders selected + + + + The order of selection is significant: the folder you select + first is the left folder in the result; the second selected folder + becomes the right folder in the result. + + With the two folders selected, right-click and choose + Compare (or click + Merge + + Compare + in the menu). + + + Again, the Compare operation is + available only when the current left and right folder paths are + identical in the Folder Compare window, as shown in the preceding + screen shot. For example, it is not available if the current + window compares two different folders. + + + +
      - Renaming - - Renaming files and folders is available through context menu item - Rename or using F2 -shortcut - key. Edit-box appears and allows editing of the name. Renaming can be - cancelled by pressing Esc -key. Note that items in both - sides are renamed. Renaming just other side is not currently - possible. + Browsing unique folders<indexterm> + <primary>unique folders</primary> + + <secondary>comparing</secondary> + </indexterm> + + In WinMerge 2.6 and earlier, you could not browse to unique folders + (folders that exist only in one side of a compare result), because + WinMerge cannot compare an existing folder to a non-existing folder. To + copy anything from a unique folder in WinMerge, you had to first create a + copy of the entire folder structure. + + However, you might prefer not to copy the whole folder structure. + Starting in Version 2.8, WinMerge provides an alternate way to create a + new, empty folder instead. This enables you to copy just the elements you + want from the original, unique folder to the created empty folder. This + procedure demonstrates: + + + + Browse to the unique folder (select the folder and press + Enter, double-click it, or right-click it and choose + Compare). For example: + + + + + + + + Folder Compare window, comparing unique folder + + + + A WinMerge message informs you that the folder exists on only + one side and cannot be opened. The message then prompts you to confirm + whether you want to create a matching folder and open it as the other + side of the compare result. + + + + Click Yes to confirm + (No cancels the compare). In the new compare + result, the unique folder is opened on the left side, and the new + empty created folder is on the right: + + + + + + + + Folder Compare window after browsing to unique and created + folders + + + + In the compare result, you can copy or move items (for example, + using the right-click context menu) from the unique folder to the + created folder. + +
      +
      + +
      + Customizing the Folder Compare window<indexterm> + <primary>Folder Compare window</primary> + + <secondary>customizing</secondary> + </indexterm> + + This section describes how to control the way Folder Compare window + displays results. You can customize the view by showing, hiding, and + reordering the table columns.
      - Opening files + Showing and hiding types of files<indexterm> + <primary>View menu</primary> - <para>There are three items in <guimenu>Open</guimenu>-menus:</para> + <secondary>Folder Compare window</secondary> + </indexterm> + + The View menu contains these shortcuts to show or + hide types of items. Enable (check) a menu option to show the item; + disable it to hide the item. - With Registered Application : - Opens file with application registered for editing filetype for - Windows, if there is one. + Show Identical Items: Files detected + as identical - With External Editor : Open with - external editor. Default editor can be selected from options, - Notepad is used by default. + Show Different Items: Files detected + as different - With ... : Opens "Open - With..." dialog asking from user with which application - files should be opened. + Show Left Unique Items: Files and + directories present only in left side + + + + Show Right Unique Items: Files and + directories present only in right side + + + + Show Skipped Items: Files and + directories omitted by file filters + + + + Show Binary Files: Files detected as + binaries +
      - - Selecting With Registered Application when - folder is selected usually opens that folder into new Explorer - window. - +
      + Changing column sorting + + The rows in the Folder Compare window are ordered according to the + sort order of a particular column. This sort column is indicated by a + small arrow in its heading. The arrow points up if the column is sorted in + ascending order, down if descending. The Folder Compare example at the top + of this topic is sorted by the Filename column, in ascending order. + + To choose another order column, simply click in that column's + heading. The selected column is set to its default sort order and all the + rows are reordered by that column's sort order. + + To change the sort direction of a column that is already the sort + column, click in its header again. That is, clicking in a sort column + header reverses its order (toggling between ascending and descending + order).
      - Archiving + Adding, removing, and reordering columns - Zip-menu in directory compare context menu - allows adding selected items to archive file. + To modify the columns that are displayed in the Folder Compare + window: - - Archive support requires that 7-Zip plugin is installed to - system. - + + + Right-click any column heading and choose Customize + Columns. + - Zip-submenumenu has four items: + + The Display Columns dialog contains a list of all the available + column names, each with a check box. Configure the columns using any + combination of these actions: + + + + Check the columns you want to display (note that selecting + the item in the list is not enough) + + + + Uncheck the columns you want to hide. + + + + To change the order of columns, select one or more items and + click Move Up or Move + Down. + + + + Click Defaults if you want to restore + the default WinMerge column configuration, overriding your custom + configuration. + + + + + + Click OK. + + + + + Display Columns dialog + The following columns in the Display Columns dialog are + displayed by default in the Folder Compare window: - Left... : Adds left-side files - and folders (recursively) to the archive file + Filename (default): Name of compared item. + In a nonrecursive compare, this column includes both files and + folders; in a recursive compare, it does not include folders: instead, + folders are listed in the Folder column. - Right... : Adds right-side files - and folders (recursively) to the archive file + Folder: Path of compared subfolder, + relative to the compared folder. For a nonrecursive compare this + column is always empty: folders are listed in the + Filename column instead. - Both... : Adds files and folders - (recursively) from both sides to the archive file. Because filenames - are same, files must be put to subfolders inside archive. Left-side - files are put to subfolder Original/ and right-side files are put - to subfolder Altered/. + Comparison result: Verbose comparison + result (see also Short Result). - Differences... : This is like - above Both, but this item adds only - different files (including unique files) from both sides. + Left Date, Right Date: + Modification dates of item in each side. The newer of the two dates + (or the date for any unique item) is prefixed with an asterisk ( * + ). + + + + Extension: File extension, handy for + sorting. - After selecting one of Zip-menu items dialog - pops up asking filename and archive type from user. WinMerge cannot add - files to existing archive files but it always creates new archive - file. + The following additional columns are available in the Display + Columns dialog: - - WinMerge looks for subfolders Original/ and Altered/ in archive files. If archive - file contains these subfolders and same filename is given to both - sides WinMerge compares contents of those two folders. - + + + Short Result: Displays the + Comparison result column in a brief (Right only) + form. + - If directory compare shows contents of archive files WinMerge - updates changes done to files in file compare into original archive - file. But WinMerge does not update archive contents for files - added/deleted/copied. User can create a new archive file using above - menuitems instead. -
      -
      + + Binary: Column contains an asterisk ( * ) + when the file is a binary file. This is handy for sorting and for use + with the Short Result column. + -
      - Copying Path- or Filenames - - In context menu there are items for copying selected items' paths or - filenames to clipboard. This feature makes it easy so get list of changed - files, for changelogs etc. - - - - Copy Pathnames has three - subchoices like other file handling functions. It copies full - pathnames of selected items to clipboard, one per line. - - - - Copy Filenames copies only - filenames without paths. - - -
      + + Left Attributes, Right + Attributes: Shows file attributes. + -
      - Customising Folder Compare + + Left Creation Time, Right + Creation Time: Item creation time. + - There are many ways to customize folder compare: - Sorting by column : Sorted by column can be selected by - clicking column name with mouse. Little arrow appears next to column - name indicating that results are sorted by this column and sort - order. + Left Encoding, Right + Encoding: File encoding. Shows the codepage number for ANSI + files and Unicode encoding for Unicode files. - Selecting visible columns : "Display - Columns" dialog can be opened from - Tools-menu or by right-clicking column header - with mouse. + Left File Version, Right File + Version: Version number from the file, if present. Note + that the version is read only for some binary file types known to + usually have a version resource. - Changing order of columns : Order can be changed in - "Display Columns" dialog or by drag & - dropping column names with mouse. + Left Size, Right Size: + File size in bytes. - -
      -
      - Protecting Folders / Read-only Folders + + Left Size (Short), Right Size + (Short): Shorter versions of file sizes, rounded to KB, MB, + or GB. + - If user wants to protect one or both sides from changes, user can - set them to read-only from File-menu. + + Newer File: Shows which side is + newer. + - - Setting read-only protects files and folders in current compare - view only. - + + Differences: Number of differences found + between files, excluding possibly ignored differences. + - Protected status is inherited to opened files from directory - compare. If user compares two folders, sets another to protected and opens - two files for comparing, file opened from protected side has protection - set too. + + Ignored Diff: Number of ignored differences + within files. These are differences ignored by line filters. + - Protection status is shown in statusbar, there are own panes for - left and right side. -
      + + Left EOL, Right EOL: + Shows the EOL (linefeed) style of files. + + + -
      - <indexterm> - <primary>Hiding Files and Folders</primary> - </indexterm>Hiding Items - - Selected items can be hidden from view using context menu item - Hide Items. Hidden items are not shown until - next refresh is done. All hidden items can be re-shown selecting - - View - - Show Hidden Items - . - - Hiding items is handy to remove already handled items from the view. - So when you have merged files, use context menu item to hide them. It is a - lot easier to see what items are left to merge. Get used to it! It saves - your time! -
      +
      + Hiding items -
      - Refreshing Only Selected Items + You can quickly hide one or more selected items by using the + Hide Items context menu shortcut. The items + remain hidden until you refresh the view (press F5) or + click + View - Full refresh of large folders can take a long time. In 2.2 and - earlier versions of WinMerge user always had to do full refresh after - editing files outside WinMerge. WinMerge 2.4 and later can refresh just - selected items. Select Refresh from the context - menu or - View + Show Hidden Items + . - Refresh Selected - from the main menu. + + Get to know Hide Items: it can save you + a lot of time by eliminating items that you already handled, or that are + not currently of interest, from the view. For example, you might hide + files after merging them, making it easier to see what items are left to + merge. + +
      diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 265d64084ab..96b43707a83 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -27,7 +27,7 @@ Select Files or Folders dialog Quick start describes the Select - Files or Folders dialog. This section providesmore details, and some tips + Files or Folders dialog. This section provides more details, and some tips for using the Select Files or Folders dialog more efficiently.
      diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index 6dd1cec3ccf..e775b966cac 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -4,14 +4,24 @@
      <indexterm> - <primary>Open dialog</primary> + <primary>Getting started with WinMerge </primary> + </indexterm><indexterm> + <primary>Opening files and folders</primary> + + <secondary>basic methods</secondary> </indexterm>Opening files and folders - After you have installed WinMerge, step through the procedure and discussions in this topic to learn basic WinMerge operations and concepts. The methods shown are not the only ways to do things: there are usually several ways to do each task. When you are done, you can go on to learn other methods and more advanced skills, which are covered in other help topics. + After you have installed WinMerge, step through the procedure and + discussions in this topic to learn basic WinMerge operations and concepts. + The methods shown are not the only ways to do things: there are usually + several ways to do each task. When you are done, you can go on to learn + other methods and more advanced skills, which are covered in other help + topics. - Open the WinMerge window. Here are some of the methods you can use: + Open the WinMerge window. Here are some of the methods you can + use: @@ -31,13 +41,15 @@ - In a Command Prompt window, cd to the WinMerge installation folder and enter WinMergeU. + In a Command Prompt window, cd to the WinMerge installation + folder and enter WinMergeU. - In the WinMerge window select the files or folders that you want to operate on. For example: + In the WinMerge window select the files or folders that you want + to operate on. For example: @@ -51,7 +63,8 @@ Click the - + @@ -69,17 +82,27 @@ - The Select Files or Folders dialog opens: + + Select Files or Folders dialog + + basic usage + The Select Files or Folders dialog opens: + + + + + - - - - - + + Select Files or Folders window + + - In the Left and Right fields, specify the files and folders to compare. Use any of these methods: + In the Left and Right + fields, specify the files and folders to compare. Use any of these + methods: @@ -87,58 +110,94 @@ - Click the Browse button to navigate to the desired path. + Click the Browse button to navigate + to the desired path. - In the Open dialog, the text, Folder Selection, is initially displayed in the File name field. Your selection depends on the type of comparison you want to do: + In the Open dialog, the text, Folder + Selection, is initially displayed in the File + name field. Your selection depends on the type of + comparison you want to do: - If you are comparing files, select the target file. The Folder Selection text is overwritten with your selection. + If you are comparing files, select the target file. The + Folder Selection text is overwritten with + your selection. - If you are comparing folders, open the target folder; do not select a file. The Folder Selection text remains in place. + If you are comparing folders, open the target folder; do + not select a file. The Folder Selection + text remains in place. - Click Open to dismiss the Open dialog and load your selection in the Left or Right field. If you specified folders, the field includes a backslash ( \ ) at end of the path. + Click Open to dismiss the Open dialog + and load your selection in the Left or + Right field. If you specified folders, the + field includes a backslash ( \ ) at end of the path. - Click the combo box and choose a previously-used path. + Click the combo box and choose a previously-used + path. - To make it easier to select frequently-used paths, consider enabling the Open-dialog Auto-completion option. With this option, WinMerge shows a list of paths available as you type in the fields. See Options & configuration for details. + To make it easier to select frequently-used paths, + consider enabling the Open-dialog + Auto-completion option. With this option, WinMerge + shows a list of paths available as you type in the fields. See + Options & configuration + for details. - Drag and drop a file or folder into the dialog or the Left or Right field. + Drag and drop a file or folder into the dialog or the + Left or Right + field. - You can select only one pair of files or one pair of folders to compare. If you select a file and a folder or if one of the files or folders is not found, WinMerge disables the OK button in the dialog. + You can select only one pair of files or one pair of folders + to compare. If you select a file and a folder or if one of the files + or folders is not found, WinMerge disables the + OK button in the dialog. - The status message at the bottom of the dialog also informs you if one of the paths is invalid. + The status message at the bottom of the dialog also informs + you if one of the paths is invalid. - If you are comparing folders, you can use the Filter field to eliminate some files from the operation. The field specifies a subset of files in the selected paths that are to be included; all unspecified files are excluded. There are two methods of filtering: + If you are comparing folders, you can use the + Filter field to eliminate some files from the + operation. The field specifies a subset of files in the selected paths + that are to be included; all unspecified files are excluded. There are + two methods of filtering: File extension - In this method, you specify the types of files to include in the operation; all other files are excluded (filtered). With no filter value or a value of *.*, all files in the paths are included, so no filtering is performed. To add filtering, enter one or more file extension specifications. Separate multiple items with spaces or semicolons. + In this method, you specify the types of files to include in + the operation; all other files are excluded (filtered). With no + filter value or a value of *.*, all files in + the paths are included, so no filtering is performed. To add + filtering, enter one or more file extension specifications. + Separate multiple items with spaces or semicolons. - For example, this expression filters all files from the operation except C and C++ source files: + For example, this expression filters all files from the + operation except C and C++ source files: *.cpp;*.hpp;*.c;*.h - You cannot filter by file name, which is represented in the file extension expression only by the * wildcard character. For example, these expressions are not valid: + You cannot filter by file name, which is represented in the + file extension expression only by the * + wildcard character. For example, these expressions are not + valid: mybook.xml @@ -150,29 +209,41 @@ File filtering - File filtering is more powerful than extension filtering. Click the Select button next to the Filters field to choose from a list of available filters. See Filters for full details. + File filtering is more powerful than extension filtering. + Click the Select button next to the + Filters field to choose from a list of + available filters. See Filters for + full details. - The Include Subfolders check box provides another way to control the scope of folder comparisons. If you check this option, WinMerge recursively compares subfolders, and shows all the files and folders it finds in one view. If you disable the option, only the current folder is compared, and subfolders are listed by name (without their contents), so you can browse into them. + The Include Subfolders check box provides + another way to control the scope of folder comparisons. If you check + this option, WinMerge recursively compares subfolders, and shows all the + files and folders it finds in one view. If you disable the option, only + the current folder is compared, and subfolders are listed by name + (without their contents), so you can browse into them. - The Unpacker field enables you to perform compare operations on plug-ins. + The Unpacker field enables you to perform compare operations on + plug-ins.
      Other ways to open files and folders - The Select Files or Folders dialog is the main interface for opening files and folders. But you can use many other ways, too: + The Select Files or Folders dialog is the main interface for opening + files and folders. But you can use many other ways, too: - Project files are the easiest and fastest way to open frequently used paths. To open a project file, use one of these methods: + Project files are the easiest and fastest way to open frequently + used paths. To open a project file, use one of these methods: @@ -188,48 +259,87 @@ - From the Opening Files and Folders dialog, specify a project file in the Left field. + From the Opening Files and Folders dialog, specify a project + file in the Left field. - If you specify project files in both the the Left and Right fields, WinMerge does not open either project file; it simply compares the XML content of the two files. + If you specify project files in both the the + Left and Right fields, + WinMerge does not open either project file; it simply compares + the XML content of the two files. - See Opening files and folders for more information about project files. + See Opening files and folders + for more information about project files. - Right-clicking files or folders in Windows Explorer, choosing WinMerge in the context menu. + Right-clicking files or folders in Windows Explorer, choosing + WinMerge in the context menu. - The command line allows you to start WinMerge from other applications, from a command prompt, or a batch or script file. + The command line allows you to start WinMerge from other + applications, from a command prompt, or a batch or script + file. - You can drag and drop files and folders directly into the WinMerge window or on the WinMerge desktop shortcut. + You can drag and drop files and folders directly into the + WinMerge window or on the WinMerge desktop shortcut.
      - Comparing folders - - - - - - - - If you selected two folders in the Open dialog, the Folder Compare window is opened. The Folder Compare window is a tabular list of items found in the compared folders. Each row displays information about a found file, with the file name in the left column and additional information in the other columns. - - WinMerge does not have a concept of original and changed sides. Instead, it simply shows what is different between two selected folders. For example, a file or folder that is found only on one side is simply shown as a unique item on that side. It is not shown as added or removed. In the preceding figure, notice that the Comparison result column lists Merge.aps and Merge.rc.bak as found only in the left comparison folder. - - You can manage files and folders in many ways using the Merge menu, toolbar buttons, or context (right-click) menu. The most important action is making files or folders identical in both sides by selecting one of several Copy items. When you copy a file or folder to other side, the Comparison result value changes to Identical. - - If a file or folder exists in both sides (and it is not a binary file) it can be opened for file comparison using one of these methods: + <indexterm> + <primary>comparing folders</primary> + + <secondary>basic methods</secondary> + </indexterm><indexterm> + <primary>Folder Compare window</primary> + + <secondary>basic usage</secondary> + </indexterm>Comparing folders + + + + + + + + Folder Compare window + + + + If you selected two folders in the Open dialog, the Folder Compare + window is opened. The Folder Compare window is a tabular list of items found + in the compared folders. Each row displays information about a found file, + with the file name in the left column and additional information in the + other columns. + + WinMerge does not have a concept of original + and changed sides. Instead, it simply shows what is + different between two selected folders. For example, a file or folder that + is found only on one side is simply shown as a unique item on that side. It + is not shown as added or removed. In the preceding figure, notice that the + Comparison result column lists + Merge.aps and Merge.rc.bak as + found only in the left comparison folder. + + You can manage files and folders in many ways using the + Merge menu, toolbar buttons, or context (right-click) + menu. The most important action is making files or folders identical in both + sides by selecting one of several Copy items. When you copy a file or folder + to other side, the Comparison result value changes to + Identical. + + If a file or folder exists in both sides (and it is not a binary file) + it can be opened for file comparison using one of these + methods: Click Compare @@ -239,7 +349,8 @@ - Right-click the row and choose the Compare shortcut. + Right-click the row and choose the + Compare shortcut. @@ -249,7 +360,10 @@ Select the row and press Enter. - If you compare a subfolder, the new folder's comparison table is loaded in the current Folder Compare window . When you are done with that folder's comparison, you can navigate back to its parent folder by double-clicking the + If you compare a subfolder, the new folder's comparison + table is loaded in the current Folder Compare window . When you are done + with that folder's comparison, you can navigate back to its parent folder by + double-clicking the @@ -259,25 +373,54 @@ up arrow at the top of the Filename column. - If you compare a file, WinMerge opens File Compare window with a new tab, as shown in the figure in the next section. Then, if you make changes in the File Compare window, the file's data is updated in the Folder Compare window. + If you compare a file, WinMerge opens File Compare window with a new + tab, as shown in the figure in the next section. Then, if you make changes + in the File Compare window, the file's data is updated in the Folder Compare + window.
      - Comparing files + <indexterm> + <primary>comparing files</primary> - <para><inlinemediaobject> - <imageobject> - <imagedata fileref="screenshots/filecomp1.png" format="PNG" /> - </imageobject> - </inlinemediaobject></para> + <secondary>basic methods</secondary> + </indexterm><indexterm> + <primary>File Compare window</primary> - <para>The File Compare window shows the two versions of the selected files side by side. Different lines are highlighted with a background color. One or more consecutive different lines form one difference (or <glossterm>diff</glossterm>). WinMerge mainly works with these differences, not separate lines.</para> + <secondary>basic usage</secondary> + </indexterm>Comparing files - - Notice how WinMerge fills missing lines, so that similar lines are always aligned vertically, side by side. This is different from most other compare/merge programs, and can take a while to learn. - During merging operations, lines in a difference can be copied between sides. Missing lines can also be be copied. When missing lines are copied from one side to the other, matching existing lines are removed. In the preceding screenshot, a merge that copied lines in the second difference from left to right would remove the matching lines in the left side. + + + + + + + File Compare window + + - WinMerge has a simple integrated editor that features basic typing, copying, cutting and pasting of text. If Automatic rescan is enabled, WinMerge updates file differences while you edit a file. If Automatic rescan is disabled, you can update files by selecting + The File Compare window shows the two versions of the selected files + side by side. Different lines are highlighted with a background color. One + or more consecutive different lines form one difference (or + diff). WinMerge mainly works with these differences, + not separate lines. + + + Notice how WinMerge fills missing lines, so that similar lines are + always aligned vertically, side by side. This is different from most + other compare/merge programs, and can take a while to learn. + During merging operations, lines in a difference can be copied + between sides. Missing lines can also be be copied. When missing lines are + copied from one side to the other, matching existing lines are removed. In + the preceding screenshot, a merge that copied lines in the second difference + from left to right would remove the matching lines in the left side. + + WinMerge has a simple integrated editor that features basic typing, + copying, cutting and pasting of text. If Automatic + rescan is enabled, WinMerge updates file differences while you + edit a file. If Automatic rescan is disabled, you can + update files by selecting Edit Refresh @@ -289,6 +432,7 @@ Refresh button - toolbar button, or pressing F5. + toolbar button, or pressing + F5.
      diff --git a/Docs/Users/Manual/screenshots/ctx_menu_copy1.png b/Docs/Users/Manual/screenshots/ctx_menu_copy1.png new file mode 100644 index 0000000000000000000000000000000000000000..3e298b6138e9da7f6ed813c2b42eea3a3304febf GIT binary patch literal 31803 zcmXtf1ymbt({_NM4G<_2Ab4qUcXvwh0>#~-xVuYnC=_>x;_ePD?q1y8UH&}pf4-C5 zliho>o86gv=9-yn_J^Xp6gnCq8UO%5m;NmN6##(8007_=QIKFG^YgcqurD~ruTr9b ziZSQ`YzN6uMoJv;_TMMFz33-w1l8`dh9dy*?)`r&93V9v0vkkjl9rP|UO>jd29lAA zw(J7{WB_S#5f!(kV;%Q&oc{K=Z?5Cj$W<$?*FoLu%4o;fldV<|pDn<5Jb7L-egVe2&!{6`(;yg~tmj-NaIwgUY=yPzZiS-_5H$6` z75iDzWYZRrA`Oj_a~}CrW6iU)VcVpk;f~-$t!ABLSLQ)+*~Ap_NrF< z2m#?%W1tQEH3C2K7e0bpF|CVZB2TO&9&iK#J%;!aTyqrKXKC!vIo|9$#Y&2^2yr`! zPl$LmT^S!{$UtaVp*E=Ume}oD0YnuK9uPLh!%#h@FeBTt$OaUt4@i9`(a9i`fVp4r zeoBdwn=AY=eSXpAP=sMEW>*g(VI`Kmv$*G=QPmL*JjCp{kim|{kY8q`-KV?lip$Gg zd02Kl7$h+k{=+Qo=o8z>BoX^@G>S%8f8sEp#{%Hm)2w&dLc1eYpN(b30YMP(Kk?xF zpf2vc^w~BLhybXfB8(!V=y?<_MxBj?EDd}wVK=~Hu)kF2?^Cn$x%JsZ6=ED;iwdN` z5TJk3B?(#1{9*Xn7fBkZxx}5i>}L)Q>*rBXCF)mI@pB}ru%ku;EBl#8<_Vxd&DAER zrUG;qqB{jVC_+{hvpTCPE2n#OxuKrE-b8&OVqM~>huwJ8$f?~%N@RElYO2C<&Qo1* zJQx+!>kc4(Jj9qfF&jR=-CuY!$Q~QXW^X@o@O?^IQknpDjes6q{X5?CU!En|2??9} zxQIcD*cJe%C!`8#BU^bP^xQ78A0P?@@c}Y4Xf9yo()695!q2~f(yG8AXG?9AAd=7* zWFE^h0&yj)bp-5rLdQgM4B>4kxNacB5y=iiB>3Ar8Wau-B}`bSw>#e;ur0{C7^nP+ zocQazkKumQ{?c&5s$HrX)OJ`P05>u|Hw2mcJ%D^eFBYDAK|Pcl!5NVc0@y^$zMTw1 z$Pxd6fC&%dmn31M6ST+_{XFZ0vk34p!OW4?_8GS>;JN1$WQ^(DYK(F-B> z9-gSOrj$f41ytc>eJ8Yvi3*`^Y4(xGk6mTxeuuooqqz(xy=@-j;3V#EE~|`a$O=xX z-$0arZ6G7FyGp2`s#qHfvqw%N()b$CQGkrhR$Tyx-QSp{;bZCorTDt?l+M*b{3Hl5 zgY`M@R3}52y6WG;Pb;YX$b`YplAUTsJl-d~s*{L_DzQ!d3i0&s$5T}(zeO?aga3LApj zYdlptSci!OSKt&w;f+u}(_1feW)fazR2UW27l6_RjTA9C5du(FCqss$@hQDl4$Rwj zmWBC|I7kqZ@`U*-Uer{fmp#bbP1m@`S&pPlL)}0TWm=Sf@PzF+kCsz$za3HI7Cj*F z$f7%-xB7M5XZ@F>rnj+!riX`FxAV%Q^T9-|>g$Mq>RP^F`(UHvrab$;ri+R=>*o`) zb9XUC)e79PQiolSj*G^?5l=x6I{<9;J44oVFcX@=sJV-_L`GG2FzbwWr}0_^FEh=% z9qiI-b+{rayk=wGjuC?dZBcYvnrZhAhFo>QUZRD1MLrWAFVd>$uVOc~9G_a~)at~PYCenrsXP=?S6)E&qZ-qG zJ~`6kU5) z4H0O%+6*9K3P#%73IzH`jP+QbY+aNS=h+V(l5-nd;9>|ei%rQ3dts^_Atd*sl=WOw(12=SZZtLM);rFqCBevHAS ztTR=TZch(SeNt3%Bpp&48?|V<5}Ns)*~zxPCd{Ae%q??z97^<2Z9TtiwTEU;DDqsZ(uW6@hxFE4^TZ$pp4CUAf??UYp zseHmYhsxj;d61E7JKrZ&vH4pqaBhNw2_yWa>J5JAu)RNG0J(2g67neG3dh;+%aEqb zyJ)lHDdI9$z)vu+`S(o(VK-#G|5D0pMo}19g+H8VtfZ^&g2V0Tp8&T_ejz;f_?kvF;upPg zSNERr+xw5`NQ@a?)Tha{*cVGM98StoK>~o&h`yX6)@S)xkM(Llrp!_6Ic#9LU5+s* zS`L`vj%{Boh3eg1Sbpc`Nd*Kfr+~w%g*-jin0Ne3XqqSNKJFir3IP zmLf&D)Z<%%dd`rgpS~p3#cK*Xc=%@h~ieoxdS8XztToO7PjiPs0S61PIQ7 zpR^7WV@3&LPt4B653KQ_2?`gCrKRl-AP0af=>vY?r$^SPl5R%7mG_l@vaLs)yqkH? zV3zxhFeRWM%Sy#<>YzUPrZI|J%GND?Z&>ZSKkv3v1pA9v6QNC#X);-HkI%=CcTuP4aK7 zaG|z;{zO^4$<)(VNU5iLP~xtA(zAKbg?1KqFO(;Y(uFpe?q|$gxBE(Bi{2w>-F2n_ zqhDx;vj3J8VpWOK!1j}7l}TeNYdhO(El7DB)kvj2NG^)iCfN}@EEtp5OuR4y8O&#s z5?#7-rRI<_ORRw%l~k3vKk41udYpekFv#B8wwm5G+MAXzDhQeq^Gu*5+*=aofT4kR z0|GF!IErApPZM!H(xP^eXP(zwdm;oEy5`UJy-RNakj?xdlwseQ3&1gj!GebxUw@>h8-OcZ!p8stuCW0@aNk6N^ZK%*$bobm z&D0R2WE5)bE{TLY!~Nlg9M^5-gfnl_9rUy8HX8!kv{kXJTLq;_89a;+%Zj`6J+Q}3^QGW#V6;6tI=hx$tl9%sW)(y?FmaSjot&Y0P}jdau4@IP3LC9 z)mzx#Eit#lWvr?NIN^y3+tn7#c|CiG`Z1tTp0T%ZAjoTM>302Zi6-S+ubxk&t@ef4 z3Uf2av4S7qZBugKy3^LVQP{dBb)Sb{wLK=7%r6-9lgS$$UzZhsFa~XXW$7jM@LLfk z({vVY%W~V>K@?0+ir&xKb;nClSDxi_nTwR|Y#kaQ8ft2WFyE;3?WyyAJ4qSy_XHSx|1j1sKXP=`O*S1i*dA_P#b$9vU%)(LV3GF9JyBz z(2;4#`yNE4^W+K-*!6|TYt!IUq4ZvxH~@BcO7%O7BJ&|%n%@s#hC3y6;=xLfWv|dQ-5sE7Sh@peW1 z`R2&(L7JRi{kI&Yz)_?o0G?4u`s%J|5Z~aU0!#DRY@V#jCzv5R*w*Vu0nrec@0nhf zq!RaXd{r+H6F${`VzGz>&0a4f=A89~CrhL6m9w0Pr8Fyi%jfU;NPrypcHXnl^>8uu z(SAGg}MFIBz|sV6FZRBqLy+?Kg>~hZhl%Cmvf!zdl%*Ra;Xxm zST|@Xbh=RMkn^1^rstoZwu^$J*u4@g_YBI98 zO~q6(+%|0^|LE?BOI?tj*PKmemV<TeG3!4$q84Vrz4dCOWmuuOTG`h`zgE;Cq~Xph zj%Q{E?8k=)C2O&-BR@$GyQb1i z+8Vb#Mzov(Z1`TtTB-5Kd{NiYgz02B7rkQ>9g{|k?Eik1Prt%2EADwWNSkcY_D1rG^hM z{q+YZHy1io7orEpo!ktJE@h?WcQ5WC_)j5#*cGiJ-u zp5hW(DQ8szNsJ0$<`hbB7X&;-?*fN4JZDuc%j@_dGqaJzQiGKKC4M8MRuX>Vn8@vf zM<0&G9i?w$mtSbl{Dh#v#&)1kl7NZd2aa=Is>(a?W1s?WJ050dJ24ECU`V&{`vyJW z6nC&WM!ed>g=baEK>(nCP;_$tcSbGynj}HV4M3(n9bMDtQy#|#Al`e4*?Y%&y0!$0 zOqq-(l6oQP^wq~6tbGyKtHz02U| z^-8b`*OP`PSoTqn-$~0Sl_c^`-{eHn$xlt)_@|M^JfR@Ye?%o9`{*dX^=Q}@xlyl| z;QmPbb`{oehFNz51tENqFbN}~@2Qcgh5;9I)AnvGqFKu!AlX1{4@=rWOqmK`J}fnu zw;m4+^q+ZlF$iFPKK~AYwpKh5A_-k#R$Z<__e_CI;v8)?wt-!?y1aZW~}P>fKQBY|@h3?n6xX zHU#X{mZpz%@EE@p{_|@--RE$G94FjRzx`x`^(CVTLJwRJtzT2A+&>i)j73FX`Za&8 zg_@r10I}KL%@sv*Yy*S|Q+4iMJVa%aO%@&dSa<*=g#V$Cz_u529C3QC8mVjYy8Qxj zKR6Bm1mevZ-ElpNC>q;oAV%hd>!YmOm$x4vX6L1&N&Th80Du+!VvXaGL>jwHD8w`n zd#m47_9b62hWvKmzZ@FWkIZ3(3a<^3Azd@}t_zwJpDKq?VorK?`vaOfL{VcRgaP{6 z15-@?N`cPK2G=wjaar|`Wu`+9iwSBlCbSE2kX%N5a5RWR$eo$?Mq zD|pei418xhP(Cd$vQ`R!8P0hT@@o))2<{=QvUQ-^9dq!ao*5Szuu!MfKd!69ipHc2 zxe%)V+TTWmko+Wher0`f9Iponatt!$M}}v)Hp$CsGx5_|V1Ah-eO6g7 z?>K@F|CMd5W}aebq+|qk(0!mw(3(2Xxlg=G-|$$z?FZ%a(2J&9xA2hT(Z$>xAph)4 z%-oZ0hGsBrUi_s)BWrduE@>^W?iHcR4ad?QcV;@qH3|V>3*3Ug(YN}zXXe?*1h*M$B zh-l9Cz6OPF$R9HQH$-hA-lP&u11ZK?7*_%%-RO-C)8K6-6kxMYURp?2%pyDoB6ro} z2Zl*>nILMf3H&6Qaul8_^ald75rq9X2kAJ>mn|`0fW;@6Dv5CI;#GE^m5J#4L=w0m z;?POY;Ippzx`TG>#YIn=_Alla?CT3+JY!D}cwSJVA4dv1_q~mX&rj1H=`I^@ z>HP)Ix@BNm%TuxKc)sFuN1w9t^j!J6+)%E!=@ahj1t+)D$BNpW2 zAmbOOi^bxO2I%NLU{O?6+(ZUZle_)4wxRwyf*lde&s=g%Usw4^IVd)0-M6U+4ew9| zrQHG)7%Y26=f@Dwv@(*+SWPWH3(>^sT9BaRh(J(+zDmCM;EH)P=9VC?vyc&j$q$Z* zi_`tzjc7A`HK5qkCK8?aPL$l>B`S+V!2l8T+Y>qlAZ$W!o>b~?h~PUqQNtX=M7+tV zndR*DwbL^H;)W?+TO^@1VI%*n-$3OVo5V&|AGOn3xJCN(B{+ZP2SN;8A(h~KC^1ek zSQP_>BKa>0HdB_PCt@Wxml2IYJsjYc6kwz7fMWA_;}GU-^}ZL2@}sEWExhC5S4Of` zpz|o)I)u>PNMH49ze&7~joM2j@D1IQm*`T-~ zZ3PcG%u?5y34kz}u3UWqj{D#QjReEW*baP|FN#w=zu=@5?MJ0qU(b7o#)8|`x&?eK zdTV7;I2|b&tz59mCqif&Ufv&O9=H$t4t#DNVX_BPXyU7}62f`wAWH+9fGp+@%o1i| zSV4y@YiWZL){9E!)2yifzLI9s?|0NyeLxY*^(Qlu*NeSr(dFc%RJk54>FXQ8tYG>; z-Ya-~JX2<(K@@<(Y#rVi*%uo$|0^RTs<**c)M7}$o_PpCftEB#9?M`^!;wf4QGcF< zj5>hD^cOJ)n6nJiRHHd2;?bixH&M}UK5>`3Tu_QE;bX3ZEVQW_jk1v)(qATsgA32Q z5mV&W8J@ntFnt(RvP7X0o;RL-cv_kY=}~PqeUHDFs)zWv`gv!mP619aVdWP~;0N_L z$FU#$+uHU3_D%4l3ybkCezMC_b>j810;HDoeG3D(>de2!T0UR31IH~V#AYC^HB_sH4x7D6s#40-9~U=#@jm9-Z>yMsh!8a9-Vcx~*+ zlf|4eVmJ~g0RZXv5hDupW(o|83Ezp0jBw+#)0>28AUt_dzQ6FfsG}pBxRN*-`12#d zAp*MAb_zE{{pI=dviq6xs-&|s2Q96+mI}Q8MEy4TJaK}qYJI|Asvv!4bCR>=M$GsR z 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 Dg>+am literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/ctx_menu_simple2.png b/Docs/Users/Manual/screenshots/ctx_menu_simple2.png new file mode 100644 index 0000000000000000000000000000000000000000..5ff3cda946dbbb1140a955ca3469196d4c8e2006 GIT binary patch literal 35745 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 literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/foldercmp_unique1.png b/Docs/Users/Manual/screenshots/foldercmp_unique1.png new file mode 100644 index 0000000000000000000000000000000000000000..7723591f7e4b5fc4a32d95a874f7e7c4a7b98289 GIT binary patch literal 35104 zcmZU)WmH>Tv^7j|FH)emySux4aVJnT#fy8PIK|y54#nM_;_mKHAi>@8<+=C1zrHm_ zM#eeG*_O5DUUROU$S-R07^p<3FfcF}iV8BCFfg!cFfboL~>J9l|@=X!ofo07dXglyX!rLy+2)uMGM*97PPDEJyfN<&nr&U2)w!XsBOE&a>eJ`zWH5MP!5p6JFm zQ65*h05*#EJ~ot!%HPwRalHS0i;MgCVK`aX^9>CEFl;!(iZhoDp%>sL9y5~tl2&e$^vRPQlJtC%M8y9%s4^q@A5g_ zm4V-XsJ^WH^nFQYf(sQT(ENB3H@WeWcuvkpfyfB=6_ZdAh!wq(#sLDX?ec4&$Yk44 z$EU{I%XGJ@2kaH)G>!y#%-G6!Gj=KQ?9tw<77NKJ<*UHbemO1D@!Xq<+L1{uJ~c6) z4l8Nx=_f;9L}K>Y~E4Ads-}C(NqHlsWN)B!YYgr{>MUdf9~R@8Ds9{a^rN{ z(e8@KaQ8;RPtzu~J<$4_gKeASiAOOUYCUML@r?X&NbXXL3J`DM3jhF^qPQjCEV5Me zj|iMdIR&LiHt-p?YGQI?Ypr6c@1*EQECN_yFcuCRuch9XFJB(1%!-Sc;6p|64OPsF zX}BD3(6!)cwPziv=5T(O_VLusVHfdGR!J|w!^tdgN+;4GlXq~jMA%YL&!mo|)5~T< zaKW`rgqp=8Y4U=&J|}bxXW{mn*hLQ57(fI4%piPTg{aruqQKmm-$k_i(+{)76C#r@nhH8BeB(|_inC&N3s z8a~u|nw7F}7wyJeNxsz``2tW(XqK4{e;ZcafP4>bw8G6Pvv#@H+cUlcGo3zra)XHV zTp&qVio`gYKrEm_W6&(B<uqd3 z8ycKKF*4k^GsdY^oUZ~nS*^dd)Yf@(>l!h0Wk?VKErqO*9E(V{zK*MN9qI>X(djY; zCD_`?=Y4Z*KNrgv_Y~cTXG{-4G(=5g#sWPg7Il(T(F89JYh>?fWC^srXM|W@=MRzM zKO!+dU@8FvLPx*Mll&LSQ38yhrO5*)={C?7jr$t{HfeK{Ql^mucb>N4SA*um7+_Fx zJRfZd3L|bJqoNT`b4!N(dUMQHl*+@S5(nV)&VC@#>OP#s>`<>N4xKk`2c)MY~ z3Gn2IHjXA^(SA!Wohr^Ro;jWbIn)d#DqM%pRqMd5=9p(&C%R1t{!cYSOYXKtM2B^W zb#&r1%TM&m(Z}(0%h_KPjI4d1_XcKoC1nWy!Mah-@J3em$*McS;U6Z_s~2dNM53M! z6hi&8w!`8Kb2Ne|sCpfqo+yDYqYfS@k%q&QwV}W$p~QohMQ)o|hN(fi#19(D;9F-j z?_kmy*QNR?PvJ&-i%f-sFfL<=sgWoIE1^_GhmBJ-BQd^FBU=EnHC8ui;y%NVmRf`V z(@&=+0Z)j)YHbvo#i?+DHQ!g?6$rRK{=M;W=mHq>gyTE-|8$`1GGN$(3-Z+9DJeVvBY0c)1lK~d2cCy~(zPl+&| z4|KviADm2?u+p70S5k;0NF4F+JeZ5M{-&Rgn{3eP%%hT&H9`SC!&aJZJzgGtiN5?5)8!OqHht$>KJ2=5ls>6_=S#Ji zd+@+3Jocoin@xIRG-gx*iogYV#VjK<{umfQ}2-KaR@bFJDkNDE(F42*1L8z=$b&3L-ifaL@M4 zc93@8af@r zpic=a`oM^WLr0^kkO4b@qmPV5)dCI;*(|3c!T0zfP@LdUHF8fnVwsru_7N%nNDp!r zU-C)dK(Ry%{e64+!#{UW`MntHT(A_bWo$Go24Q&FyrOW?$V0b4q1?0uh-;6|U@7OHqm49&@kNd1(@cbPpHoG3to3oUf+=Z%%9a5o4jC37 zQj-;AYX4g(!jLdh3N^(_ZPbj$(nG%2Ti>mw_H~GP67@Lzyx9n(3v6QKdo56_64D4W z%thK+E;y0c>*8E7wLk$&+XerUcVhuhk?@(dS@!ie!F&3g?|biLjgHG^s0Qqbhr!x@ zzC2a>9HZp#I?JxUB6AHn^t0&HZ#D}O!fT-Y;&FaTX7I;{URQp%XE=cXea7c|x?k_o z;Qc<2*0r$~v&%uzia0yr*Ov~FDWC;dPNV&mcWszNQ^a7kp6_@=IXWrZ#g_2}B#PDL zKr5G*Q}gOxJPC3f(Q^dI`2M$BKgd#9sYe=M8gLai{H}I;Ro#pK4C=vn&=(q%vV4^P zUHd_;gHMu))&XHWKGug;F*CTaVb1Z1)T(Hpf6B0dItgXnpv5W(IQO_eU-q;~4TIk9 zM0qwPlH3>Q%`KhT&G)xk&#*bD6@E7@#}ZxP;FqNR;8&~`or3EvSl3ml#%oln!!E2k z0g75pl#&UN^f|q)ov7`*y~Lk-2(V|q|AM-yH>WZ1 zC#$J)EA8afsAUX2(($;w7M-e(0jp_>1K>yeDz0?DlO>fW5o2%;xtK)ZHOqQ%z@5X} zXT#zo73Jn8MKM!5=Lz;^_s^yeW~C3+6lUvRO_lo4Vs357RD$nl4pF@jT)NEX)k#u<_FW2W!dj|Ijv)_=^p^YnEQ z^^-LkOP8=#XL*Hs^MAA(SqnN_5DhPk4=K5*q_g1f5xq5!V?!AY*Rtaz*R8{JPbxR# zkx5z_i8gLZA8N;5D7u?Q(Mmx8Paop*n5t;!{XE^94kUc;MkSji4Iymq51Ia5R=$b2 zB|2D~xPI=C&#Vp^6Y}%Ik2}^c7I(L2Mr{yC*L2Y?HvZ<9uzjPxj)(b=saFpKnG7aZ z>=*kF9X-`YQ@-1l5}|+7nUcJe{fBqm?~lV>&pYIkIr63UgR{iw7MG^_+*xHN;HOP= z`et!0SWGt6R^Q|5>&%%gp6%&VH&Xf8{{@e^Hh*b`6u$125D*#`-xQu`P+3!bIlAZB z&5<2;f#hu;dj^`Q%4YmU7?uYK%_2lEuWL01wl_8_A6~uEPc<&4SDEI7k@np7$iS~|^F_e3B1+5tO#PLP>+W?e)lAf8_kU(} zoW)>rZpR-u`i+0`Omr@py>sZy@37>*bR#-}&)z1fyb&Bco5(kufcaYzIpnNPfk458 zB4_BagpMPmmtudg{>y((5KnKvz2y8EXvy{ABzf9ek*cWZy^}D=Z6UAjqf`??LW_z2a8UDDIo~wuk!7XKCRD&R^qNt>SR=+;0|MF zGW2prS(Rw$X(kU_vD-_?~mkf#Fdc%D-cOc;xlc; z94f;Zc_zWk)6U}Gt`_54dCl!igFAg&uOK&{Np= zhtx8vY?2=%UF$zA$JvVbv#*yXSrLb#jl<)H9DW8EaMEL=C=5|JGOJ-1sD=5xIU6|j z(UUiO4~J)O5ukLwU+R)==bBA%)-)WpE#E-XOi3AR4d8`LVh&I#!ny;dP(u* zp3O4LLFEP6NFy95Zg=i5E8agmBoM29im=$fv!@BK2DbU|^))olW#|2;_rJYwOk?mj z0OJA4{o(ZoT2C*_-%aMR4}KzKlJ>@!P5W>zMNIZw%~h(J8g#9@6&8vgo2GdkzR4P0 zF0M6bn536R?nf zkhcS%;qm6MCFzMb3HV5bv^bHfi7-9duIk>e{;BbN-OD15*P-qd!QZxy9b?R!>0Ahu z67d;hbKoCJ&Z1I7%?V@FCS>>&YPt4)k_mPi#Z$n7BlpUR z+0ObkLo>$%1_}*Gx#E@Tqg&!I1brV^3ThOML1}DOqBy@i?Fl8ucIO%bC<0&A(rMZ(k^$C9ETR@24AY$GP=qhc;#6w z6o^?UcN?k@Y-xxS7uAbOn+7_H-cNl3R*UlfML1T4v+u}9I`=0QJk3`NMas|FlskC^ ztRH-`&ASr!Ca!*Ybyv^YxLxre6W=yF+U1=PG}td0Zcb8pxQ;N>H#RrNsHz`7sf2W5 z+{AMWvsmy4=0sAzJkHBS*YRRIiZo>Bb*?;dJ*{`(%d7wJzdu#xvf>1fh}T=)9fBJ4 z07h+ox1yEUFPQvH%ipE7 zLyuiJ}Z?1T+g67 zPR!Secs!R?p9C9Xhq)ILGf?=wA2F-rN0+~nP~VIA^g&NR?!Ry0fC zZL_d#_ai^f>_(L?s8J3|Oi&7liqLKLw<9*oJ9IDReyjt25cg1?Xwm84UwyOeF=qkB zs}Ox#r`!B*^NtlHA>2#ielb25%}7|-LrmvGO=T;W$IQrXE41RS37`}7>D(!o?;f}} zl@<&L-g)Cq{CP~|z5hB}$EWrFM(T9gV28h!(z2}aS(@IRNrb?Gn~k+%xBaT7n^wu+ z6$NRUH$EJ0j_UfVq4Rl_zpFK_oxi`HxWFFBnw=(V$3lm(*b3?&Naym8@O-OB`?z0G zoB*SdCSYC5~ zouwykJyyRk4{OYdU01n!@TkbOQ0vIZE#3UZP`$~r4r5^l{vI8cVx+>T1{EiS^<1J( z4VWjS#+1C*6K|N^uq?7b<_ZXc=*lcs4O(8xT(q2s3|DKwR$U7;Z=6InM_)- zd!HgW{QQGo;M@2D*f?NQA0$)930 zraeVyErfUtQmbZKOtQI20^7`bhPy}82}{lN6OG9H2`J&alnQRac!d?}jBw0K<>d@k z7kw$QUU;%X&8l2g(w{Dg!R@mW`B%rok2AixsZguJ|uKHvSnLfgFXkuLWxhlv%Cx>khyLqLH-|D z=K9oDnQ&cD|IylY$9H_Ksj3y&mmu{H{1wBRDC`(W8=v+@w@7snS65|norZ9iZ0|Ul zmBzSC$HRuI7qonJ6A}xcc?!V`yO2VCHvC+m4g6Nw=dd_JU0}ZAYmq zx==MKBBf$&23?nWj8^LQi8K4TP{z>GPX<$U=4xg$ zP!V{X5zjL+>FBal<*%hoixt-+v?CQ&YRhgzJIr1N(=V$&Z#If*0Nyme#0wfTbDSI@ruDyOIXI;#4cIs zS2NHFqw=J)Q2ukc4pWTu*Qd30b;?-bI4AKkZ&U;3 zJgTJ)(W>`Ozt5>ycAJ!D2$@FkS~L^r>8-19dao{mOA5cAIlgE<^3$kEfe9_ycaM0n;zpBc@iCz>cl=2WV1z|3Y}_*%Wi zVvLAyGng`@EeIs-a+(IHUG6f98@gG3gNktq@Iw19oyKmz0~dUXw4_$4b44$POuSjq zK^QIK>wjg{Q?3TRo%h6oOH`}Sh0hfep&5;ZOGaQLu^v>Mz$rETy|pF!S-5bs?EW`2 z0dFvW*ZATxhX0&wcguu5SlFx>i)Hqe*e)y6VKYf?W$-Ufk%|p-YBEg@S6y>U?-A{Y zUYtC{scpU=-v%nR1msxFGtKzkNisLRsiTSp&xC+YC4M*?W7_HxO?>KC2$q3#!%8RM#a+CR#>7~?Z9 zJ43Ui=vl#xJnPMhE9Xg?h&0Wdl}hKYwS};AiO;O~Rd1*9Mp+cBvlg+`Dj`(@D3S5_ zQknnK%}TISBYEbL2Xb?{=Mo)&SWN@4=17W~Tx9~k<*_t2wQ_o!UFUdFGIQ&`Kd7cC z6M_~dK{0RlW=*4^xoQRc0b%+tk^EIuf5H-pxPA}se=qejX0ZCO=&0QRl|NQw1w6k6 z-+WYd{hR&KpvPP|!Ip%Qg@=U&xGqU;?+H@^=EG6`re6{X3<{0qnL|IzJGug>9mXyz zwY}sd=HT3eAxyi~ElL!u8Sc)B#2*1uX9U@O&0%+g1=#CZZM7|cSzdGY#w5CS9_Tda zSXJg>$7Ry+8MVGHqVGotli5t6QMa9WZ_=p+3<2+qkTFeY%UK>Ga7#Y;z>A(@kz$9o zA`IHY9!ibZ(rX>j%g!0_fd!K_zpO}`XO6Y%N=ojI$CT9yy!`m&`JP|tJGO`)ZAYf+ z3|Z%#(>!~sg)IGjbCLnoLOmVdMxDF$=GAl)&9`BcHxPLE9va-pXg^0YKO=?gGKYgT z%-IM#U85xfM<^NhG?I|}_94>z@Cuu1z8&08vd$V5+@FgkoBiqD_OvES!hAY(_Y!x& zZ6ZR&#?@4`;aXiNwg^4AL~2z|G0dD4Q9 zZt*}=s#i_+r8je`&)|Jv^$SW0`kfkc%CI4{P8G_IulQdtW->W_cI^_vd@&P`y@6S^ z_Vn4-OOMOnr;JjM{YjM9JT`#9ZM&}*$I5cFXxFvr=XHE1`d)S?GDq#(86|n2N8{lr zg9DivK)dmptjD@5uD^ZEp(Pu-Pm6G829R(Qv=09Df#_`mp91(bL;Jr)Ly?0?j7*r7 z1;s$-vvX#hl>dZ!sLcQem7Zt+cm{_2TYDGNGz6`56PmT4mQM5U_ac@#!86NBLI&QD zK#NsU8=Wp0-xUA1+z3JZx7Zn8eL!>N`qs9R| z$`)r!7z+!SE$U$FUAHKKF35~RN%oWX&c>PN@?7h~cDjgnJ(c?ZH3Fj_dqz3V#f=&# ztzXG9G_0;&)QBaf+_}k`T@X1Bed7CN8%A$e&<#@FdN1_ydUtQb29e}Vsb#UOB4~f5 z(fow1=8~PsG*q;P3_`j-mK$$#hsn&~H#<0bs}P|q!v#-kS25AEBNx$&8dmGfmgj1< zEpydJTx8| zz2W0ewH^EAnGb|nmMmq{*L0q)6%7100GRZfn?G&$napt0JvZmRe&C{v-@9(H0uI5@ z-iy9X1acgW7=c~oV5w-^9{5a=c=awzne7a&$C!T+-`tTAnx9X^im4o4mRi^_aGUQQ zQ)528pO49N838YcO&Ca@=Cb@Rsw+x44p{)59aJVy5jy$?p(*}0Hw*JXc0N|pl(Q+@ z784+D=vsL&G)lwmj!o665=I08nwtHG;vGd=<|h0P1jf56PjB}REr`|L^ZuJU*(`rh zeo$(K?X3zO`hHvd`YWI%iR*V=U7c14?Y4YPsoV>x`|Xn$&ZZ6ls%rGD<-5nxa8Kd& z+UgU7M+MN6ak{#(DmPnfTs{#k6kz{!e)^qFWl=V|D-ESpa_?6xA~h5`IzFny$?4*ZYt5TlOzLr`tW` z1n-aXxz>32YCiBqaN%IDK66>4$EXZqsBpbd8(vL`8$FMZ zdO8CdB}g=wYLN=e1iE>`1xr8vtb}F#&1Fal)q)yG1)HvZUGLu5NJvYau zd|$vlw`i3R81#LMG^XQ$$GxBfxRv2x>lx*$eop-9Q}?gGYqAOZ-Kor{{zu< zrqNnU!I_VjzzRR|L%{ZXOJ)fkxtgv|!1rAQ%!GE-A9;W$H2Kvrj8d(^a?!e<*tj3- zKH`88BIlRjSq!Xf%HoBCs{=&ZUpS{RI|}2HAkS0(l6|=XJE%yX#_Vj4sR56qLmkXx z%`03dO2Tgik-Y>u+oFrso~8BLU%vb!t4?>diVJb=U3l|;$?+5oK1gh3J~AE(LQ-L6 zLe~(w(^_5MJa|}g+u18sCyAVKE6H)iVDax6=r#3w5`p2*k1aKT8)h7~ha$VWw1_j#0|kYISqr)kAl=;vT*Le( z6x}XZhb&ZPHMrP-P=2SZiDLp2eYd{0dABZ~J6QC^#O@Gs8r~>9t70f*UtUB750;md zgqfF49jEA-p3HRph@LI969Cl?l$DoL&bF(iT&AH%!Iaf&T0zeX#D7d}oUvRor8OAt zca=8F^F*Kk8gw`a$l{h>Uw@}l&s9-X#Sr#@`q_-n-RU7%C(TwTMnUpF+ucSeNs#+C zck}0f1NY(M@yz#k&xk1ad6gu!QqOf~DD<&;6Y+ja{)X{?SnN$%EX#zE#a|_VQ>8F( zT(I{_9x0Q91cI;t&53|}v|S=LDIG=vANFWeGg`3toQz8hga6m0!dL42xtrXn%ZL|v z>tvOpN!J~mwmS3#t|(lt$#2PP(<;3G@1TbXCMA#0L-`iQ0B}@2`~5x8vpiD^n(X{% zm(Fqld$;7<*~Me>|1$+i$-W^tgiocURa2OQK`A~@_W2uDz5#&azG16>xP5k1FCT3( z@;^~zcXVQ;-W2tbC*98Nh%v*KV+?|G@wk{j@1hwX?oYMx;Yf7oyC_d;WQL0MS zBVPT1j!~$U{?Ft=a%j)5SA#LF$bN#{{70YBZTwgFH1@&DkTJ6kuv_2gl!&&-_pK&a z4TZptiM1e6Ts22>+Il@&n>$vIR<4)D^V*@vPFl8`RLyku?u`IWb%W6jwb8S{{!`tf zaoOc>Oo8Pg3#Fj^;%M07ef1WGYKr2XiA#%M2eM4qdRqUjTdyt_$A5%iu%TzM;hh{zsV zg^8l)o{-_%J)7@uyG;|?7`O_rYwhT{Hj>mYz0N~>8ObdZr%N`8O#R1Sm(*D#T1G-iYDe3~LzHskyK4!VzcbT@D zW<+P(dFNd<5kn@&#k>U}wrcVGU5@8g3LUp;(h9pCU;4XWt!$WBe)v5+T9I5FGKq*` zD%Tj<;pjI%-UVkMlUNU(bWdj-2ti~@M%#Nf+Q*X>yXlDMgpU}XCPJ;0x2~H|`2BXZ zq_S^EM84*yVQmW^-}f0@bgnOddgwmv&UPHT&I?yh>rPsvJPJ#jPp*Hi=*2L2Yp%Ju zK|Po+zQ9|o2Kl7kPcvKat7h<}Zsr{7)~?r}UA&F^QT;qg{y@3xZIN@KMfXQ-Lv1aU z{UzUwY~!4}LnO3@O=jl}#oNlY{a?IX!Xo4#MdPM($onNy>cK}(hQcOPnavP46^V&)2y}k%s;9Sej z9Y)WVrkj5B%Pq5)e+}JAJtO3@E3W$Cdw8h<@vvx5COC_;of(b=MLzQ@}zmUEQ)BV?1;a=eNhyO9fv3!*@S zwFnZi2r>G}#~!je_ec}6Ym-YDZ`rV!r*ogEeLu!--c%%;>T}{WO{KS;B#K?y(}gg; z24T~IsH3RIdR6UoeBV0`pS#VvpQ#^pr3zd9mt19>_K;-VUG@sSlvvl689p7Nv>I_2sORW+8V6P!4IDm`uLf0Io)oCT`AA z0*@1hw=|Gbu)RIAq@<*vQbP)r0A7UC4>tULm;d+O@zV44U&L;o zq3I9$9v7m>JLJ^#*G(yT@HaHVj(VE?Mi(JYb@Lk==)JcV4h2_R1$e(7!2CeVG8~M{ z_k!sg5$^tXd=|g)0C{F+=?h_JNSy)L@Zfe|FszKL=eAHMw&=RUsg^fdgJD} z!98HLxvh_n*zqRQf}7rNyGU(CF_Tk`exRzn|$1&u}V2ZPD?JB!z^Q_GyH|JIjaU(Ux< zT11A~+1M&KHUgCe8`v_!6AZIl9hPWsS}*hte^2N5Yq)$%#)2K-sAWMjS%$M5eOrGM z&rx%I0k?2FZnWm~TONzvx$QiL)J%aq($&R9*_kJBeRw9FI^V5rGkmVZdE=;K1%g?P znrAjPRH)3^rPBGGKIrJ^kT~zWizdc$iT0Q76T=?=Wh*a^aVzbQ6uf7Y>3;PJSb(hUNTJiWireQ(&pWL}>t@*> z+QRV?d<1=BJY#HPlwf0K&gj{(Dj^RXR3ir73tzDv)Sd|I>6BHX$CsKE^Blfhdg9Nv z_S!m(K6_b3TpttjIq$ji!#YnAmb$J{BHfJG)o}A|-3f$Z3Ho0r(kjDz7WLsl!|&cr zDCM;H3x96Z?dKi7d+cl7*WdErM|uADgfRQVaUVBY+IjDHoX^f~-NfmU74q+r!&CL>H>9|F**x4;Y$46&3BrbrY;$B(KX=S0tNw~1+gW|1*qL8g?{poYBMNM)n@2k|zSbsTwA*0xU!x2s z>9?!t`WtNHf$9BSasGv0eK-FPv=Gw0IynrDX7lGO;XDymuOl5MW@f>Icxf-FcXp7P zR?3*sHY1@VO|SryM^*Ct&R4gs#tR-=PisEjw3wUFJ4zwf)ZBk`+w5UxW;Uq3#Q65@ z8;2?`qm^2q4)VFm&zJ1#GZy_v{FIcGpw{~NnGAvJ-!;B-}eN-{H_->dz>EDnx9X`onP!eR0qJkFAq4?qy4Wr@n zJR11@;0i$NfGTq!NCVseo5@7{Gr>U`*H^D}V+w4ob|o#yqCX*kSPHl(6>BD^r6nm9 zbD+a9(q@*JXVRUxWi~hS@j0vw=1cyZ;lWTQ@=6VQ=c+TN0$N^EHR$A*W^mqk#dAPT zY(Dcll4vSD-<=&}m)6(UqX+r;kkMy5ce20Dk?X|X3SOMp5DK|5NFj$|5X%`EWyxoY zz~0^ZS!X-5z}y_Ox{Zy8h!m72%PlQf9_6wcU9V#`H8;=A%0q!xTlaKwe5ma_mj)N zH=|~Il=xD`BsvWMAkTF>;3Z~M1z6vxAAocg;>`DF>=oV3MV zHD3~8t(wDio&WO4NE!8DKc(~O@|v3#;(>GFAD_3gxVTtnJ4+SE^R&Iozio=%D~WWT zvc3Pq+VUy1cAQ%mQ`c8{rYkrvgr>!2j^j<{v?R|Kw^}oPioxW7TMx^6%3%ExV3tXD z(E|x+Mdom4y6C*YjERXsC*ooFMRcgP`&dmR_eIp!-oB{5KCxV@wEp{{Qg1H4-*Jv- zr*DZ$#@=Vftlb=*9~{B-4M!2rxlj21!{_RG0WRkPb>e^4SxtdlpT9}W|C}#-&sELM zBsU!Uu|CYXlbo)aI|ayWQJ&9?XFOLd;~0vocoYY^)#Kdk^T=W(8ZB7@J5OlXI(>9zi-5D?%B}m)N>d%3ZPG)G zDN1!7V8j1BG{==Vp#-?46mfU9j2k1@b!IXYf`Xe4x#fldbv%!Q4O3(?E8D!6ni zJ4x#8j@fMklq=>6bV<;Y$gH=11_lNXWf1#5^OQx3-Ja*k!>0S;Cz?Chw*r@A(o_;5 z8w!QdKkJzyzNJ#1TO2IZ!cBZ9P> zn5VmWHK?>!AB4+{I;wdv$wUP5d0IVKj9MIvtEyt45M1l`^c|noa4O$r)!%0JvKO>EuaLOiYKKtRo`WZ8V`@3^CQq41V zX;%k|;5|D;bfBt{=8EX^xh32xMlM_v=o(5! z@!uno@MEZ0Pq-~7-QRR@kSL8Jb&LNVC08&Mm^y7`+{t%Shn6$U-6keQ>`iI2b0foTQELQc7 zD3g2lo>$V_+oQPov5GpCD*lc7gtcg-%P|n0BY6Pr*+iUyQ~X&7)Yf@wP;Oz{+Qz9*rh7DSCVO~9tumR= z*N&^H>8r?kyje>i4i=8Xr=L20cxH~<@S<%Z_*k@i^h{z!y)QEB{?8hK#w+6FRC-nR zQr33&0@JwZ!Jf|kMdyhW&<;9op{=U)6ctdagd7T;vXQE6qwP-+KM}o>m6+59{z&e+ zdhz@quzMrD^1M!i(PL~wEE(2GY>HvTwQ#X@G?{gi=;_(Z`E7wgw^F|^n!S5upG(Zo(#lX{`Afaoh#@kD68_WL6@|ZOIYu23d_E&^J@*_<6 z&5WP-_Z}>zpv~*oou3~+bN2I{#}0kX=$>3YZsQz+B2HtqaoZeoi#F4tzxX#hyGR)- zC=Q7||D#qf#*s2RY^>V|kUL`eH?na(SL(3wT4Sx-W3Ikh6~$8Y-is7@4i_W-N}Ebs z-sURuUyjg`alfc4Kfp|=BE3Y+P&6UVFw(sF(Y1oPA!c&Gnlspn+CQg^<>0dZr`w?i z6W4<)%fQo*?VojxQ50%|*Vgn7*%OVDbIIu?wWCQ0VbH%+z|K!#(GDcjsB)+Tk)5mv zQ0u}<6-CHV|iKXc)ky{t5NS{?QG9vEseK>;Zag1J0 zva+&2zPRIsna}hD22Q7r@u-Giv6yzI6LQDiow~ethAJ=;3OG|}D&bEUrMHmP{j-FH1@+l-jZM3256satU}P{7w<|%L1)mx}x(=$$vmGDy{=7$HY7|p+o6O`@ z$#Zd2Lu&oD$Yebska?ad&~|Y0y4tgIP07tLo0$C1h06oaIq(fNj>jFJ4d@eip|@(! z_XDevTWt5R8FC0()7TLAMQBP}upH6)n17#WsMcl8aD3YxM^_jGXHAaU>%C0chgg`S zRZXY_rgay)*8cp2K3x?~_I19}Ao)!U^)CoE?3mxa$k(wu zhTQlX0JGtGRdwagwQRZ8G4k+h|0!@m#3eB(-np@Bx zm2y8hL(|}z8E2pNUvRr=KxA%#8Pm4nlq7Pm(T?Lh8-J+d`8RyFM!PcIJkxrsc!(tx z=0G2y&SzU)fFi3pvtG63?Y~)4Cbe_>UYk7sqXasBm>Crzi2um39zm^Xm!BGuV^tuEA7BT;r=4@S%d&Gu8&e&E)N{U>(N7CTmW>thQyl z@;kxm(8aLX34=aibuAyBIfu?cVy(fUel)2{$|^#0EhO1IZ@vJVhOU2Xi;Z$XY@c(6 z8e2(;BF8uwh9#qRG_ekQeB;Pln*fK0G(SXPkP5#A?D4v5^@pc=>>x4XYrImigrR}j za6MtmN!>sDmkKEF5FvXo{U<}!7fv29a!V+0qm7R;UrIh1j4*9OC~Rn{K8Q3CTvSw7 zm+<`TQ=%@88g#PB?f-Vp;+2`ROgB2K?sG!s3n#9YL>0-J&{Sp z57!Z;1Uw{yy)EA3{@x1J_;)Yd)8v(aba?6YFm@wX?HsP%l>Orc!VsMfyXa^ZOt~U{ z)|4Fy`#XMh@WCj3KQP*GnfKr5IV3x8-Lt~%?j*ue>F8XeR6qM}^<0?%@Whx7B@@#| zV_7Fi49i;9^c}@|zZh!+k%~u<13Xb-$cuBWT&`JDHx^XhChfj!55h{<&FIX8iYYi| z8P$D7n4Fwc$>0jbV-EHZ`}xh6It0(pDI2-DN$jHI#@i5oqG0+KVZ&E2o69$kL@$8V zfVqB5WQdQ&MJ?MPQA`}VMH zGZck~4$UUyQ^tzQ0kLWE6Zm|(|9o-JXv-o32KQ76iOZ76M&e%)ju*JRB__NHcrLmW z(ro%C7FtF$uB3JQkI}7-jEqFT@81h1D8Q@EcXE*mFL~gab>!E5U(eK{tJ6mx;P@=; z!IBs7%*d=;Y4&)ztDkzf+TVWlqNs0u-#@m#XvwU)S}=K$yQ)&~4%aNwDy|TnE}d!p zaW#7TiV^C*`{~?B&a#VeDvymHiOH2`9|wj$q_xV9a~r?`R?ER@mhU5$!&9vNE%l85 zV5q03oV{P^Mq+*6F9}&zy@!BrQN_72N%$9DRb?4!!b*u%JcO9uN?EY;V_3BFiA5yq zrC;r{zq-s&zeNmvaOK5EoZG7;%5Hs+2 z&SYrR#2-6u7+VUyq`jWg|L-hIIz*(Ysc9%Cv$*K@?;xn^G}bepk42{8rdQ;KR45lp zT(-2ltYu_$HoC_~L`)1tO|#fptK}5>ERi>#dz@-APLz;?(`oVBgc7w1F-)LPV?kz{ zs`y?99>LEa&$r)9x37r$`J24-t$1rD91HIE+R?pF6X$p$u+wg>rI|*D?iwCnkHE&9 z58t{MAB?iM9*A$VO#052`8oFzw~$e&+0RwMv_Ihv7|}QRJZes4L^nFa)|A7pL7?HM z05C%l;OgZtlWcWyO1$Eu-SXK|Rbg9O29z2hl$1yJrILsjc+Nhy7%cc%e2CjbMN%Qh z<}jYZ^tb-f-0f%*8cubx3$Y(| z1%tu=ZK7Tx=h*3tS|zn+?>8jkZzEq4s4RT(>eohkcw_A7DXK{NArsu}oK|C>pyCZN zzaveG5>(C+eF@7ZFbVq=E5#PJn$!Bw(%kH`>~8WPl(w{_yLZ)EC~>elrfXf!Kjko9 zugfj@cjxJJ^?o=%zR$HM^I1gr;dyG4$s2FI#B$uqRj_=z#US-Hp7kX8xWjc+b<&_9 zc+ngQfXwVPRVg6!(mwl|5Aj_6x=NmJGyERfV=Ny2!Um}< zoa{wvfV$XztSB-KdKpm$H&2Q_<=04mt?g5t--UN2^!d*RNZ!7EZr|i>M2h298@b$) z*>3C!u|JW5_u(E|N?&rl&%xP#B!Ls!?@zaXwvhY|MiOX}6!{!C{#9w`bY9eU7W_~q zaW}Dn=HiVlE%P%o68`?8P}klc%m}{*x!x;r1VTJ|-wXX5ltY@i2@AxiX|K3q_8lkg z+8$nO!dzz#<|fGWKUnEvK~zFkND#qJEEyJ0!L-53kgUvLkSBD5<{Nd7_y^^p-w~(I z?^#wG$j;rDlckpLdZnPS>#JP{twesgW-gxS6c^KBGm1$-;ImD|`F2sSIDd>QepGln z@0aei_2;l10^W|6Y1(Py_SBe`y*xWCp;!`UmWqb?nv#AUSXOA^KK#dg%k+5~E-Lo+oG z#@zPtFz0*s!nS${x4kR+w27v!=jxX@5pa~x%G#EzLv2$NuXLsdZ05TQ{vyEl2Vw~> z^I5~ZT!X1tY(}O={omMPsEo4J<@^89^%YQYHBFmHNU-3p88kS--CaX)XOaK`g8K{} z90CM~%wQq71rP2T+}&LUcZQw3-}~*qyXWjV9JoN=?!LFXo~o{Ts^&vFQ)lSh$G!6r zNf>w2*bhZsi#8<9KnihCb+djt?~vEx8*TA3qOS^#P`E*wX`O#lZZgcjG=99(-Vd$r0@($z|nN%`4P1UPi&_H~V zd7g(zu8Y#@O^p@l1{myy%TaGJ=z`^sB;AF$9K7;6Pafs^j)a&rAWF*05zHGs?|-!o zPEhw+_0sz5aLRJ7-sez`5u2d6fSFC-tA3LDpO8?x7Nm(klfM&FTjzE}?3Z z2QR!56R{D-ZO-_1#{tywm52qcY*9L!d<3N~e6XzJRn`{pe*a)2$`SK<+->}itT(8g z5}R5iF)|W!e6Kp63MzCy8U#dqf4j}$g*w4UF5x4DAOTq1UmXdLG;9_&G&C&i#in35 zwEE%gWatz7$lfW2Ps*Q&j(#)9Kq5W}HFZs`QhwUsMXXVbI0#cU+5S(O%t5#ic_@B` zFR={5mKD0%?PvFaquyP^R)7=@vKiGXVA0f2LjmuG)vmDHvAE`X*m2VGt&_JBa0ZWg zL}(FS4!p!1=}}gos$o>Mx`MfXOnd$W9+9+9dQHLj&Pb-D8j(50GB*A$_Vv?e`_LVfR;9;&AtB1`y+pgd>#XW7wli6(R9k9>t@V44O_&{vrigP`}8IsSd*&N zI-=Lb_$PQ=hPSk(uxf5maZ-1Kt+&zRZkGo)mYU1Xgn8Ko&ZL+vf+cF7{5H-De~4Wf zpz>PNkcYpYm%cxn-FT^%=~qu!M(ngt9^SztyTQ(&Q@!L)T6iGZ7q#KV*(w@jp*OGg z1$QAOILy*eTGwRo#ZIbWg%AgxF>0CY8~uJxK#SWX4~F3xty@iy@?W{ zVP|W*KKmnoyEa8^$k+cdG zn-1FS=;a-DJg-66v8$={%mC^S$1f=bysEGp$`*#BONHh%@D>Hu(|PK9wvTN^Y?Nb! zUCcAUr?Q%+F2rRO_KhwSyb`W4?5Hl+hk5t;AMcd1;ES<^jbJ)|A!qVe1(MerZSQl+ zzU7OR3akQzQvaA-20q-+-Nw3NkIGLwZ>N2BeMNp{w7sCH9V*8ur*}Gtqsl;g%26PM zaD&wfcs6-XO-Tw1RcjN9cZFRGH+}QWDDE$8Z7beI*F661i^Da{?e!-$8*PH6L5`mY ziN@E>&!T#o&=}v1PgrkC=LWQb42?dSHr3uR_D@KYeGry}ot~sDPW}%dX2FOcr6qIH)(dQ*DID9?sY#d*`Y8To0&Ds0=X%pxz!6)6=5V2t= zLVeW-Y{v4#N4&um)A_6Yk;m|c#%nFwR^lS%}XCxhI zdgzqWae=tMa3lmj?~i*7OI63E@S51|=7%6w2rT39iX@p)H9dPr(cVbD{-ciCk)^^@ zcXapkaz*7ySjPfSPpM~`pw*zH$e;N!@X=)^sZw3vcTFxXYBj8qW_VQ`4=eY6rN}bK zaG`jTkl<)*6Ra4f zJ|+EW%ve104rHu;Wv`gT)09w&S=YveJx9#=CDN{!81QAtu;b2^#2fbMRenzA>+|IB z6B13!yK|pN)l|VCA8+)_;rLSYEoZ64)4`Q7{z$X3Mtb`3Y{JANsjd!w@s9;g6s|vS_?;q8 z^WH$}cR%&yrap2dv^2zqJEyIx@=JEo>$s(ibQB^q;$Ja3Q6^Ir1p|ApPjgZO%||2N zhlRYIeF%0!<1%(W=mXK~9}z;|>O>X7I_TThb(Nk(wLU{+Hiyr_F!gMa-Rae4-lK|y zc8`nt-S;Avz{?-!ToH%251vJfjkC<8pb`1Nu!i?!P}6B-LkGdPu?;#`Aq;|ZAx@Z7 zI}6(kCrUIm%=w4s%$lLT35c}p3cs2Y(hA;k_p-sjMOeV@tL(t4;m;jyw9z5cOa_mb z)ee}f8hPYyQrmUT^A&67LGJV93B)Y2$0K7TojedOjF!S;x)!Uscfvei6}4csH$;BK zkxSntQBmiq}OvLS@ zv(3h$btRX{by1i>dp_NrDE$WNboD~vN~d)+EqgRWY8zxrw(?8fNfDj^%2VZ3lM6C2 z5A}QgC}_ES>Es%MLgV#0Q~ADfB-huldB5|4o^-4`+GC@UbReQK1B+t;2kP0+ z`LZJtAP*(Ci=^v3+9%cB)cq;4;C+0U0wRqgNweOB43;&DTfg zHesv`+a&7I!!7oVnBoj}*wPR%@Cp-~S#zcYT& zpHJy2VhVFPFO*;vI(vt}3XpC*#0gXP9-<9%Vlk@gJ{68Qf_vT-ABBr@5A`|W5>1tTqAZESg zdS&jsD}MBV3Q8Y`Brg{Itg>CG=UG@V__R9*!kUe@@K%HIlz#?i)sB+E1SiJ%u&d{- z2CI}(#a4aU%N9=ZzL&&Vhjvt~l|I_YY|qaLI|mS_6{?kdoBKdh7S)9FVsft zJgr8qe;7fb%W20M8Gb(ZGvZ500;=COw%zrqUzk$5YsC5Iu@D%RJgnWezIc2Y^?_s$ zKk2zLED28r9WXaW>#21ChewJgZuwj{+>V?!C_)LhWB0+w7`f}Dc+_--0H6o1?1 zVkvblMKWHorkDYiq3?M#KMOX1Agx}vwq~%%qwfiwp|&5F zAj$y97p2_jQUB8uQyK>IZ+H3Yq-;7I`EW`=F4?8@qTSXs@v(FHBx4C7hO&mFMHlDC z9{&4=ccYE?oPgY$m;Pq%vh$#@OA>&1@ERsFiI0rZZ#iwleTHdh@C8j0A8}&cjI~Ks zc`4~`YWpmw5MZXM(7!D2EY;rFpP*4?vkWdpZ*Am zi2Gb9M_kXnmP2oA@CgH87#S{hkXuj9-c#f*Nv`Wv ztBz}85N6%XQoU7XvN@2L3XtpBrJdpaPVj(W>1J>8JN&?qnIOKx1jqcOQtWo=$Ia9v zzK`|BlX`Qr^fxRzHVm1_sKo|4r}756X=V9xRkw{^k#BfkdCpqQk$dw4mKFjwCU#Sv z6Nci+fU<);!CgeM!5`JM*)1i6oBGg_lQ00T6%B*gi=@9el?j*;kKYyc{ej@`4tOi{ z&qnwd^~P;&&}FUrYV*Xne6gG8?;@kyoP?B;qW0zoEiDQ;`**AhilhM~ z9I9X3w@lo|RotR%7MN`W0dXkF+^>EH;}N5?SYSq+>%X+PJd#rqb4 zXX+NGO_;W_#DAvI*lnbY2xQ2(#Zd+-1LhjqiotdU%|3XFvEOZ_t(5u`)%(iy&AR$_ z)1rBSG_QPygGU+zt|g4C-tr;?F$|KCi*f#>Ki^N5TS~0hul>ZsfkeQ4cNoHnOIzh5 z!Cynbq4D?0_mr*F*NoEDROeAJ0;(Bo-BFW2m7zP3N&N(>i3n)x-=!^xX#5x)UMCy` zJf@a4Uy6ZGCDIhr>M&ShoOmqK11#G!CKwoU<8B5UTjn7f4DuU}+5|(BlRumv4M~y< z`}MgS4%yYzTRQT8rkPo`#yTv^lAjyRty3|#z+F4b)Z=3f>fG{8nAJTco|bK5&y?;p z#5GwM*pa1FlrYGMQOz4RaFE(omLG{1y*8}S$qKS`U#IEebSNi{{+T@;kNOH~uv$){t7fdi9O`T6Z$a*Ea<1L*r__ z2*y95GjGyE+$i9Bqpibml-crt|ESD2WE{7S%9Qzenv()1R-QpG3Q~)4gL}Htamgt8CO7 zI+dh+V9ODeP#w0-zyLoRE^j!l^8xW5-=+KdtSr@fRWgi*?UHWaO)ynD&=XB1L~I;u zIxRgfRzgv(%YG>`-MN7*y3sTJVKtJ_BDOEwL)$(-hce;V>@2{A1O_Bj)W_##Pn)IO9EkcM?Y6N!*jOT@5%p3c2K2tyy{Ef#gWx2Rq>*3uPZgPue)9X zj_P2+#f*C_CM+Aa6g$Y-YEnF`Y7C3p6|P&}sJ5Za|2lXlj0v#7z#1=*3eT%i4#&)m z)1DN#l$rEacwGJsiZw^Oc8Fm!8p8C4=D!zyDm^UiHy7Gjc zt&VS`O6^v_o&rB!zU2da-{g*|P_%P@myZH~Ls~-9R@SVm1Z+DC2Vh{RUbQ2=4GbPL zAUj{2us3u&Yic<*grEZ$qOlxjhviZ`9}bsQQ_&enYsLNXQp%`%)7V1an_l;6F1NuT zt#KVJxWi%xCTf~T?;*U$mvO&S9G|v7IBtDO`{Hv3Gk;I_XYK0s0r+|$e7Xb@TdH}~ zzWH63N)(_~x1Y-YlI)!nUx{X@b;h-nKbq<`?%J1>Oq5C7UP2AtUcYV=C4^1$qv8l) z_{M(?g*{y|*p5?_W9(9KvVp}wh+5PGQmFB7i#ZJDtas#Xf%GIyE6=R#NUW?w8ryy{ zA_3$#8Uq_xfd3nBC#~eg*4!R$F!DqY;2zUa8}@N%^LyL6H}PaBYicQ$!Pn;9TtNC zMaVKCqAZcbYL*OUOH9VW(9jBnt#3NDVt4W7y2y_vN?Ek_jDT3tgj;;=b*- zW@L{FLGl~eovZI%gX1!Y)Xh{AT{BjOgmLbc4rsPBH)2_%fA^hk^lFvrA^2Uqto^}o ziTe*(D9Fg2wg!-Aub@Y|?5K|@1#JOZTI@bH^-tY(2;UvDlJY6SF!I*g62FR~nSwPO z7r{i<%k=SOq*VHALq3KkUUei_(jD3FQkm)?NB2-MlLhcGuwz^RL}1+n8ZnP;#dMAS!i847H9Ya6mHrbi2+JjfHB$nO;OP%b;Trs}}(qUjyXP zm18|)CWggHYLBp&yRRV=_m?|D-I0M+9eIgEFoe#fdvJ{!cvX)M=sy{D7I6*1w{S;KapziW|(Ke@!`Z>5Qj!N#-!RNpAN!0m7`pWSPPExIl-Aa zTC@f(sJ4^j*Rb7J(H3EKgs1LwWsAx5nY@ariNG5dZjyDkF5m5(V?$xrD923IE7?LP z&^T*(^xyz)k!t!0wj}*EcjLr%;l}PSFRf0#iu^Sch^U?h)>0t+qj)+2pGv6As-k_C zi_W9+b8pIjBDzI1@gBWQ>cjvr;7Z(HbG^Yw2c#toGPSDd$tVfluI*GU*?w%#(N)ut z3FmOBoZn38_~)kP;r&xgk0WuMA0q*4VDjN#5>u9$&F$53Lf3A_BwsnG{%dcn9mF+S9?FLPBVkWZkJGp^^CeP4yLs+)HeB`VsF#F&u#!XT zU0Wr4(^0H{jAE(Xc+^W=H7s~P;A*f(J|NN%Fkr6clStInj$sh>@cUxDg6(K7^-Uy9aFA8T7vCCZW|(#dP}hA&9#v`EL<7RWO-`I~k(;3rCQ$~TNpdpy!Xbr36k6<+&F%ia$ruSX_2_ive)?7MM-VL`R z>{OUknE825B7P_fPq&%Q{puqM=1!|z0bBktFdvWv4QLmz=yN`#a#^xZ9b9-@V21(N z6$;t(9&5iEZoBgE_ z*dW;u*K|b@n!JKLSXp5`LSw0^oAkyV^qZ=Io_}!>TKijBCuLb%%O-|qR0KkZFlT{&V((+? z6RSHBPmO3qydJ`j*KK4GPC!;{|pb$ocZn@Xol#)*3gn|E@zbLI_&_fbpk37p|YmDp-N0gPo>iOqzC(54Q z-ZzfRO(u>3Y_6nX8e&lz;xN9o8-23p_18Lr&YohgLOwb<#YISM$2g$`3<@57b_M?x z*7XQxr>!LY_m}%qMDmP;l4dyqQ|ueA*p0n(5n|i^GFc`OqGgRSnGIWSukQ-Z4SIG8 zoaX(mMgDK;dmK$UT}L&4UIu1O@}h$>M=f(-A*D1xOQFd!azD@*MRoz zI+tL1hZqa|db@d39BQWP9MeDx1yA{YVN!nR42}O$l1KD=j(=NP?{$* zAVc_gI8&=Gi~SAzPB%kR_g=fP#&aZ-@d`d+AzAkZ!a&`Z=`-SGhPv*Y%%S@ zPs00R`5KYZx~a?Hnf^Kv=N+*|mk3tauK{Q-X|eOcDW4^e#&2Eq7o&x;BBpiU;?eV; zD))#Vc89A@pd2foI0NQxK0obwh&4R1nt=A|J?MXK(Ci4=(s}0xE6xSS52z>A0&`Tq zP;vg33!tRGxi4{D&xMuSZ>L-y!5f|b-O70oc@MkBXowh%NE^Wycc)IzrOLN=T%RU% zKA=lJM_}dlNM`JWpjeFkLhagW`xkpu{}eNk7*($3#KOfd70mMJ{lC}1O?qs(;_g}%zKkT=DwvhRr5On+ZvDmwH|vBYc^M)6l5aB9HZ?sTVVem?xaP~7Uv?I88*~pVdB;4F^v<9mm+z8 zWNxwXqU;3{Rl1L`b}K2n5iw_pj9IKcMi#fT+*)Exd%HAJo9s#>EqGZdCW%ddebIHK zJM8ILoe2S=Bgf5MkA9mclw`ZKm6lpR$B8tOBy_M*x$oW<@`Y&s9A|~Z(4-;!IQgqr zj&LONSU zrZywO-cs6gS19UVtMi3dA*=$K@Z@IyV50id51DN@H$s1c~qX3Cl7V;SICaT4XtUrl)9MrMzfT2!98x46ZqK@Te6W(_K3ABnRE=#60+ zfGpsTlF-rP^*vIS<Cgx28IfW z$O9U^vY_C%2D3KhGZFL=nl|hj{tsca?UL|v4ujjW*gE*hL4E*Q%Gw+=9P=+~);2j= z8#7_OgR$0C*v+=Ns#a3CL-)jyH5HLx{4xiCL9&VZh<(sJx%1e&+qq1eA}XP3 z3lm8U{>8t2z|#aBsbJ<{SJu@oq5>$Al$PM8Pe$DQ7RNu5q*eLg?9w%{A$dbuBK9O^;X#6g$XQy&*8sXgQh|{yDz9xj zCxW-VWVSQ#4lXX`GBu1K@5(pa7Iq|~l6D}df2Nl-o6Q{YH5v#z!N0OO&&6-m2jstI zmJz?+_j5buw~f(BzX>yhKKLn86UwY(Q8)@m+LcDSHak#vxRhzyOglH6`omd}EG#?6 zH&@Y_cc#R9*EchFp;jd+AG($Z5lE;z`piGc+*@)mtG>A70{6w;h$ew2PQN>?^ zVV>(?@bbjBWfT@YSSe}85Iy$x%KJlI#kEQAK#FJAMf8T#r8sjiUBQ=4wJ(LCJT}@Et?3HI!LSjtMz;QQ29VES-RMoZfZrun1C_bdBYLf-2+G+dSj z$o-UDoE>X>vym~v$H)K{xz#h>?_Wdcvd;af;?vr?=F+1ogxq+RH{{W6n!~ru;T*|R zEW@{~zczi8oaPy;UY&3~k(8S$^Y>yP(SWNjy&mrkmGNXcym!IZp6)T)qbJ|}cR3Gz zl4x`Jq3&`CwlNd)HFjy?3~$m#oJAzi4&fM1KCIC0y*0&v!Ez+dC)3sVYb4zX4|;?F zRUN!*Q25DR#oC50cb9=g1J@C4+8i1C8nv^tEeD9iQ~~$Bazq@Br+bz~FG!|tdc`vl zz%9%QDQkJ|b)&T~pu-=?8qiDg!r?*t9_If<$b<+^h`nr>Y1S+LO$$Bf9A*x_ASqlf zYP^zd`?B)9Y}tZ#<+7#+m&s{x`;gv_EVPkAn1u%FB>^2kwdpuDJBUtGWl8hLl9_x< z(T$665luQyncf3e150bCFurO|J+u1rBaP3@P%xB16uQAli=X8 z--FwkkunJIIPmcj=*LK;u3+IyG-ImIw`ca9>2vbYnYQxz&2e*iWU&Btqbr0eY9bl~ ziFaN_{7)smTUpt-XUmJnqw0BBk_!8PE#all`esChHBpjvd^i)#T|=IXIRki2vS~f( zxvefEGQ$#~Ex2iUv?oVhR%G5WZ#u5>K5C-bQ~%d#I#8b-ImSZfLwy;=V0!lV_6=5F zT{7nl=?<`o)?SgyN`n~hX=@d1xY*$xaO2lym6&9ad_zS=RvX+XA!e-B;v zQO)V?v-}8ihFdmi8Kv70eZ3ug%zTT}YQ(?}rM1nv`W&m9PD??AJ3?jtmV{XHF|9>) zxsk4ukGqS-Ww+u8^9tl|xT7i)-a>XZ@)W_A?zU~=@dGk35BK!_Bw(+R5 ze2O(L1Kbund2IDI=H)aYT^yf)Bflm_IA0$F9b2C1vMX=%$wi3Eg!?UJ)T$MQ-nt)z zW}Ulr9_xX(%ENS_0!tn#9V~^P?hds+H+g6kTLjT(9MBFFrtg$_HdrHvZ z*!0FF%=(N#W`HrL>1ERl9r5IDv7hIn`(w5jT`nY-Km%72rNp0h@m5_EKI_p4LM2Sb zdk0sL7(>cckqY6R&JOGQ}M=)zc!VjXBk+C#4R&S4Xn-h6#z|b*`=LkW+*bt zd4M}~Py^puZMMa{CGhaQX$_??%X46-l87GT5;ww0mhDv8JrNf8qBh5VFp0dIsWtaz zU9ra5emu1GQxM>grV597h{l7+=r)pZXTyFG8nG_j8iF{T%$$bhuo!x)Zk?Z3=un8#b8Ng=euaukT?f{^sV@Hhvg4@l{bTgqumB5xgBcL0W*oDt!Gx&b~ zQKG7(vvXh2zq#j*`NNtUY^nB>OPz@`8X-leyKd}bQ+s^Rt}?q^ArAkKM7IfR{3KD3UkMvFmbTK} z{ZXdM%PgaqIOe0NBtT779wKPhj<3s%HuXZjT#+Sl{hO`J%}^#qPp5Hl;P;23(0wIg z5F@)%yUltzQF9XCL^R$sVF}i2NKW@e9#E{lX8uagv?e&A^T#rs>NuFCia2{$4^P)o znRut*e(d*5f$%$(?T}wnIoeAo)3YlP@8^UParo?&vH~~)&49@vBkhqIWuX!GFzCYz)`&sXX zgd*JuY>}j7AhfpPF8$*xh{OGVgm=N%{mNOlv6p6xt}J9Hmlr6;I@HP9#aWM6gC~i5K^b%wR)qEO_*M*GWWO5JCx^L!pZvQDU8<4U*K)q$&mR}gZF$?&4pB0|(H#jPM# zHu!X~*p`xz+LKyxB9vMXqLJ*pRAB&flM=H3uhtzgT8re+zj-?lsKS2P;mW2B{~+9t zJB4Qw7Z-`>eob&m2=DQ1e+h*p2H{b$>6~shn+l}g0!$gZUoY!->r#dusr#C?Kl_u4 z#7)>Z=HiiYZS}gAy)iox`&dvCe1c-CvkX)u|Mm&3SB zhj-7=i#N;vSZNY&$?9p;TnR&Cs?pmMyQUMX$`#k&t~v|P&#F7jDUnfL8Hl398I!gC zv0VS%wfJg1x(eSxYd$k;XkM4{cLEi=hTtM!^othbZnY^AHD0TUbsc`>R7I?@wihhc zR+x`&Y_>+;Y^^1j%?@Zq3BB>*JXa?o%!wTcR3I)W(}L3S0mTj*C8^@oU-aG<43z9s zC5>X9sa}J0^NZ1wEnBJy*gW|qSi<)IM_KF6pzv!KpvbKgGv%cmPY8$Z9#?mN}LOxF3=EdpJM zV}JvjTgA>_NAx)A=KL)14AIa@8!wfOH*gU#9kw~rP}r~Acer2IGN}V0y0<51na%${!H-cZFkPV2a$geU~`MV=+IKQmnF)@JlBQ} z4lCw0L)K4bf0Xtftc=M0bIy*%%;$qa#UIcS2DH;k0r;%9c43M#wc;N>1dU^w zKM!kC;Gx)OwJN30&LFR1j`Yxbd-G7rgsz#^75LG<-OVThN$|$0S(A{dgx>!pZPZ!; zJ@nd$0uT{LGdY<%-sbkcp`oBwW9`sfLUHLd97- zzRW;uRSE(dOw?L1*faE{?F)kD8Uh$!Dyhn#qvk0}8Io`tlX|&3zAR3`UEg)q=I9%j z+nvXqn`X3D4r*+fzVXq8-HDMFY_6w3^9gO13wP3|Y)|Fq5+V_4&Pm233k5fIAJ?YY zgWY21(nHcQ&{f+iu?^fUrup91G3@6B>(siGw+7V0 z1a2)qB>IAi1j^LYr{%#4!0S|ZA)Bj;56j15h6YJN0(XpaiTc#n^*g(Xbqq822WbWB z9lF$I+;w9631-EfR_cLs4N^lq7Dfc_#lQ5k7`2K~nfIUn<(hCKp%%22mB$WECi&(0 z6*~;h6wlTJ$qGQzn7DH;jCP2?LyOJ6d2%Z$>ssaFi*t{iQ=I-nc6l>TQ|C<+!p*vY zA%FGp3UFZ)s7@+!US4Vk(j=$-_V(q1Y*qB7ws&v>^2D=e79%zUIp1cTc7&9b$hco= zIhQK)@?W|tSvogdx3HGYbANW+Kfq+N=y?`^$hg7P5)XZql#y#KvwkU;15$AYscOLs zK(;_dg#O63N0(^FxC7)wA2}HAsWW(C#x1e&n2Kxxg^lfYw4l2cwKJY zQ_Sr;ZeqzzROOHXUvBx1j!l|a!2Q+0y6(KsD+I+wNp(HS{1!7h68Xpb)fru|Onq>d z__Ysl<>^SxlYuaLJ{aa;kp4%noo@qYMmH&~SJG$A^V*sOx)xLKmvGVCmbH_kVmHN$ z4VI7xIY?iZB-D*#Pknnh!Hlb?V^DM2I(o6AS`&%6L&z8(j~;7Q4fi_u!3~^Nz0_NZ z=jK?w;#xsQx*4bT%rZ(Lqr$7eUd;d>D$fm@1HOhj$y{~pg?bpYd_pu0^n37+$~CCCOqxOZL18yr|t(*$6{m+6b3j_S~gw@PZS@|5@UQ6S5$4cLayrGJnFvWa%`5gvgL4R8^ zT*uN{bSBUE`u7E#Y~55l(%^C+Owz18xLUu3wU}(;^YOPSV=rfU(mj*35pWE`tnv93 zjI27JIkM^vgLM_SvYP0{;(Pe}mHjzcWq<~qx;>uDzK<>Hy21pFjN?ZJ%KR|h^BAsV(B35e8j zSYFZTw9%6N44jdJ5?=XoYGBXUQw9x~EqcGTd8SKlwtF(uDZNLoYo3BXQN6=vNb-su zHTjtUKf9*jk`LSSyQBW~b3sK$5Q?YXljJp4v(}5i&YY>vQnb!671LR`-Qa{NG+E?rvQjz_}$Ynr_ znUTX>c~EowEXCb4@#iJ0jjw6X!-m?$aWT3<-jbQ`*~IrZY)5s+xk#@luI=UT(+q@` zDsNwxHF{{Bmx}0fX9ImjItW%e8KAF~mGBW%w76wCbYxY7I0ZBrrL13v0eHkp0HDAy zJ_?EZ7D#Zx{f;ehIP)eJsJ? z$E&5^`3or9o8G>2SoyT#-n^NAVOs{XzjgmqFnfF!nyZINlBfw`*~Yif!j6m2W6sHJ85EEyFQm5hSonUnM2Z;p<=2dw2U`+u#hGFH+%738eYf7Z=_s$vvjRDiEIkW zEBg4}yzelTY_d@F18c$oKeto|+JX^bL;E#8QPII?T-;y2d`0zuGDjxbdo*)#z z37YhI7pt>EAK!Dgm~0nzfJLg&*~tw2^odL+Tu=J_jeCrs6Mpvo#~bf)HXkIi_Tn@O zExjTVHbOK6Ni#96JBpMCUx_J*rESVH=6uLS@T|sN@no8p12N-PuGc!jxTXE*0D3wH zg|2$Twm9i&4&z7D>S;Hq01T*L#`JP4eEM|MO)1%78+$kg$vo^}QmpYRfdI;dCw=AyPZdUW0 z_str=5kDnx3w*vd+%Mb?zwLYpujSviN76=I!4esS}-`b;3OmN(IRDuS2q7V?#C>!Ca`;MQY zE2VYw?K5LEyISf%QfDlcFd1tGqRS~_&6ufvVY5oN5b*MvESSO}-+R%lx36yxDL{6j z9PLh$=Z^CDdauxY-eGX~bAx(qtZNLXX#Q=ZwbGCs&}ETY@X2|$1|fX->M`6HB22fr zyZ~i<(^)E0Vyjk9bj|1L9|$_CLfTWY)D|d=@hte-o>@v!9FIai7`njc;YLp8^q-qv3W=WvX?_dkh#1`$a6ci9 zT#?^(N5pMpr_VjM2gI^I=0v!2*l3BSZAEQUq=a&0nM;w+|Gyp^B%^O!vNM|e^G*dyl&0-iD9GzI_Ka&+$utX^fem1yyK$%G>YD^f(N zpg0xG?W)us?%kvuDTEE~Y>VSG>YWiA%51Y68mn&y5i{+HSC%pQsmB?&IPr!5D4+mV zvp+8*(2yAx;4?rQ>^bb8`|-ot;%t>o{pn>Vw3Q(wA|k?+%(NC0iQCzNnF;5xYqxUh z_?Ga6SrDETJ%N=m-E2_4d$^O2x9jZTDtreJ+!pxQ`iWdawBkv41{YClguAxscimW^ zuVfhGGn~VF;bf?bUsU7FkUy12DYgDp5IPH3Hlus3E3Rib4A%}}ue4sHdGfA4g3SXGQ7#*N zA6vwSfLuEeUvP#jf_oF(wJeUHH8~$6e&m=5E>Xr2%r@Td9H;)UnO>q?r~`-DY4IK~ zVWZC0fnTssRF{K&Us#0KQZ6^%r`2|OE|0+f3jl(<9A`V_)DW2z!p~pX*U_jNMTA#%b@p1 z{~E(*Lc!Sj)$89U_lg=(=JLloX>;=lB0g^Jfb48(q@B5|AE6euzl5Ov?clf2G-qZv z)PM?hbe6>swl6Qmm%G`&gGz~Ev)S8k(~024ONOTnGx#!*z1f8rh<+{q)mzeo9Nyc) z`{a|RKQnm1fi?cUdsaF}1r=nL zmpTt@AeA-D{M9T5sbVsOLn)V;jF!@pF7EJSLLxUx9yWRCT8q6k+4Jb_{nYQ-ys&r8rW&)7Gb}VJQ6qYbFb1qhxXcjGo`#->q`x9OEI242 zE}Sy}J*TFF+}-cDV#^^Rp$93;N$cDP$;jV~8g&^vMcRG2Dv4?_oN{@NB1J2Y;Ne}M zfBAwc?k-t=JRcIpX%&6_a&oX8CrUT12IRnPSRa}) z^SIg1s|iDTiLZ@5{4T+YFBs>kgqegT(5~S#k`x zEvg10vzvODt!h3hKNvS{PUf|VG)ay=o@DzTUo)y|+G&n{n|LGMydZ8SQi&OsXZ~Ri zksg8DTz?BQk?TU7s%a^(DoM}`i*!)b^b-q9-U0nYbN+C}>l|CIQj?kne0y{0LdMad z49a_hG3cFE_NK0{^73r_o3`_(23>Y_O;|`ECXPDHbLSO@VFOB7-j&7Pu8k01O+HJU zg65a|@r=)=N!luV-ccH?I-n1+ANFXg-27_VSP-;PYU%a3I_^`)^Yxcph1{$SSt^v0 zbFK%c{iFA14Vnn`u;Iy0gT`H zI9^i@T{7k4O3ai=evES>80ueBRZQ=6t$h`rv7&LQh)jS&PoIC^aiXz%#Tjn{1nsAg zk&B~hCzQW;o3mBZJhm+mxW+MhxIX6Z)cu3V&Joy$;sJ_IKy&GGc7_5%LChR6NM}*G zCF|Rlh%wp6KH5cCXWVKcp}^{QJ9kkL(UV(MO)t1 zjtN=~s(zGG}e!w13}=sMl+*bqE0V z?|mNi`mFoinS3Cbrep7km3jc|Fvnv*IY_7M`-j4b+aCLUwd~y({|5}oB!DF7WF+U9G!Di z{smpD3b)(O(w+FzFswZPinHB)t~VMOfN6nf2ZhmM1Tqhn+7z z#lqJW(bQ`AS@jz$arU{FHS(F+e!OZW&R*jj*TaQVfB%3Tgkhj{IRLdtl2W!TKdzj6 zWJF93b4^&5UP>qg7MCg@grsfQRlfzf2fd*e=Q_W5@{6}H|9jbLH8}VdW>S(HufO^q zjeIuTIR1A)8W_$asbgf<>q;Txs#>~umstAb; zpbvlmEPG;qe==212q9@$z$75y9G_wukV4XrL$?@A20}<@`3Ks$NH}bpNI|JE2?!yC z5JD)N2qA82##b$7D zkcmJ_1?M;sLI@#*P&g4n2qA<}I1xe!A%svk5kd%QC1}H8LP+=EePBn2mZ(*pq_oVkt(L^Ym z2qC1$#8VdTQP!p;zj@tN6UD3*jGB80+;5JED=vBq?2F-<}Ug%cr!6rQ+N mC_+f@!pY%;5JCtcn*4tdnnba<7vRPK00003h$)_nz+A2t|1bBzRnS004j_B`K;506-`J06^$35a2zou}Rh74bVkdLKsjziGK|K z0p}>GC)rFPM z$93-#TOihQ$VQPnN@3J8CMpWMIJ(THstFkd^Gru1MPy{>5SzEcc;+5ugkHw75(a`X z&}z21w!M~4$K0NK>N1Yi<#4jo-Q1$7j_&Za*Y#ks^^pIOdy0GO_IpWP8)PFOP%xS~ z?=?gRqymgbg#aWA5raZUQIzw`nCLBORMhIfP=pl-0zK%y$wH%{Nhub=lc5>5%?FA? z6jC%}s?XLaT?-I=5#~hQ1LVSxKfj_59% zHf^by7X#)s0bx(Pj-T*d?<4e6uFk!D9C%N)3ic1ufwU+WDMY3KsO=D80LpwG_ZKdZ zh15n8Ir%qmn-NZPGLTn{ezF$d!S1(DQId6>*nSmD)a!kUxkthm{8Nw0+dMl;YGS+e zu7fx88)O}Pe*zb<^SuI!t=Q5KNS`Mbp{fk9gcpktjs~J&4`Kqo4Glw>mw z3f2WEpiT;%FdQ7*=b~J>Ajt?p(9h*3UAll_B*4D`p>PyHJr@^HkQ7KvkjKRsiHrp_ zOp(F@sQ848qOdCx^*+=D8X+cbi8~3@zJGC#+Q5fj4u%aVi#$IUg5&bCj0mUR%|c}F ztpnRRzLN+JE`sf&D~z41mjuN<0S6$>Mj4AzlE*m*1xW1KWzGNbbLIxH8w@<>D?7}!6}OeH?BJr#iN4VAWnTn#Z{THlc8Jz)%SVn zjenJD>E9LK=Xp_sASs|R{AQ%`@wyE(S9!-|FV-LCY1u=irjeK+6U5Vy0BrN;;*Wlt z8uB9ErcQwHM0{>)^{XuM75P5kuZynWKVc$}*xC49FK7CX?@Og+tav0CGe&8JnTi-k zFo5s_0ps{5{FxaH_DJVP0Z%nX&9|9mlB$W|r{6Ua!2dda?cS*UEc1SxU%VQEi4-4Z z8=lUmVsZtTY5^qU00CxBe8%D#C+*l9u4{>cmlC=3ah=Mdfd!;(A^9Gt(yzpf3UD?Z z-VDSf>4D3UJmToDRWe1XQ%!^kSAur_lSxLjV7raDg_&=^S^Q&H5S8&}l^gtkDYp}x z53ol$Wa6g#N&>>t!uo-rl#TnFYufUBtGgS|t>dM{>fKL&5hnf3mJ{IRr#RueRO&08 zUVi=Zz8I)I`+M4T2R}tB1sX**h%QPt`;JNscOn$B@%1qkx=qf*+O@l3QJB+^%5ojK z2*!Jn^1EntaF#0N&@UWjKvWHnzFJx_OR|ueteT{n-4&stHHwa&JdjGL6j2?e zEiwc0U5S=-XuWLs)?& zlzKbl3?L=x&Go}EFX03?zib{g9tgk% z3c~fZrbc2161Tg}^mHqH*ZG`qLYN|`ppjKcD;88S)c&zQ0}R=oO)a#O1h*dqM-xbAhR}U4&1qL}Wr1H$ zb}B{ROPe7;Mq$j=x7xQ&ldQt0(qZ4kcdq;M0rr)Si*xIv?ce&_Ir0N{i@4xa%IfFp zs}|nJ{NF`=%0QXI*!fV=)SuL!t~>q#Mg`w~zI-X*K_q=pSjx|wMiP}f!be3=LTDS5 zo#X<6WN6m+WHXw-Xi&g4v6j{aW}HytA}MeK1+R%dMv$^)2}0$~lMp*U1vG%ext@mCD%`Q)M zHqx&(RHgpnYoDBUmvenargM3JThD;-t~^7-*+ze)s`Zi|&TyeBgd?Pxo`1s{z-4nqI5BRI zu<;c=BHJKE!@1%~%2Gs_gw*oJfbs)Y6loUehzAk9SgaU2F>%ny85}hedbQ4Sp`&_$ z@}hk zf6$-+v{@v-tf;3^CM{GLy0U;!ET^LYeD}e9?zqqUoJRzQc9M7$am6D9MfM321gt>n zQ};}C80b*Mld>bZ{ugUNR&MvEsvPtn;6-0KJ?8{!2ys*iSv9>A76LS90GVg27xS_E z)yvNA`*z7r|6PI*fID;30oTcPjeqCdbp|1BjQb|M%X(M6!5d57P9oCuR7hC3fc9HK zVjt+x)JYSH;RB5>0203z9A79b0ibYYbBKQ(IwWoKO6YA;VDpP9Md9F6{4EZ1LDHaz zwX(yAi7yCn(NrJYKg9g>L=Es$s9wJB-+lQ!?FTLR+CXu^I+fy*GOcz0CPs03sNeYl zgKBIjtN>HMi1$5$;3g|L-qykCwSu9{-seC_`Z z*k}*&^S5sfae&3j%3LGW06PASVP*6u1^jDh_m&4$0yWzwvOMm)JZ!5Zb#c}usGp>e z0>Ie7)hrc9THTT~xL{N0^z<+HZV>J9!w(o@-@?4ynMlu}_u7^59aXH7sILFLs{Mz? zYm+%YFy!Pz-0xCGu9<(y^01*hA&M=?uNAwezXr$MHy8P6DQH3Ml|Eb+(}pjc1lkl2 zoWDR%gNjOpGT>3T0>kqF@PkJ`nT?4N20)a8PbP&|X_OdO<`9KrPyvJSNf8ir5uiA> zaxaW>7zii%=urmV_PY;k;GO>g-*w)`VXQg^$qoP%cs<}o1(=ot_8EEtFraSpp->Tn z%4*r-GuC46P1o8b77rFXa&hGOS~zMlA&N3psAcicc6ned5exY{gllZ} zAYbkcW7r`P7P6C3UtRQqo}ab^_B}UN9?N&PYa|99vPoqcc|W_}rxa@NG)pIW#TF{R zV8G;E2;SWt^Rdx74<#AunVdmGh`(Dr-eoaq>U3CdseCq@_Zixq6SOL(`(kVjO>w+E zPLyZSU&5Ea-gY+&+zf>IdQp+WS1Iagje4^_TZqsNhIdQ;A8L1US(!|99am1?Ir*Lz zdW7#s8=P}B_1))8biDRxZl@5f)dwb-iVUJ-{U zRVJF>QGiGN*eEUhXc{REiz^Vyh#6)mO*6BYMH#2;A3R-1dUX0V^ln#rxT0aXEI@(c z+LzV{7bB);de_8xAbgY|+eDz~tdBHZI69%P1tKb8WEiR$K%DojM^FgBgokpJgFm8* z!1Fkb4nwW1?W^f1q+RC)zH9P zz1`-%AIu)_+&pZ&2H5A;cRd4m2{bvj?aHz!PE3eUh z+)wj+UvhBx?j^hVx3OI!(M-q0kk}h!rqxM zwq2wBm_mkX^0kfqzB0KN9oF}QL>y@t?ox~Bm~|&A+vnv=G@%lxa;xMJ+k8Xl)G}c{ zx)GeB&qSW0?V;$aD zLROdnv?^q1P(bJnG>I=&VI5zlBFoUE^raG_p+D*Uu$lWh*BnR_F|WK$Xyrzq%2E2o z8#pas%s}_r8;CK{e9*bWh*``n=G;k5`wDMj-d5izmho8VHxfNPyxo~xoPDH}l^smL z@GDN9jLgSK%Dr2K)SB2@P%W>F%mUdMDxS_dS7HG-Z%0Z3J_B4LT@~ z3Pn5z4qZ_gH{fZ;189k8eWhw+bAgQjs@)0p50QWtcv4x&oj`DxeZ6=rpa0pRX!PhP zCDc+#+}uKJVY%h=y$L>`4BOK! zf_3tA^7g$$6X>{ z+PNKq=dagnzYX*3_NC>8hS*hG_wR8fzE)C0MXOmLUYFUzenQnpnB3)*`5i9 z;uAkF8{;%`KS!c@KfFqc!}wH!P_mf;j$9S*sM|` zbUJ3$Cpb?K&j0bK@LWczctfXnxU`pRJaN>($9PpS=bFJ3BH(GPpXlwQ7!&YRsxlskp3%vP1(W6CifdCVhWUe}x^Rkn zA(Ka-+rtyoGc>`j$|kG3r5Knn$Yrj}X(#m?oTJUkc+`p(u<>F-nL(0#a|(ZU11>PP z&TJ&ZFgr4R1!c)1tdps%nE2o0D@jgcT`rufMos- z%{|?ZD6Qx(q5!pb51*MWe%R^5=XySiJ7u~=*{`T0h@pZoD59Ks)Jv#ch?-xlex6_q zK|LPq)s0LUFd0vBQHh{8g_?#L){G#4Bv6r+~;TWBGl!FG5ZWNJ`V#sP2ddPe<~0a)9KZvM}|RwrfXm^ z#yh5bc9#yACGL?!lG?<(Y>!j7ap_mxTWBj*#qW+|w{&^*THIeVEl03BR=imQ=}&HL zoN7HxQ5sFCRmfq_-0nIh z+7v{NmKZ1-F)mn)KYYH|ML@#CmfSJcX_9Yg+$XaeAU6KTP`lO`7P7P}y~9g|OV4&K zIRXm z0ufP4A<(>V$TH^$= zruxrhi?FULfa73Ug$NGn!B&N%#vC)#a@h1V99>Tf`1DtTtNwK}SNDlHz^0n(Bh*Ho z--6_)oVS8+Va?;_*)l`U$E$z8!iREx*N4Yf6z)f!8dWf=v(-k1y}?&$x>xa=Z@veb zge3FT!^d@_!*%#D;<2P7ff6HZVPy(!U8$U&>Io9tkKL@(urhv>(tP=`^ClkPB%T$> z3W`29gy|(tqmWJ1qDaT0i;_f93ouKQO3Fk3fsX1xq3x3^J4eTbSy0jEvyJh6Tu)OlDs^)FOC4jA{(YcPI%{OIkWBfzO)Iq za&g3yw2R9^jR|ZdN=T`a;a@A%m7b^cM{7vPor@m(6|Ic=k*sm1Y70m~^4{cLXV3Iw z(_R69no%4&xJRiW8%nXBoh?oMA*bA70 z`t25!r>bz8;emCKgQl zp4s#=5nD3zqhk9rhaJ2Vr%iKXiv`F4BjawMFP~erYgjHqCL%Toh4rdXl|1v|Ni}B659@wL^U#{Ku?NoWTY?v6iBD9MScf7H58NWwO(R&P)IotaR7%@JS(B7@244)eS#U&9N8QT(yBv1 zGGaZelcNrs=VZ81M7pafDgZ%uA4<%OSvYD#DuNufHY+pGt-kntyZL$HNOgBUy(qiW1C_`SYGY|!veRqW*(A_=RKB*zf;$1+D zyrEi(ONU-w4D$t`3HbIEN{xIop1SUp{>ExGT$Q-1UO~9;0!_7r!HeN$UP34+N!{!wcc_Ga8d2GhB=0J!I5X~zM4(;Px-#=);c6bVVb-#$MJDE6ju@+HX|ybW>{*^<1v!Z(-tob| z5G)Nd0p&udW3g&`xFuucV96m4nFvVDCLIf{`iP-GY)BNwPBNG22*&I7uP0AcjYw1g znhI1^9FrZP?G$G9o@OrkGNOi@ZHC4nw3Cf2)M@Hfx)(PI`-| z8-Rs_OPy12mQ)}Cu82#v=)V6z3O;!{Z99_wrweIz2|$PYUH3I(nL8RK@`SG#b5ZSl z?cOwYz9SgiL@B<6dhffRPG}Z;_o80EK(YgP&Z;l4g9D_K)B;YaIeU&aEL7EN^cpOJ z=)A!?UqnCb^M)6mc(4w|VKJ8x1L1J~fCXA^t5tg2t7;<`(DxULVHHz;F+rW4Ex)h3{)s zUX^=kGNXZ%XS9EHmAg*reoZZrlb^Dhm^FPhFxr|~NH%B=+gxKj?8mVyT@d*b@U>uh zwve2MZw-z!3ZXc{C608~QbE}S4#IiE_53GZ2lrNoqtHt`i;uc^7r{v`z?xv|({Y@9 zpF!N`bp%~}LXXX9M|3Olxwk79YVWl3>^)_LRH zZoRKMuafQGBxeMD#rlk3QFV{)!BmYJecw}hgmYTXb&s)m>cno>#dX!@LbG+w`0ph9#d* zi3;F;b(i#{Y*U@ZE!f@co@yNj+{Lqe1OREMmLnDzYU`mpryqVIBQMFc5^+y%2rmtG zvpX%iSg+JocUij69xHvX-}(<0j@6daU-<`VgII;utf%&!yj<-2DZR9&?|(Avo090; z1WSG9sp47|k(+AbSKa+0C*xtYZ@qtzB-`mg`x;jB{{Cj}&~d()S)=0!86fb!@Aqm< z_jLTTpvTsFsCl;oz9&Em(&V@M=AX62^iINAdR0|bwlR^-;s!H=QGLzZ`Xem8q>XDWE{{R!jnSz%is&9M-c0xY#?e8Ex$s@HmOlm77HVI$^l3)N#;y`YZ6>SX>Mvc)8hG-SV~+FxBwO zr(JdVeFEE>3IAe-D8aW2jwXX-|FSC;ugpO!ZCGcG*WzeIV{$S2bK!cB=9`nF(;7Wz#8J_|T4>Jod3og7uRAh?GPj zc8)C*A-0L2Mm7$(2>DnY`>y;IHiT+}FL~~ln*eKT>+0_9;yd>ullBZ>-gazchzv!8 z)7yrKS}nYlhmTBG?5{-n>(E}O6A#maHIt@QPM53Fcm&^13t72{Rw8F8#1@TK+~l#< zh5N7v=pi5>LG6^00`CH zs6F?b>ptKIXuTK>KhGe!7a1Zz03=WtG_7IxzStoKT*3#B<5k+?xm!?_;qt$F(Pl!4c-TQhBZxl5TA%*e9-G0l|2s|q zb)CZUz73jFp4ZwsLkA?ixOX>pO5qmLwN>lC{IoM7t5jm(gWjc|cyiFZ>Dg)9Umf=} z<#&^qd&dYjW_$|x@yyVDXH_Uq_7(H)g4O!7OHWn_N5wc6XE0oh%W6bEud&2>>IxMd z@MBr;?2d;`)o4wcO}*sq{AFD8c{>QbyY(jW&VjZs?fLony5WIrwW9NMRnPml9n467 zXxRX!&shwry1L(w){AI0s%0D71P!0Ac6Q?gx>{PeW@}}v8{Vh)xdne^sm2cEf05Vy z_Lo90c8ad)Az;NGWER=I?Dcl-gMT>!`g5N@ayY6K$i*SNK%{Nk`&YgEq#&YQ@{I*51Lz*6*vv=4-- ztz--{AOlNqePL&Se(p=i?cmK-Y)6G>Q({Sj^nZj}DD)nf@oV;5(L0N49bX|rTvspid?ID-=_SeJGi-_UCUE- zt);zkmoX0}SQ4T&-!QXI13haM~ORC}82j}eZlpD(2r7Qy+Ov6A$f!?} zu%uEdb-uDi%tHq;`9ibiyEAoqhp<_tKw(EJzQP?f!NH?;6B*rxjY@&gHx28pFlLPf zlktk}LJbm!<8Z8q!I&f;goL67Ve8FE);|`Dy8ZD#W;Do?sz=)*S)86)L`3RVd$Qn(Li>5J&*7 zJV)4uqYhpeP|O_BhZckVI#o>qwC^ z2I~4S7JF-qKs6Zvkq(9L5J1C(|7Au&4L4pH3U=)Rph*oj;BOKuIcscQBg<2+m95+x zbf8|cAOJ^pg_J9s6&ycr&9VP38FZO#$w+0>VJ(3mWiVWopZm^ZTM&s;L}cm5J!dGj zIttG)@VdPImIRIbOYU6^Zx}dlcC_j>Ky9jnO>Fr8YXP$4pLIDs{Of%y((K>7ml$w@ znNezuHfRje(TE6EB3Z(tdO#o(W?GcbU&%P$1T~msOV)ALJJcMN1_X>>6ObE%U_>3& z|CrLoW)@kJ;F~kjsA^}*)@w@`wNxAKE)nt4G*kozxD+`Rcp888?@#u9Gvn}kx5_{> zmBp_RcTx-2H5NOr%ovF@uhW24(v6!eQ6Xs&3~!7zdm7gu8$w$g{H1Me zJmRNbFp#JnyLaO_&q%bjWiu~nCe>v=I9#$r@x1>az-uI{J#)i41d?G>FPMnKp<-^g z{6hR`PJ=pPi@yFTjRP2CYcb`HbTvZFxVCC(tI@0^G@VW76lpm+OZf7$Ri^~7Fz8N^4?yJ0} zJzT$k36aKn8jQ91u__I4k>~AtxAj=Dxr9t}S*_FBxYz9_Ws!2bsIFtt`M>5w}MO$9eZgOnb zox6L6M9L3A$-wU>vFTv{G%NLhyqV)Za;c0)Nb2#I2SY5K&zl1vH;1nvMb*%n`O_}z-sdCpru@Zqg8+O zbx?wv-&gSFYkaFjV>XW?hM$ts%&eKiRJyP6Yi4T!SACdvY^#sPDH2&bqlrune?Di61P`i0B}h{*Vr z(0kqB^UKsU8YG8WQm)g+J%Ho;H5a5lF3*LIPPcTp1hq{3mkI&5%SCk^9R$ON@nZnL zUi;wv=^mVj-pp5k&7$9~6bDpKJ!SpqtC|y^i~tyoo!|R(>3S% z>&t}3v$v|kMkc4j2b#*(aR-;f$1lpy_(N&WndD=9{-HFhj4T&5wd}ubYyL?69!L3M z;&JxpE4DKFdba-j@6oL*n_V8)Xn)U3nl+=5)qRh=-ZejJ7`U$o&>t^0baZs^B18dn zTJ@E+wO6H9D%w{`x@v1&#p@qD&c0Hl(dL)sWo6e+p^;H)Y8wp}aZ%7XCcdu^lcH(U ztWzG0FozS62mu0cUju|9GPx~!e5v271XM8%wC*ZwEZ*B5=_9OEpaA|=T8j67i|=9y z0wTR>qiRmp=**hN>ts+og?eYrF2{3RjZeKBWm3CO?R0b))UvKt7b|Sig9A}m@lNoO zj4Q*g<;?cen>XP86(dXuTrQhnb#_~uQbpO~m`olRzrWlALXnBOYzJX~UWrG8j6U0} z=89FHJre14>b#z=w!vcu!(=|5Ht?@+iGCePjmynKkLO`OY=%|d! zJ(bP7H0VMq9!*R#$&DI8TQW5f{wJlQ4XP*pn+V7xvVdu5AbIX^QmRm^e&Cs%5ByBM z_#Z5&=gW1!6>|B@%MT9!Yv?l%=W9`sk>RCgLo<2^s+r069T$y|H62?|Ztm>yaNq)M zHDY#l7McGE&~tY@H|M~T0~4dqlEYaOFAzDV_+H}aHPET53RhTE@qacup?8l##3v8! z?WtAzJlf?gr~Rm$uGg*d2A$OwD zP?dy)dh0QXFtD+8Qp7}~>txG=B+JTA!0+=7|oZf(_v`}@aj_8AnY z)RD$oDMp}}n3#oy1+b5)V1y(dKb*B1+Rx#5MYkJA9gb&1_stHDNyHJ#iFSJ3quHir zX5#I349dt0_@?xuDnvF!NYH7$t@Z>$;+O=%AX(emV%TE;cfes5KYGtBIV}K1Yx5sc z!f|-lkl$+ilEqtPetv#O$NC5-5)x8tYinJz%p}lM>Bh$qLK@#ho3HU7=gUhGELP`Q z3!>nZU>?NLYj@{Pa2+Kfk4&WNQQHMZng8bpk>8V%loVV5*zks{f2_>R%tnl;6I)z5 zVIh0$_y&Rwt4TRt#xpsy1ZesqLNva&?WTCTHcAC+X#V=~M`Csr86x1udrYR9rq^uk z5cxX<;^UcS*lXF_=8XqxAwp5It{MrykB@gFqZtHMS2;-VxwHK}1}BB~5?SDFHrX6p z?Qv|&r7`suHIF1p3_vu*2E3NoaJ0SP*eq3JiW=jMhgEdfqT}<~A?jW;1f=apiu<*A zb>^zlb}A2=X6`j~&XwfaUF+YaUj23j#O82}T2uuZ^I%y6qJMh+lXD$!VCan`4Cga` zNH1!bfIZ?fUOdiBuv5^AM=Pha_P92cjt%e9zs1Am z=75HJI;5QHyPele+{~>6(LDdHYi^kMBRA#pjns2E|Se+vO@JxML}SC++H8y9j0kxsnq zl#FV)_GzL2TQK6pLZ^w(2P=nxXyHg|-M3e0O`VH2jq)YV=U;V0wPp)F-$K>9&wGC} zwk~+Z2F;fI(tS3s`@_kCj1T5uF;!&R>L2gN3qfMyYKz!9lfMjl9r!({68NZyFwmZC z930vygWQbt^ye!Ll&JJt_20!ky7V`GEx{mynC#bEzzlD<(WVAo@1*7eZqCl4lRpoK zVhLUsG_;}%UUTG7W5gdXw=Ua$WoBmTVIQ%$`3RwY={|EkeU)SMDe7LKMSLY-R*PIdN>5#4(j}Mq59z}m{Sh@^ zC!952KY;-K)O(P}`|tfnb&ht#i_@RRhf6gF6L{XAzaMp*$3JR?|zE`Qyy zX`{JbuADZvQn4}@y8C14H@bAFAfleHHP_VDISquPW^&kRx4WH>Q0AV|th1#9j%I%U z)p6)lQ&eO!9thWKcN6sAEni4Kr`Q7+ozdEZdu&%RndDr zm&kFY@ZJWq@1B{`JEj<_sG6#3Ays6tRYvjs=@KJaL^KYoIhZYSeQrj;`kR=s+C8#C zS-G`4pTO%`!_S{TnN5a7NfP|tU(%f%Co9U!W#`7rU1^@SPaKa2+z*g9bxm|%q~)gg z^Yh($j=lQT@@Gkndm{UnKrR?LZp+Dxra zGUdfM_-$~BiD+L?N}kvP3zHMJQ9$faY@(T6#v^kQx+atP@3PN3EOk=w|<>On`!M1#WYBK1Zz-2TS)53}zKzPZT4=`=V9@+GXFaisjBDgb;Wy^Vik@hv=8b0$vBI)^dkuJ~Md*@-7VR%22}qi*gwil|gC+tgTNKKnyZJ@N}Z@ zC(%IeFyJiCIjonmt<=o@lBToGe~MOECbTQA+wjGqcsc30*MJ}B_`>=3;#K9(+lAi0 zi~SB}F&Ah0wfk82#igYvzlB<({wCX%n?)T5xon;V!dE&PI#+9*y+7`k`brGGFL$V- zEVj$F#l^*vWV7=acmXxl^5aJI^dpZELK%oH2H^l7f|3i{CE9z~mMnJ+uI;bdNh zxZ@}>B-T44DU<%DDIF$#W@fZG2%zE__+RfV8xGWNZrC`Ryb3rXqc22Y5VA@xR&*$A1I->@}?XHB?bG%m6}+tnOK?(izN*91bg>0^>2G7&@qz zvFk~=B_Nvlf@)MWXfMq_V2@kS!NIoUaAWnHs1l-9PDhF3+#!%u>H4;vyJSaV2vLCX zGQeygIi;LZGD3ojE~zyZIiP~jgTsRO5E1+4H|F80k9-&HsLFTd)(=Hxm2-Wgq%`;g z-$3=4HLXyb#^L(3k&!(ndKRvRN>G0~mKc2+mP(`GNg6L`4iY!|2>a`V1fp-VnYweu zX#IoJE#RB7UZ5b8olt5@war>HUcHJ0Qi3c?kS$oEDR^ z`O8Hz>L^NEUA_^PE59)7POE_t-}zRrzF+idA4@*dOArBdvvP$WoTvf$HJWyAYKb{w-3S~eO5#%FAnKvDmcaIp*BuWUSIF8dN&RNi7ToC zjO2EEQNrn7^-B=Qb$NvFtTxq`T*H|Q$Z8m_FRF!v^p-^O<7+P^$!?wxbHVl{T|E9a zp2KIdQqPG`y1b6lpb#C43MTEOxai)m#XhoRaj{H_H=D*O%;%lkufwR4)FB!1cMIj7;idT8R;00 z3ZtRkj4Z+CN`FxfV70!L%wof;?4^~M66C?-Z*Rz5ITKE|t=kU$>swdEiDx&4 zL+a%AeeEzo{)Y@2m#IywJ=!pfHR&mcFVZV_9y>piu3I)zY6e@f(cp_7&ZA4A=YCR4 z#wHpuNBsp&?iA|Oa?M7sL5nCh>i41;+8r{D@Bku95v_>@_`7MExI|PY=6!`q%V~IY zN%oFT^j9#cb++Wk)8IpdqnUY~j|R@TSySkJMPz#=kE76&Q&YkEN90uX?`XJCEcBlG zUlZQb_F7t6Qc@9Ls+NE6fYY#hy}9hbFb#cYwGrRcDg!Q42oU|-!7bMUJF<}Lwxb6) zK!d|LhFuouzV7w@e{S`MMBF3Y%k@2U{8GJ4qJ}2(ae@!Fy4`jA(aZ1hEobZ8RVz-d zSpzA3D+V=Gf1%3M&p-1@ci635=5puY&yT5CuqPR`pM~V6Ad;>9SDK#Y}C2eh*vvpps!(UYe z1;#xAz^q%aW7%XZdcpNSpV=5b>`J9PuU^8)5@td|2jJQOT5-$ANpvXJ)HF1roZ7)j ztNNY&T2ob1(;{J<86J~^|JXcVReM@>@)Mn!E9aj)tuh0TjQ(E`iFFueXG$?sN=Dra~l576R7@l z@B(eDgo5&cR+k0^<2reD!Jq=H{R2USBVu7<N;Syga-Y`*SE3W<=bu(PL-^%JGkg=jDF70X7@DZ^=Zk-2z#|U?EilH z0Ii_k&OLFy^E%wg`)?U4?=AyaUB+PMe(ty$0=janI@+4HiPw-(&~GBoFB%P;gyMU( zb$6?#9{Gocj#wf`U?$-H9Ep7H*3{JW@F!g&Xu8C)wBb~SIaB&%RUThpej!2NeBP?2 zvrD^WerHrkMZB%;YHwv^WLpnCz)D3Np!xA4Azx;m&2zs$cp1Urdo-OtWBFq$htF90 zYT!DkLqE{aMokS|Xm8BVtLp3PtE)GGeUbH$@NxB&h*E}&PCtBHEu)(Kff#VuOd4yp+rYw+tOzX}PrRD67wt<4jCxRTTlRTV+GD zTwUFDVQ2Rs9p((%%G`8hRFqz058(~j#Y!C?v;ASiAP1^6A)hc`Vi(TiKK9Vg6sbcv zuLftQy3I)@Hha?4Yh=BdlEGyZdjsLtl90@5%hoeP1YZpSZ(4gZ`PJlKGwSt$LOiN_ zOT*Klb2?gUC0pl6&Bz`jE#^@4IW;;6ne(->Z%mC$_~KN$xDJLLI?ND=y^4BFS@!Gl zKk7xvTwd;u!G#5SCzCf#@%fus?CPp^i3A#HxtYUCaI?>|4w#X_#Vy#u_VB3F*iQ@h z$F>+481%uurPUx`U-mV?-PvUf1~aQcwP40lLp?VDhx5utJ0MAad~PQ=%Pt7`eLQmceS>p3!PX){ zL#S5ZbuB0Ez>)-wn*j*Z3~uHeF!!=*2?J&&5bjh=fU@4|@FG;1-04{^VoFe*5ygVz z*=41r|5=&EG`xYC8L_{ao*l72{lBEx_&m_j6afJt8{vfe5NEXM(Lu%Q{V5S#iERoz z7aknDlE)D;W9)vg+`VO++oF!0PMrZ2KW=LT<0XxG4Z6M_LRp_$XE1;1pPzX8F1v#j zW)>l**28AEyR-%gturqusH9TOK;-*lfs!`zr%~lr5_0PAgmG_`;;()c&YtBywiM`% zX6r3Z+m4#S*gt#o>>RbKwzAkyllFeQ`yiI&N8Eo7>Il+ZalGX79Qg zNBGw0cf!NNgR|4XC*2yv+i^d%zj_k~R$A&RDv3s*bd7@_7_P3L%u5(=m4Erx?#~Mx zo{TsA1>!2P$=MGw2#Yk3hl8(P^!SJ|%~JGP9o@D2#`I;Ho6gMEf={x7HB?pSUn;Xy z-51w)u^3+s|Mdj&dEGG~ig?&sO!7@W4uO%^Y`OxQVunQcy``(`1FUdO4*a~*CN`o< z<@@2?EyF-BtLf<=N4s!V1b!`Ky~B`$l|y%|^E`bMoO!TX$ZB^R#j!r5MV`yf{joq} z8v3D^%Wbj~$;p2T4ix1QreYq_y^4VS+r{MXUIPx3J`YQf;(X7`>Q001|4x|1-k5+} zS~LK~F5f6nGpQV~2j2+E+kn?T{nO{o3}8*1w;vqD-Ks4wPfRJnv>wE1kd{Yp&z-Hr z3(+57q(Y0kMW6HCO#2r263x8ztN&i^Ci zW~D&^#cZFTv}sUY)c!qZ^XcgK%Q-ca3B{WRF;}Ay64Hg7qbPvYub!Cn(A+(VEYk&O z)4hds^1P<#`RDkM*Wb%57aDQ7+P}f}lQ$v{AObE%!A4v5J$w*VT>ZWO(T$gt!}6-f z>bR7xvjHE4=R&4KpRiA_#|xj{;UKb;uBN629%eZjQjf4Bf;Gfn1TT-{5R`y4Zj({) zC`&DWdzOd-INE>ntg7qewpCMGC@YbrkkIs-w3^e`Ym*)qqhVys^?tc~ngmD%Qld)b zx~wYIFueE3`wV3r51===n&+@s4QAQ|dlqIy^|bDXteqL3q)m01iiy^PO}Cj0?vRP9KBrvLqAKFc3&3v8a}F55w6}-HZrSH;Nctm z2F7tz*80DjPo~Ybtx>+V5m}6LA1oAA0LHUjWE+xgFS3rKQvCq`qPh9;9;UvVDK{x! z=XS2#J*oi2kEXsP;@G@>=g-YF7NuVdy^b=N`o2bu4(plGFyMIB!aSI6%JM^zb8GQv zKJjm}=XQ$Tjo7h?gtSC;x@7V1t)#1OXHL9mV~M`vXj)!5r1iW95&NBV={@JHf5V6x z$2LM9KoOXy&c$bmj@_~4Q&4exRy1||wjJmbDnESEwm@YvqpE9xysykn(IXq4-So$a zFAYgPUX7$-PY@3cQ~a3K^!1v`>1~C(rmfY86`L@H0(u!8@`4!`JL_}r$f*%h7}tNa6fqnzKQvtm9uEwTBVy zne)#PbENsDWOI&I(%WYAt?<8v2jEwl2YM9iDRi^u-qZM9)n48B(lj$VEtce&?JZa! zAApilbL_(oThr#e6C`;Oo{Dd<@V;qV)MV@{jsO4zNB{jV0P}t=g^cq{W(2Ts#xv5-lC`=? zW>Iy8B?aRpPAj7(vi@|AQ)d*%G@gcg?CE&#a=_GFXP)Lcb4hk+BBZ8~wfhH-{Iw$u z*>-bN_gqSuvro3l=ov%z)Fx6VTG{tlY?%kf&O`XNjME?1F5t;8ddmiwoQ`GUGV=zE zIQQu548Y5WEg5b_?L8lxI{C9(O0uS}Rot4Iy5DZaws}}^_^&y#);WgOPK9s@XqD#J zNlAoZ91YX)MD8LLa^>b#e(}BC$%Z7O|JTKLfV1^~|Lah6m@O?$HMM7psuH6$S`uPY zTh-nbVpoSzYQ`!NirBM8B0{vZS|hP%G^$pO(3(Z@3;lkc=l}eZ=ehUhywCf*&pr2y z6RL_vpUFkIgnX0(@4N-p$hyT6M)n_T~k5=Z%06e2STCi zXI;h_ozxykl(7-FW|?o`Fy&8jd|cH_Q@tfzCH}g!_ss)M`7-NHlf6vd%{8@@EIdd3 z`N}k%kag?X9;Rm>lh*O*hdZ~fT>cIqhb;_i1ObS&W!rIs-7pqi{d0+dr@BKX2->0{ z78wC#eYU`$i5aS&{a{4b*VV3#g5uD+FXsI`&iB8Fk~1CrRYlZzR=+ydtp{i;k82Oj z!;Q?t&IwMQ5%OahbrP~S{SXn@zBz69Cc`N=bZ$zZ^R_F(gEyky<s2f1ztOHt3xLPqWJhDv&SU#NO{#fH@-KiXEF=l3i>NpQ>uQ{ zE;WW~@U!NC$p7Z?lLeCEh`d`)Bf6DKm3W2u|H!!JN=}uYkx8FMXTYz!$Ln^$GlHx< zUT<6hS0auSauzU`g%mhgrz=s0J9veT9|G|?1V3jwF$TOZ6nJ~d&mnv5yYjIjd0nl+ zKXhx)&vXe;mP!nQycQG_l8=P^Y)u3z|4)3yJ%(VT{ujseL;~sv%N1__@0@8Z{YU1Z zq0c05(_OTA-dly-Yz?~x3b7{G$Te-wk^32sPP|cAvMzm8pyJ*i68$>b^Vk-RjM*gdzk~+n4;tB3_wy6i#L`1p?v8>W_f(MCv4R- z-ZF!{OhINLT|S<_7E}0wy~pAvTrjK zU%r?fib7$#GTK+tV#G*QH!@J8sr`f>du2;yt7^#RJ~^{eMH*U_WvKpLV<1WcPLVXF z-`KZ3^fOL0GVU-vKba|6R;ym*h#wv_uBw->x*JEn(`zJGxFa%DRq5XB2MW!m*^pCq zmpjaDqW*jtVinfR>kb9;6_u0NQAt#TF~cB3m@x_NdeZ(W*jLK_(KmD3zt-)p$>4Nl zZ1-#m?fjB=;iO{K+PReruj<_J*MWTkBE4qcnA3hc?M-wKbS;Ya&FS?&Lf+&l$SsE2 zy{j=5ek#oV2x)}Xj-6cSuOAXN#iT+N0@+br*mXe7R>d8{s~&=Xpj$m`RGt_|iE<3i z#~$2`Vt44Z$unfLrcE^BADKH@gusk#)F?oFEib8cWa?>oCM;;sD#F2U)TJ>`2VcGN zQdt%c_!=@?eQ&J7EvK8g(vzX<>wt=>iBmNEcGJL8uU-UItWU2(D~<*ltTVJo&J7a; z_MLE+AOkLfJc()pr!@;?HGO^R`oW;luQDN7G?M^M;l%3xUq_5qzsQw3iCMnm!4dV@}%9v8^2?p^cb{;By5 z?&IRn2jNS)%m1#v{cGu#yXc}!o@-B`q-Byq2U)(r)ig;#>jnIbRA%bOj1O{8BMXK% zMfEMr0_HN4cD;%)m8qQzMva%;zeu-y6bMSMLy)!%04`Edo-YXd?L0!nw|y=iS_bCl ze20SKwDx%?b}1#klyR$Et2_4ooS!}$?aNNyZZ*_Su95M5X^B8Hxr}>_fLZPiHD4)} zYP(S#QOBDuc(~C#x3LqTp)+(17n^HVx`gvkDFlSV&Dw{cuIpu#vAs)Laa3zvR#eaM!B}Yc^|d@Uhn8 zp29h@EC`WwDZS3PlQbO~?64AkNst3*@#H0852ECa4GvvI zpY2MzL`sCrFAF$REAZNlF4T_-s4qdx(b+Yt7WS7Q-FiTex3xEi>cyt&wWjWr9kvbU zthYBX$LvGG8fA^&d58tj0ur9LttN%;HIe516kWB&YKs&@SNJGD8Za=|y8(bfMx1rY zpg%V^CzmapWP!M5WIX9BoFu2MVlrWZ^9#ve#qL`)}?A{w3R@8Z?k5hZbM2p4>*RH#!=GyBt z+{Nxmyh4BmYvj{B z`Y+AV`yNGjtmfu|lkdC@td>xe~u^VqidqY622MF9j5jC2Pm-~=>1ATnv3+2DZs z=CR5W0+c)ED2P7gzRA|OQf(C)`f4!ch@fuzl7%dL`!=}wACgz#Pu3q9zujfdL*%x$ z+~xps)@H}_AT^A(!={E=s6DWDT{nBt%e`i~{{1Oem|w!O`tiiNGrF-Tm4)=xdO?Pf zv*F@Um_!ErX{`(Y&~d9q-8B!AU`CBqN8OwE-j8d;w?B>U)Fd8P2lG`j;53HAC<;qy z?fqxC6AI{82zWZc~X-D#K zzwCKs}E5`yZ0OQ+0m}Hh4%nFvQ*zUqv6feq8 zXH{RuauBSNncj&c7xoUpo<7@b&Mu5{nDl$J8P=SsRZx6hHm8tl!N4zacFDChQ^LP0 zv65^Unpkl!{k;bslHRViHXChZKaC_jX?#dB{W=r9Kx{zmrchk7OGQ?sP0n;uu)*J} zl2)_0IQbbEvpGI?Yno7=cb!J@$w>}q!)CoydRN--5aWEJKV0)G(4@-TJR=;{LyQolISrw zwD7YuE`PreaQKq&xS%{U^1PbD*cLCfQ)D5x3uZ00kK9n=a zCSbk0LDknn8c$D|bk#WG=|_g2&4-<3S7i7Yn55mfUNW~@xYN7bOsSH%w!Lz`U}ewR zy8e%Wc_!A`#7g3=BWmj6;`ukyO6v}GGIuWL(9#P6k6A`K5$lIprCE0c@(yQU8Ow2}-bfdCZgeMYnvXVe?=L z`27hW#_Ahs>$Qoa0P$X4svuBDGjCRVbC<^yoO+xHe4k=C5{q!hv47S4zavcyOdq94 zG(L{QuG;?&f9Qpuxn33sxspA%XvI4Bw*wD|%u*UU`E|fjfLRTaMw8Xl9HD=+DX7X92>(66};$ls1u?vFx1AfzUh5 z?#HhBB{3grRh^*OKVvsxsWv|e`O_vZu)Y5?mkEA4*$6uwHgH*PMEKIxR)Hs91X=m0 zT5Cn7ZBH7LY;~ozLfy?hD|72*1i!s6qb|0(((nSlFaZuZ#0x23n8xy{vw#tJcMgR< z^b0ev4tvG_K^IXLlvbeyJ^9V@6&u~`;~%nBJ*-a7o|Vv!=}`6`OCBKyf7FtFhnPk1 zxc+$#nlSs*c?zoar`Q{C%xLQ^oH0w!?SA4V+Q4+VZvOP#xJQnRz1)a9A`R*0+;iDM ziaSTfmwJoHqHFr==NwqG*eGpH{?aA#4gWZ(H%ZANN26`t75)nu@)%l@k;ud{z zvUaVFs&b~i#MIbPdK*(Wp>CqzcPq;^<`ZlzPL9HueB@Gz4Y@{4D7+f0Wkrpgo&!Ur zcF{<&jJLZzqJupy8BMhhfypf2ESZ4e+R8Nj!dX@8*R=r0gjlY;;QD-|7%)8X zDSBxS&h*W)<5s09O~D$|-9n!5AD;^-h;kS^&Z+F?mh{HLZD=EjlTS-TCI)q8RNJtRB#^hl(b*Qy4JwUIVa*aRW&Y_0MmJQt4> zJaqN6cxdA*OM5!OaILNCW*%JgBQcedohxMDN?@j$NHZ=z@jN01>GtTvk9wX4+hi!Z<%Jm^5F#J6Lc;pX!v`sObwqYEKr)_e_*=SDlN*@F@rtR(R^ka_r z61zYB|13rz+IaY}By`tpx(Lj&VfzD69+ zoh24~%*E`>DPU7iVPQ6bGVodyP0kPY3qn4%ToLyqg~nawl$2yZ)1(D`Ja10e(hSk8 zt41!(00ZaGt-C%J#a?{_@{YAvepWQY2s~r^2F>RPWJ4R+KGI?YeiHLi4M5*#%uN|& zN~#rNKz2qil$2=JBT=DG934%-W5YaCoZ_?RmQPBTwT_7TUoH;G6wg!r0M~p-q*-n; zD<(dF<1me&!Jt$vqK+Qd(bc8T6C0CC^c6{t70y~Va%P-8$0=}2ql7O!vBS|Rc#pEL zn=OYy*r$Q%7$>%BCSnS&pHLjz*`m>(b4|H2q|b~dy`_6+w~`g;2ML@NMcdy;xy9LI zSoDP{isfFN7}hPZfQbHz2Oh8LV-g2$5H8e2ID+gr=+N4uJ@}|A4%%5oDU++$*Fy0j zgsXqOCByo5Kxe5@mm(7TMsRQM@U*1atFK1ZT2TK?k9@%4e0~o1wW3N z<9su>ZQn&wOkAqK*hTMmZKyV>nVoq>Ut3%1a6*(BSGlNa^{AGk>EjNIvjl*@+4 zmd|ZAr6oQpfi*V+-k4IGs?G{)=BBVKN4U@TRdvdCTRBV~CLg3<826zndh-!?1yg$S z(-jZ{VUJttJWp&5=G?{aq^BEdCPq20<>AbG^NI5Oju%~KloM6yqCyL@gdQK zUT&Xy^vUZfqSg(DhtFiu;guRffJ`$j0`}q8;_tT&RM8b8`+j}qc6D^%+2uP1RJ6jG z>xp7%o^-cj-8L7W1e>bML0%)*7GcQn@4p6J`_0IV`njo7ddHWQ&*c=EPIwr<~swdb{bwJ4WLZ z*o%XY6{-)QO#s=T?aB>jlG2M@whE^uAz7H(Di0}Xauz? zfE;~qwAfCae2;d5j4bz`bZ)t`lHoTlA0Q@#JWVTg;xynkZ|L8J1Byzr7Rn}cnZa
      About this document - This document is the user manual for WinMerge 2.8. It explains the capabilities and limitations of WinMerge. This manual is recommended reading for both new and experienced users. + This document is the user manual for WinMerge 2.8. It explains the + capabilities and limitations of WinMerge. This manual is recommended reading + for both new and experienced users. - To learn essential WinMerge basics, please read the following topics: + To learn essential WinMerge basics, please read the following + topics: - Quick start + - Gets you quickly started with WinMerge and shows its basic usage. + Gets you quickly started with WinMerge and shows its basic + usage. - Comparing folders + - Explains the folder comparison window, available operations, and customizing the results display. + Explains the folder comparison window, available operations, and + customizing the results display. - Comparing files + - Explains the file comparison/merge window, available operations, methods of navigation, and modes. + Explains the file comparison/merge window, available operations, + methods of navigation, and modes. - Options and configuration + - Explains how to customize WinMerge, including handling whitespace, colours, and text encoding. + Explains how to customize WinMerge, including handling whitespace, + colours, and text encoding. @@ -44,44 +51,53 @@ - Opening files and folders + - Introduces several ways to open files and folders in WinMerge - there are many! For example, do you know how to use the Shell Extension context menu in advanced mode? + Introduces several ways to open files and folders in WinMerge - + there are many! For example, do you know how to use the Shell Extension + context menu in advanced mode? - Plugins + - Describes the optional, extra features that you can add to WinMerge using its plugin mechanism. + Describes the optional, extra features that you can add to + WinMerge using its plugin mechanism. - Filters + - Explains how to control what is compared in the folder or file comparison window. + Explains how to control what is compared in the folder or file + comparison window. - Commandline + - Lists command-line parameters for using WinMerge with other tools or from a script. + Lists command-line parameters for using WinMerge with other tools + or from a script. - FAQ + - Contains answers to many common questions asked of developers. + Contains answers to many common questions asked of + developers. - Before submitting questions to SourceForge.net, please check the FAQ first to see if your question is answered there. + Before submitting questions to SourceForge.net, + please check the FAQ first to see if your question is answered + there. diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml index f75e1350745..3e17413957f 100644 --- a/Docs/Users/Manual/Command_line.xml +++ b/Docs/Users/Manual/Command_line.xml @@ -5,8 +5,8 @@ Command Line WinMerge accepts several parameters from command line, in addition to - paths to compare. Most of these parameters are intended for using WinMerge - as an external compare application. Or for starting from batch files. + paths to compare. Most of these parameters are intended for using WinMerge as + an external compare application. Or for starting from batch files. Syntax for the command line is: @@ -63,13 +63,13 @@ - tells WinMerge to compare folders - recursively . Normally WinMerge does not compare subfolder contents but - does the "flat" compare showing the files in compared folders and - subfolders as separate items. Using /r tells WinMerge to compare all - files in all subfolders. When subfolders are included, only unique - subfolders are visible as separate items in compare results. Note that - including subfolders can increase compare time remarkably. + tells WinMerge to compare folders recursively + . Normally WinMerge does not compare subfolder contents but does the + "flat" compare showing the files in compared folders and subfolders as + separate items. Using /r tells WinMerge to compare all files in all + subfolders. When subfolders are included, only unique subfolders are + visible as separate items in compare results. Note that including + subfolders can increase compare time remarkably. @@ -81,55 +81,53 @@ allows selecting filter used. Filter can be - filemask like "*.h *.cpp" or name of filefilter - like "XML/HTML Devel". Quotation marks must be used - if filter mask or name contains spaces. + filemask like "*.h *.cpp" or name of filefilter like + "XML/HTML Devel". Quotation marks must be used if + filter mask or name contains spaces. - closes WinMerge if opened files are - identical (after information dialog is shown). This parameter is useful - when WinMerge is used as an external compare application. It helps to - faster process and/or ignore files which don't have any differences. - Note that this option does not apply when files become identical when + closes WinMerge if opened files are identical + (after information dialog is shown). This parameter is useful when + WinMerge is used as an external compare application. It helps to faster + process and/or ignore files which don't have any differences. Note that + this option does not apply when files become identical when merging/editing them. - enables single-instance behavior. If there - is already WinMerge running new compare is opened to that same instance. - Depending on other settings (if multiple windows are allowed) new - compare is opened to existing or new window. + enables single-instance behavior. If there is + already WinMerge running new compare is opened to that same instance. + Depending on other settings (if multiple windows are allowed) new compare + is opened to existing or new window. - tells WinMerge to not add left path to - MRU. External applications should not add paths to Open-dialog's MRU + tells WinMerge to not add left path to MRU. + External applications should not add paths to Open-dialog's MRU lists. - tells WinMerge to not add right path to - MRU. External applications should not add paths to Open-dialog's MRU + tells WinMerge to not add right path to MRU. + External applications should not add paths to Open-dialog's MRU lists. - tells WinMerge to not add both paths to - MRU. External applications should not add paths to Open-dialog's MRU + tells WinMerge to not add both paths to MRU. + External applications should not add paths to Open-dialog's MRU lists. - initially opens left side as read-only. - Use this when you don't want to change left-side items in - compare. + initially opens left side as read-only. Use + this when you don't want to change left-side items in compare. - initially opens right side as read-only. - Use this when you don't want to change right-side items in - compare. + initially opens right side as read-only. Use + this when you don't want to change right-side items in compare. @@ -145,24 +143,24 @@ adds a description for left side shown - instead of folder / filename. This allows showing version number or - label for compared items. Like "Version 1.0" or "Work Copy". + instead of folder / filename. This allows showing version number or label + for compared items. Like "Version 1.0" or "Work Copy". adds a description for right side shown - instead of folder / filename. This allows showing version number or - label for compared items. Like "Version 1.0" or "Work Copy". + instead of folder / filename. This allows showing version number or label + for compared items. Like "Version 1.0" or "Work Copy". - leftpath is the folder or filename - to open on the left side. + leftpath is the folder or filename to + open on the left side. - rightpath is the folder or filename - to open on the right side. + rightpath is the folder or filename to + open on the right side. @@ -183,29 +181,28 @@ File.txt WinMerge now compares files C:\Folder\File.txt and C:\Folder2\File.txt Usually WinMerge requires that both path parameters - (leftpath and - rightpath) point to folders or files. It is not - possible to compare folder to file (except in case described in above note). - If WinMerge cannot find any of given paths, it opens Open-dialog. + (leftpath and rightpath) + point to folders or files. It is not possible to compare folder to file + (except in case described in above note). If WinMerge cannot find any of given + paths, it opens Open-dialog. Third path given in command line is rarely needed when WinMerge is started from command line. It is meant to be used with many version control tools which use third path as a "result" file. WinMerge - always shows two files in file compare, the third path is a path where any - of these files gets saved into, leaving other two paths intact. + always shows two files in file compare, the third path is a path where any of + these files gets saved into, leaving other two paths intact. Usually these tools use terms like "theirs", "mine" and "merged "/ " - resolved" about these three files. And those paths - should be given in that order for WinMerge. + resolved" about these three files. And those paths should + be given in that order for WinMerge.
      Conflict File - Conflict file can be given to command line as one path to the - conflict file. There cannot be second or third path with conflict file. - After WinMerge opens the given conflict file, it can be resolved like - described in Resolving Conflict - Files. + Conflict file can be given to command line as one path to the conflict + file. There cannot be second or third path with conflict file. After + WinMerge opens the given conflict file, it can be resolved like described in + .
      diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index 453ef949285..9d69a462172 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -15,9 +15,8 @@ File Compare Window - WinMerge editor is not comparable to specialized editor programs, but - it has basic features like - Undo/Redo, + WinMerge editor is not comparable to specialized editor programs, but it + has basic features like Undo/Redo, Find/Replace and Goto (to linenumber). The editor also has a syntax highlighting feature supporting several file formats (colors configurable). @@ -25,8 +24,8 @@ Syntax highlighting can be disabled from options. - If Automatic rescan is not enabled manual - refresh is recommended after editing. + If Automatic rescan is not enabled manual refresh + is recommended after editing.
      @@ -48,8 +47,7 @@ Tab Bar . When the tab bar is shown it has one tab for every open - window. The tab contains last part of the folder names or file - names. + window. The tab contains last part of the folder names or file names.
      @@ -64,24 +62,24 @@ - Headerbar shows full path to the open file. If the path is longer - than available space one part of the path is replaced with an ellipsis - (...). Headerbar also shows: + Headerbar shows full path to the open file. If the path is longer than + available space one part of the path is replaced with an ellipsis (...). + Headerbar also shows: - the current active file with sunken border (like in the - above screenshot), the non-active file is shown with flat + the current active file with sunken border (like in the above + screenshot), the non-active file is shown with flat headerbar. - if the file has been modified (has unsaved changes). This - is indicated by adding asterisk (*) before the + if the file has been modified (has unsaved changes). This is + indicated by adding asterisk (*) before the filename, like in the screenshot. - Headerbar has a context menu with items to copy full path or - filename to clipboard. + Headerbar has a context menu with items to copy full path or filename + to clipboard.
      @@ -89,8 +87,7 @@ - + @@ -135,8 +132,8 @@ - encoding: this pane shows codepage number for ANSI files - and Unicode encoding type for Unicode files + encoding: this pane shows codepage number for ANSI files and + Unicode encoding type for Unicode files @@ -169,8 +166,8 @@ Difference X of Y : amount of - differences (Y) and number of selected - difference (X) + differences (Y) and number of selected difference + (X)
      @@ -178,8 +175,8 @@
      Editor Margin - The editor panes (file panes) have optional gray margin area for - line numbers and some symbols. This margin can be shown/hidded from menu + The editor panes (file panes) have optional gray margin area for line + numbers and some symbols. This margin can be shown/hidded from menu View @@ -251,9 +248,9 @@
      Selecting a difference - Before difference can be merged, it must be selected. Selecting - can happen by difference navigation keys/items (see below) or by - selecting wanted difference directly: + Before difference can be merged, it must be selected. Selecting can + happen by difference navigation keys/items (see below) or by selecting + wanted difference directly: @@ -273,8 +270,8 @@ Merge-menu has items for navigating to next/previous and first/last difference. Navigation is always done based on current cursor location. So Next - Difference-command selects next difference from cursor, - not from current selected difference. + Difference-command selects next difference from cursor, not + from current selected difference. When difference is selected with navigation commands cursor is @@ -305,15 +302,14 @@ Go To line or difference Using Go To from - Edit-menu user can jump to certain line or - difference. Go To -dialog shows current line and side when - opened. + Edit-menu user can jump to certain line or difference. + Go To -dialog shows current line and side when opened. - Go To line number is useful if there is need to merge same - change to several target files from one original file. Rather than - using Find or difference navigation it is - faster to jump to first line of difference. + Go To line number is useful if there is need to merge same change + to several target files from one original file. Rather than using + Find or difference navigation it is faster to + jump to first line of difference.
      @@ -324,22 +320,20 @@ Merging Differences Merging commands are located in Merge-menu after - navigation commands. Basically there are only two types of merging - commands - copy difference from right to left and copy difference from - left to right. Additional commands make merging several differences - easier. + navigation commands. Basically there are only two types of merging commands + - copy difference from right to left and copy difference from left to right. + Additional commands make merging several differences easier.       Copy to Right and Copy to - Left copy difference from side to side. At simplest this - means replacing text in destination difference with text in source - difference. But because difference can contain also removed lines, new - lines may be created or some lines removed. If there are several - differences selected, then all fully selected differences are merged with - one command. This makes merging many small differences a lot - faster. - - WinMerge rescans files after every merging operation. This is done - to ensure differences were copied correctly and all changes after last + Left copy difference from side to side. At simplest this means + replacing text in destination difference with text in source difference. But + because difference can contain also removed lines, new lines may be created + or some lines removed. If there are several differences selected, then all + fully selected differences are merged with one command. This makes merging + many small differences a lot faster. + + WinMerge rescans files after every merging operation. This is done to + ensure differences were copied correctly and all changes after last rescanning are taken care of. If Automatic rescan-option is not set, user may have edited files and differences may not have shown correctly before merging. If result of @@ -349,8 +343,8 @@ It is strongly advised to run Rescan (F5) before merging differences if Automatic rescan is set off. Usually files get out of sync when editing - and merging differences may have unpredictable results. If merging - result looks incorrect try undoing ( + and merging differences may have unpredictable results. If merging result + looks incorrect try undoing ( Edit Undo @@ -362,8 +356,8 @@ Copy to Right/Left and Advance-commands - merge current difference and then select next difference (if there is - one). Using these commands makes merging several differences easier and + merge current difference and then select next difference (if there is one). + Using these commands makes merging several differences easier and faster. Copy All to Right/Left-commands sync two @@ -371,11 +365,10 @@ operation with one undo command. - Enable Automatically scroll to first - difference -option from general options. This saves you from - scrolling to first difference and selecting it. See Options & Configuration -chapter for - more information. + Enable Automatically scroll to first difference + -option from general options. This saves you from scrolling to first + difference and selecting it. See for more + information. @@ -400,9 +393,9 @@ - Unlike the normal mode, in this schema the Alt-key - is not needed for these basic operations (which makes them quicker and - more convenient). Note that + Unlike the normal mode, in this schema the Alt-key is + not needed for these basic operations (which makes them quicker and more + convenient). Note that Shift Arrow @@ -418,20 +411,20 @@ Arrow keys work in merge mode like in normal mode. - When merge mode is enabled Merge text is shown - in statusbar. + When merge mode is enabled Merge text is shown in + statusbar.
      Refreshing - Refreshing updates differences after changes are made to files. It - is important to do a refresh before merging changes between files. + Refreshing updates differences after changes are made to files. It is + important to do a refresh before merging changes between files. Refresh does not reload file. That means, if another programs has - updated files etc, those changes are not seen. Refresh updates - differences according changes user has done. + updated files etc, those changes are not seen. Refresh updates differences + according changes user has done.
      @@ -452,8 +445,8 @@ Normal editing features work in WinMerge editor. User can type and delete text, select text, copy, cut and paste text etc. There is some customisation because there can be removed lines in files (lines existing - only in other side). Anyway these customisations are not usually visible - to users otherwise that lines can sometimes "jump" when WinMerge has to + only in other side). Anyway these customisations are not usually visible to + users otherwise that lines can sometimes "jump" when WinMerge has to relocate matching/non-matching files. @@ -477,25 +470,23 @@       .       With default settings WinMerge uses whitespace characters (namely - spaces and tabulators) to separate words. WinMerge does not consider - commas or dots as word separators. That means WinMerge thinks "For - Example" is two words but "For,Example" is one word. More characters can - be included as word-separator characters from editor options (select from - menu + spaces and tabulators) to separate words. WinMerge does not consider commas + or dots as word separators. That means WinMerge thinks "For Example" is two + words but "For,Example" is one word. More characters can be included as + word-separator characters from editor options (select from menu Edit Options - and Editor page). See Options & Configuration -chapter for - more information. + and Editor page). See for more information.
      Line Difference Selection Many times it is useful to see exact differences inside lines. - WinMerge can highlight different area between lines. This feature is - called Select Line Difference. It is available in + WinMerge can highlight different area between lines. This feature is called + Select Line Difference. It is available in Edit-menu, toolbar and shortcut key (F4). In screenshot below there is one difference highlighted @@ -510,8 +501,8 @@
      Location Pane - Location pane is a handy side-pane showing a overall (difference) - map of files compared. + Location pane is a handy side-pane showing a overall (difference) map + of files compared. @@ -535,17 +526,17 @@ - area visible in editor panes is shown with different - background color + area visible in editor panes is shown with different background + color - Clicking with mouse in Location Pane moves cursor to place clicked - in file. Right-clicking with mouse opens the context menu with items to - select line to go to. And the visible area locator (area with different - background color) can be used like a scrollbar thumb - after pressing down - the left mouse button over it can be dragged upwards and downwards to - scroll the files. + Clicking with mouse in Location Pane moves cursor to place clicked in + file. Right-clicking with mouse opens the context menu with items to select + line to go to. And the visible area locator (area with different background + color) can be used like a scrollbar thumb - after pressing down the left + mouse button over it can be dragged upwards and downwards to scroll the + files.
      @@ -560,9 +551,9 @@ - Most of these items are familiar from Main menu. Worth noting is - last item Open. It allows to open file with - (system) registered application or with external editor. Also context menu + Most of these items are familiar from Main menu. Worth noting is last + item Open. It allows to open file with (system) + registered application or with external editor. Also context menu merge-commands are not relative to active file. They always merge the selected difference.
      @@ -577,8 +568,7 @@ . Due to limitations in the editor, only fixed width fonts are supported in WinMerge. - Font suggestions for use of WinMerge with East Asian - languages: + Font suggestions for use of WinMerge with East Asian languages: @@ -587,8 +577,8 @@ - Traditional Chinese texts with the - MingLiU fixed-width font, or + Traditional Chinese texts with the MingLiU + fixed-width font, or @@ -597,10 +587,10 @@ - Korean texts with the GulimChe - fixed-width font (not Gulim as this variant uses proportional-spacing - glyphs that are not centered in grid cells and then poorly aligned in - fixed-width mode) + Korean texts with the GulimChe fixed-width + font (not Gulim as this variant uses proportional-spacing glyphs that + are not centered in grid cells and then poorly aligned in fixed-width + mode)
      @@ -613,9 +603,9 @@ WinMerge can resolve conflict files several version control systems produce when merging files. Conflict file is basically two different versions of files embedded into one file. WinMerge reads this file and - separates it into its original files, and shows those files in file - compare. So conflicted file can be resolved using normal WinMerge file - compare functionality. + separates it into its original files, and shows those files in file compare. + So conflicted file can be resolved using normal WinMerge file compare + functionality.
      Opening Conflict Files @@ -625,13 +615,13 @@ Open Conflict File... . Conflict file to resolve can be selected using file - selection dialog that opens. At the moment there are no other ways to - open conflict files. + selection dialog that opens. At the moment there are no other ways to open + conflict files. WinMerge overwrites original conflict file. If original file is - wanted to save, it must be copied to another folder or another - filename before opening it into WinMerge. + wanted to save, it must be copied to another folder or another filename + before opening it into WinMerge.
      @@ -639,16 +629,15 @@ Conflict Resolving WinMerge opens conflict file into normal file compare (see above). - All normal WinMerge file compare features are in use. Files in two - panels are: + All normal WinMerge file compare features are in use. Files in two panels + are: Left panel: this file is called "theirs" file. It is usually the file that is in - version control system's repository. This file usually cannot be - edited. An as such, WinMerge opens left-side file as read-only. - Differences can be moved only from this file to the another - file. + version control system's repository. This file usually cannot be edited. + An as such, WinMerge opens left-side file as read-only. Differences can + be moved only from this file to the another file. Right panel: this file is called "mine" file. It is the user's working file @@ -657,22 +646,20 @@ After the wanted resolved file is in right-side panel, it can be - saved like normal file. WinMerge saves the file over original - file. + saved like normal file. WinMerge saves the file over original file. - Left side "mine" file is set to modified - after opening conflict file. This allows fast resolve by just saving the - file when user's file is the wanted end result. This also prevents - accidentally not resolving the files. As resolving only happens when - file is saved. If file is no saved, original conflict file is kept - unmodified. + Left side "mine" file is set to modified after + opening conflict file. This allows fast resolve by just saving the file + when user's file is the wanted end result. This also prevents accidentally + not resolving the files. As resolving only happens when file is saved. If + file is no saved, original conflict file is kept unmodified. Many version control tools allow configuring external merge tool. WinMerge accepts three filenames ("Theirs", "Mine" and "Resolved") as - command line parameters. See more info from Command Line -chapter. Single path to the - conflict file is also accepted in command line. + command line parameters. See more info from . Single path to the conflict file is also + accepted in command line. diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml index 022d6d42052..8a5506a6e0a 100644 --- a/Docs/Users/Manual/Faq.xml +++ b/Docs/Users/Manual/Faq.xml @@ -17,16 +17,15 @@ WinMerge.exe is an ANSI (8-bit) - executable which works in all 32-bit Windows systems. It does - not have Unicode support. + executable which works in all 32-bit Windows systems. It does not + have Unicode support. Internally, it stores only ANSI characters (256 - possibilities). If you open a Unicode file, the characters must - be converted to the ANSI codepage. As there are over 100,000 - Unicode characters, and only 256 can be represented in the ANSI - codepage, data loss may occur. Conversion may be approximative - (accents are lost), or impossible (characters appear as - "?"). + possibilities). If you open a Unicode file, the characters must be + converted to the ANSI codepage. As there are over 100,000 Unicode + characters, and only 256 can be represented in the ANSI codepage, + data loss may occur. Conversion may be approximative (accents are + lost), or impossible (characters appear as "?"). WinMerge.exe also can not open files with names outside the current ANSI codepage (e.g., WinMerge.exe @@ -71,11 +70,11 @@ Browse to the folder you want to compare (folder contents is shown in the dialog). Do not select any of the files or subfolders, just select the Open-button when - "Folder Selection" is shown in filename - editbox. If you already selected any of the files or subfolders, - just write some nonsense to the filename editbox and select the - Open-button. When the filename editbox doesn't contain any existing - filename then WinMerge opens the folder. + "Folder Selection" is shown in filename editbox. + If you already selected any of the files or subfolders, just write + some nonsense to the filename editbox and select the Open-button. When + the filename editbox doesn't contain any existing filename then + WinMerge opens the folder. @@ -90,9 +89,8 @@ Unfortunately not. We acknowledge it would be good feature but have no plans to implement it in near future. This can be somewhat worked around by using two WinMerge instances. Or using third path - parameter given from command line. See Command Line -chapter for more - information. + parameter given from command line. See + for more information. @@ -105,8 +103,8 @@ Not currently. If somebody wants to help/work with cross-platform support (using wxWidgets for example) we - are interested, of course. + url="http://www.wxwidgets.org/">wxWidgets for example) we are + interested, of course. @@ -117,10 +115,9 @@ Which kind of CVS integration WinMerge should have? Adding CVS - client features to WinMerge is questionable since there are many - good CVS clients already. WinMerge can resolve conflict files, see - Resolving Confilict - Files. + client features to WinMerge is questionable since there are many good + CVS clients already. WinMerge can resolve conflict files, see . @@ -130,8 +127,8 @@ - MRU is the abbreviation for "Most Recently Used", and means - the history lists in the Open-dialog which contain the 20 last used + MRU is the abbreviation for "Most Recently Used", and means the + history lists in the Open-dialog which contain the 20 last used files/paths per side. @@ -156,17 +153,17 @@ This is because WinMerge uses the "Quick - Compare" method for large files always. It allows - WinMerge to compare large files more efficiently. To test if this is - causing the behavior you're seeing, you could raise the limit for - the Quick Compare threshold for large files. It - is stored in the registry as: + Compare" method for large files always. It allows WinMerge + to compare large files more efficiently. To test if this is causing + the behavior you're seeing, you could raise the limit for the + Quick Compare threshold for large files. It is + stored in the registry as: HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit You may consider raising this limit if you constantly compare - large text files. Be careful to not raise it too much "for just to - be sure". 100 MB is too much. + large text files. Be careful to not raise it too much "for just to be + sure". 100 MB is too much. The default value for the limit is 4MB (0x400000). @@ -174,9 +171,8 @@ - WinMerge shows an error (or even crashes!) complaining it - cannot load CompareMSWordFiles.dll and/or - CompareMSExcelFiles.dll! + WinMerge shows an error (or even crashes!) complaining it cannot + load CompareMSWordFiles.dll and/or CompareMSExcelFiles.dll! @@ -194,11 +190,10 @@ Download the Visual Basic 6.0 runtime distribution from Microsoft:http://support.microsoft.com/kb/290887 - and install it. Or download just the one needed file from: - http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60 - and copy it to the WinMerge folder. + and copy it to the WinMerge + folder. @@ -218,8 +213,8 @@ When installing from archive (zip, 7z) file you need also - Runtimes-package, which contains those files. See the Install instructions. + Runtimes-package, which contains those files. See the . @@ -231,19 +226,18 @@ - Why my files have all lines marked different (colored) even if - I know all lines are not different? + Why my files have all lines marked different (colored) even if I + know all lines are not different? - Maybe your files have different line-ending styles (e.g. - Windows and Unix?). WinMerge by default compares also line-ending - styles, but you can disable it from + Maybe your files have different line-ending styles (e.g. Windows + and Unix?). WinMerge by default compares also line-ending styles, but + you can disable it from Edit Options - / Compare / Ignore carriage return - differences. + / Compare / Ignore carriage return differences. @@ -298,18 +292,17 @@ - What is delaying of (automatic) rescan? Why it is - needed? + What is delaying of (automatic) rescan? Why it is needed? - When Automatic Rescan is enabled, - WinMerge delays rescanning while user edits files. So there is no - rescanning happening when user types text but shortly after user has - finished typing. Without this delaying WinMerge would do rescan - after every typed letter and editing files would become slow. This - delaying especially improves editing of bigger files which can take - several seconds to rescan. + When Automatic Rescan is enabled, WinMerge + delays rescanning while user edits files. So there is no rescanning + happening when user types text but shortly after user has finished + typing. Without this delaying WinMerge would do rescan after every + typed letter and editing files would become slow. This delaying + especially improves editing of bigger files which can take several + seconds to rescan. @@ -330,14 +323,14 @@ - Can I hide similar lines in editor (so that only different - lines are visible)? + Can I hide similar lines in editor (so that only different lines + are visible)? No, you can't. Many users have requested this feature but we - don't have any plans to implement it. We don't believe it would - really improve usability. + don't have any plans to implement it. We don't believe it would really + improve usability. @@ -378,8 +371,8 @@ Tell your external program to invoke WinMerge with the - option, which tells WinMerge to not add the - files to the MRU. + option, which tells WinMerge to not add the files + to the MRU. @@ -425,8 +418,8 @@ - If the error is something like: "7-zip x.xx missing - / Plugin present", then you probably have installed 7-Zip + If the error is something like: "7-zip x.xx missing / + Plugin present", then you probably have installed 7-Zip using MSI-installer. There are 7-Zip MSI installers that do not install all the files WinMerge needs (namely 7zip_pad.xml in 7-Zip program folder). Download @@ -436,17 +429,16 @@ - How can I open "Perry-style" patch files WinMerge developers - use when submitting patches? + How can I open "Perry-style" patch files WinMerge developers use + when submitting patches? "Perry-style" patches are zip-files containing original and - changed files in different directories. WinMerge has internal - support (surprise?) for handling these files. Just select zip file - in question to left side and right side and WinMerge opens zip files - contents to folder compare comparing original and altered - files. + changed files in different directories. WinMerge has internal support + (surprise?) for handling these files. Just select zip file in question + to left side and right side and WinMerge opens zip files contents to + folder compare comparing original and altered files. @@ -499,16 +491,16 @@ File Save As - , and in the Save As dialog which appears, look at - the dropdown list at the very bottom, labelled + , and in the Save As dialog which appears, look at the + dropdown list at the very bottom, labelled "Encoding". If it says "ANSI", the file is (apparently) in the local windows codepage. If the file is - entirely in English and normal punctuation, then the file is - also in ASCII. + entirely in English and normal punctuation, then the file is also + in ASCII. @@ -518,14 +510,14 @@ - If it says "UTF-8", the file is in - the cross-platform Unicode encoding "UTF-8". + If it says "UTF-8", the file is in the + cross-platform Unicode encoding "UTF-8". If it says "Unicode big endian", the - file is in a different Unicode encoding not much used or - supported under Windows, probably "UCS-2BE". + file is in a different Unicode encoding not much used or supported + under Windows, probably "UCS-2BE". @@ -554,10 +546,10 @@ - For WinMerge to read encodings specified in XML or HTML - (or Windows RC resource) files, the option checkbox - Detect codepage info for... in - Codepage options ( + For WinMerge to read encodings specified in XML or HTML (or + Windows RC resource) files, the option checkbox Detect + codepage info for... in Codepage + options ( Edit Options @@ -568,9 +560,9 @@ For all other cases, to instruct WinMerge to assume that all - documents are UTF-8, set the default WinMerge codepage to 65001 - (which is Microsoft's code for UTF-8) in - Codepage options ( + documents are UTF-8, set the default WinMerge codepage to 65001 (which + is Microsoft's code for UTF-8) in Codepage + options ( Edit Options @@ -587,16 +579,14 @@ - Is there way to create patch files from the - commandline? + Is there way to create patch files from the commandline? - No. It may be added in later versions but until then Win32 - port of diffutils can be used. The Win32 port of diffutils (and - patch) can be downloaded from GnuWin32 - project from SourceForge: + No. It may be added in later versions but until then Win32 port + of diffutils can be used. The Win32 port of diffutils (and patch) can + be downloaded from GnuWin32 project from + SourceForge: http://sourceforge.net/projects/gnuwin32 @@ -608,8 +598,8 @@ No. The patch tool from GnuWin32 project can be used for patch - applying since WinMerge produces GNU/diffutils compatible patch - files. See above question. + applying since WinMerge produces GNU/diffutils compatible patch files. + See above question. diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index d2b0db2870c..f1427a3c628 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -2,53 +2,83 @@ \ No newline at end of file diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index f2b0a51e902..8a68a529c2f 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -124,6 +124,8 @@ I get the partial list, but no Abort indicator.-->
      Folder Compare window<indexterm> <primary>Folder Compare window</primary> + + <seealso>Compare windows</seealso> </indexterm> The Folder Compare window shows the result of a folder compare in a @@ -591,7 +593,7 @@ I get the partial list, but no Abort indicator.--> copying from Folder Compare window - filenames + file names copying from Folder Compare window @@ -1213,4 +1215,4 @@ added/deleted/copied. User can create a new archive file using above menuitems i
      - + \ No newline at end of file diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index 6e952eb4c67..1c9291efc66 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -47,6 +47,8 @@
      File Compare window<indexterm> <primary>File Compare window</primary> + + <seealso>Compare windows</seealso> </indexterm> The File Compare window displays compared files in two File panes, @@ -536,7 +538,9 @@ Moved differences - moved differences, in File Compare window + moved differences + + in File Compare window @@ -630,7 +634,7 @@ for File Compare window - tab + tabs character encoding @@ -690,7 +694,7 @@ - File encoding + File encoding Codepage number for ANSI files, Unicode encoding type for @@ -884,7 +888,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637--> Difference in the Current Line/Select Line Difference - Difference in the Current LIne function + Difference in the Current Line function Select Line Difference function @@ -1161,7 +1165,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637--> Merging differences amounts to copying them from one File pane to the - other — either left to right, or right to left. This is different from + other: either left to right, or right to left. This is different from directly editing text using WinMerge's editing functions (described earlier in this topic). diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index f1427a3c628..9e1a8126c49 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -282,7 +282,7 @@
      -
      +
      <indexterm> <primary>installing archive support</primary> </indexterm>7-Zip and archive support @@ -423,4 +423,4 @@
      - + \ No newline at end of file diff --git a/Docs/Users/Manual/Introduction.xml b/Docs/Users/Manual/Introduction.xml index 4f3be39e2d5..376ee0c07b1 100644 --- a/Docs/Users/Manual/Introduction.xml +++ b/Docs/Users/Manual/Introduction.xml @@ -2,29 +2,55 @@
      Introduction to WinMerge - WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle. - - WinMerge is highly useful for determining what has changed between project versions, and then merging changes between versions. WinMerge can be used as an external differencing/merging tool or as a standalone application. - - In addition, WinMerge has many helpful supporting features that make comparing, synchronising, and merging as easy and useful as possible. Several programming languages and other file formats are syntax-highlighted. - - WinMerge is not a hex editor. WinMerge can show binary files contents and differences between them. But the information is meant for viewing only: editing binary files with WinMerge can break the files. - - The goal of WinMerge development is to make comparing, synchronizing, and merging folders and files easy and fast, while maintaining maximum reliability. Ease of use is of key importance for reducing errors. The latest 2.8 version is considered a stable and reliable program to use. - - Please note that WinMerge is not freeware (as many sites on the Web have stated): it is GPL licensed. We provide you with a good tool for free, so please honor your license agreement and submit improvements to us. We are happy to get help improving WinMerge, to the advantage of all WinMerge users. + WinMerge is an Open + Source differencing and merging tool for Windows. WinMerge can compare + both folders and files, presenting differences in a visual text format that is + easy to understand and handle. + + WinMerge is highly useful for determining what has changed between + project versions, and then merging changes between versions. WinMerge can be + used as an external differencing/merging tool or as a standalone + application. + + In addition, WinMerge has many helpful supporting features that make + comparing, synchronising, and merging as easy and useful as possible. Several + programming languages and other file formats are syntax-highlighted. + + WinMerge is not a hex editor. WinMerge can show binary files contents + and differences between them. But the information is meant for viewing only: + editing binary files with WinMerge can break the files. + + The goal of WinMerge development is to make comparing, synchronizing, + and merging folders and files easy and fast, while maintaining maximum + reliability. Ease of use is of key importance for reducing errors. The latest + version, is + considered a stable and reliable program to use. + + Please note that WinMerge is not freeware (as many sites on the Web have + stated): it is GPL licensed. We + provide you with a good tool for free, so please honor your license agreement + and submit improvements to us. We are happy to get help improving WinMerge, to + the advantage of all WinMerge users.
      WinMerge versions - There are three kind of versions available in the downloads page. + There are three kind of versions available in the downloads + page.
      <indexterm> <primary>Stable versions</primary> </indexterm>Stable versions - Stable versions are recommended for most users. If you are unsure about what version to use, use the latest stable version. Stable versions have an even second number, for example, 2.4, 2.6 and 2.8. + Stable + versions are recommended for most users. If you are unsure about + what version to use, use the latest stable version. Stable versions have + an even second number, for example, 2.4, 2.6 and 2.8.
      @@ -32,7 +58,17 @@ Beta versions Beta versions - Beta versions are for people who want to test latest features and improvements made after last stable version. Beta versions are not tested as extensively as stable versions and probably have some bugs. Beta versions have an odd second number, for example 2.5 and 2.7. Beta versions can be used in production, because they are not expected to have major bugs. But there is always a risk with using beta-level releases, so consider it carefully. We have tried to release a new stable series once a year, so it may be worth waiting for few months for the next stable release... + Beta + versions are for people who want to test latest features and + improvements made after last stable version. Beta versions are not tested + as extensively as stable versions and probably have some bugs. Beta + versions have an odd second number, for example 2.5 and 2.7. Beta versions + can be used in production, because they are not expected to have major + bugs. But there is always a risk with using beta-level releases, so + consider it carefully. We have tried to release a new stable series once a + year, so it may be worth waiting for few months for the next stable + release...
      @@ -40,31 +76,70 @@ Experimental versions Experimental versions - Experimental versions are snapshot releases from our version control system (Subversion). They have all the latest features and improvements. Some features may still be buggy or incomplete. These releases are made available to allow users to try out the current code without needing to compile, and to participate in development discussions concerning new and changing features. We also appreciate any help testing the current code. Use experimental versions with care and enable backups! And please report bugs that you find while using these builds: it really helps with WinMerge development! + Experimental + versions are snapshot releases from our version control system + (Subversion). They have all the latest features and improvements. Some + features may still be buggy or incomplete. These releases are made + available to allow users to try out the current code without needing to + compile, and to participate in development discussions concerning new and + changing features. We also appreciate any help testing the current code. + Use experimental versions with care and enable backups! And please report + bugs that you find while using these builds: it really helps with + WinMerge development!
      Version tree - All this talk about different versions might be confusing if you never have worked with this kind of model. Lets illustrate with a picture: + All this talk about different versions might be confusing if you + never have worked with this kind of model. Lets illustrate with a + picture: - WinMerge stable and development versions - The preceding diagram shows the relationships between different releases and versions. Development always happens within experimental and beta development versions. At the appropriate points we create new branches for stable releases. In the diagram, the arrows for 2.4.x and 2.6.x versions are two current stable branches. (The diagram is a snapshot; it is not updated to show the current stable branch). + WinMerge stable and development + versions + The preceding diagram shows the relationships between + different releases and versions. Development always happens within + experimental and beta development versions. At the appropriate points we + create new branches for stable releases. In the diagram, the arrows for + 2.4.x and 2.6.x versions are two current stable branches. (The diagram is + a snapshot; it is not updated to show the current stable branch). - A branch always indicates a separate development effort. There is no any automation to copy improvements or fixes from development versions to stable versions, or in the opposite direction. Changes are always selected by hand and then merged (using WinMerge, of course). + A branch always indicates a separate development effort. There is + no any automation to copy improvements or fixes from development + versions to stable versions, or in the opposite direction. Changes are + always selected by hand and then merged (using WinMerge, of + course). - After a branch is created, we try to keep the code in it as stable as possible. Usually this means that we copy only tested bug fixes from development versions to stable versions. Unfortunately this is not always an easy task, and errors can occur. New bugs can also appear in stable versions: this is real-life software development. However, in general, quality increases in branches. For example, 2.6.14 was a better release than 2.4.0. So we always recommend using the latest stable branch release. - - This branching also means that stable versions don't get many new features after a branch is created. Stable versions 2.6.0 and 2.6.14 had pretty similar features. After the 2.6 stable branch, we created a new stable branch, 2.8, where we added many improvements and fixes. - - Many software vendors always increase their version numbers and advise people to use the version with the biggest number. If WinMerge were developed as proprietary software, users would see only versions from stable branches. But because WinMerge is an open source software project, we want to keep our development as open as possible and to release many development versions. The latest development version can have version number 2.9.1.0 and the latest stable version can be version 2.6.14. + After a branch is created, we try to keep the code in it as stable + as possible. Usually this means that we copy only tested bug fixes from + development versions to stable versions. Unfortunately this is not always + an easy task, and errors can occur. New bugs can also appear in stable + versions: this is real-life software development. However, in general, + quality increases in branches. For example, 2.6.14 was a better release + than 2.4.0. So we always recommend using the latest stable branch + release. + + This branching also means that stable versions don't get many new + features after a branch is created. Stable versions 2.6.0 and 2.6.14 had + pretty similar features. After the 2.6 stable branch, we created a new + stable branch, 2.8, where we added many improvements and fixes. + + Many software vendors always increase their version numbers and + advise people to use the version with the biggest number. If WinMerge were + developed as proprietary software, users would see only versions from + stable branches. But because WinMerge is an open source software project, + we want to keep our development as open as possible and to release many + development versions. The latest development version can have version + number 2.9.1.0 and the latest stable version can be version 2.6.14.
      @@ -75,23 +150,40 @@ reporting bugs Getting support and reporting bugs - The Open Discussion forum is the fastest way to get help. Please be patient, it may take some time for somebody to answer. + The Open Discussion + forum is the fastest way to get help. Please be patient, it may take + some time for somebody to answer. - If you find a bug, please submit it as a bug report. Please attach as much information as you can: at a minimum, the version number of WinMerge that you are using. If you can, also attach a configuration log which, you can display by clicking + If you find a bug, please submit it as a bug + report. Please attach as much information as you can: at a minimum, + the version number of WinMerge that you are using. If you can, also attach a + configuration log which, you can display by clicking Help Configuration - in the WinMerge window. Good information in a bug report makes it more likely that your bug will be fixed quickly. + in the WinMerge window. Good information in a bug report + makes it more likely that your bug will be fixed quickly. - Include the version number in bug reports. You can check the version number by clicking + Include the version number in bug reports. You can check the version + number by clicking Help About WinMerge . - We prefer that you register with SourceForge.net before posting a bug report (registration is public and free), so that you receive email notifications if we post follow-up questions to your bug. Registration is not currently required for you to post a bug report. However, we generally give less priority to unregistered bug reports, because it has been our experience that unregistered posters often do not return to answer follow-up questions. + We prefer that you register with + SourceForge.net before posting + a bug report (registration is public and free), so that you receive email + notifications if we post follow-up questions to your bug. Registration is + not currently required for you to post a bug report. However, we generally + give less priority to unregistered bug reports, because it has been our + experience that unregistered posters often do not return to answer follow-up + questions.
      @@ -99,18 +191,49 @@ WinMerge development WinMerge source code and development - WinMerge source code is available in the downloads page and from the public Subversion server. Anyone can download the sources, study them, and alter them. If you find (and fix) bugs, improve something, and so on, please submit your changes to us as patches and help improve this product! If you publish your altered version, you are required to publish the changes to source code too. This is what the GPL license is about: please respect it. - - While WinMerge development has been fast in the last couple of years, all this work is done by people in their spare time. Nobody gets paid for improving WinMerge. We try to fix bugs as we find them or when somebody reports them to us. We really try — we use WinMerge too. But there are absolutely no promises for new features. We always appreciate any help with WinMerge, be it testing, documenting, translating, or coding. + WinMerge source code is available in the downloads + page and from the public Subversion + server. Anyone can download the sources, study them, and alter them. + If you find (and fix) bugs, improve something, and so on, please submit your + changes to us as patches + and help improve this product! If you publish your altered version, you are + required to publish the changes to source code too. This is what the GPL license is about: + please respect it. + + While WinMerge development has been fast in the last couple of years, + all this work is done by people in their spare time. Nobody gets paid for + improving WinMerge. We try to fix bugs as we find them or when somebody + reports them to us. We really try — we use WinMerge too. But there are + absolutely no promises for new features. We always appreciate any help with + WinMerge, be it testing, documenting, translating, or coding.
      Participating in WinMerge development - As mentioned above, we look for help in many areas, not just coding. Translation, documentation, and testing are important too. - - The Development Wiki is a good source of information if you want to help with WinMerge development. The Help Needed page in the wiki has more information about how to help with WinMerge development. - - The development-mailing list is the preferred place for development discussions. Another place is in the developers-forum. If you are interested in helping with WinMerge development, let us know. If you want to fix one of our bugs or implement a new feature, let us know. + As mentioned above, we look for help in many areas, not just coding. + Translation, documentation, and testing are important too. + + The Development Wiki + is a good source of information if you want to help with WinMerge + development. The Help + Needed page in the wiki has more information about how to help + with WinMerge development. + + The development-mailing + list is the preferred place for development discussions. Another place is + in the developers-forum. + If you are interested in helping with WinMerge development, let us know. + If you want to fix one of our bugs or implement a new + feature, let us know.
      -
      + \ No newline at end of file diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 6c298a48189..8882bc7d562 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -193,7 +193,11 @@ Designates the selected path as the first - (Left) path in the comparison. + (Left) path in the comparison. The path is + loaded in memory; meanwhile WinMerge waits for you select the second + path in Windows Explorer, using the + Compare shortcut (described next). + @@ -242,10 +246,13 @@ to compare one file/folder against several files/folders. --> - The shell integration paths that you map are stored in memory only - until you use them to open WinMerge. They are discarded after a compare - operation. This means that you cannot select one Compare - To path and compare it against several paths. + The shell integration paths that you map are stored in memory until + you use them to open WinMerge. As a result, you don't need to select both + files at the same time or even using the same Windows Explorer view: you + can choose one, open a different directory, and choose the other one. + Both paths are discarded from memory after a compare operation. This means that you cannot select one + Compare To path and compare it against several + paths. Here is a simple method of using the advanced integration נthere are other scenarios, of course. In Windows Explorer: @@ -483,4 +490,4 @@ to compare one file/folder against several files/folders. --> example, <left></left> or <left/>). - + \ No newline at end of file diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index 451a54428cf..fce3c952b0b 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -4,9 +4,9 @@
      <indexterm> - <primary>Getting started with WinMerge</primary> + <primary>getting started with WinMerge</primary> </indexterm><indexterm> - <primary>Opening files and folders</primary> + <primary>opening files and folders</primary> <secondary>getting started</secondary> </indexterm>Opening files and folders @@ -435,4 +435,4 @@ toolbar button, or pressing F5.
      - + \ No newline at end of file diff --git a/Docs/Users/Manual/screenshots/options_btn.png b/Docs/Users/Manual/screenshots/options_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..c5c53b4c4723012e4190f937c49860c0c2f930d3 GIT binary patch literal 566 zcmV-60?GY}P)p00001b5ch_0Itp) z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RT2nP!{9{EExEC2uj$Vo&&R4C7l zl09e?K^TUgZ*F$?cK5slE<|!s5CS%7f`y_ItmHsXO=GYUV>q=JK?ouiN*c8g5h1~# zjl@O~1W^Pnw6qZXK{*S>c#w$fCg$=tV==eK**Vn<-#gzt@5_j__D-~k|2SiRQhm3p zxcA0&zycuPw7}<|a|b6b0H3C(1nzYgwHL_xQj*=5%t^h`s9v4~E*%>^x@Y%;*Kf85 zC_gWznVROJX{M%`n&s39yRzgK)W(jRW_t1dte02Xk1@-M{7V9CtfWqqE7fwP3iu(~ zj})t^%}h?z=YNmfp6!hI@bqXHD;>llYf0yzzL1PeKXLle_yH#dO2vgpbUsqDk+j!- z{k3#t=B0ByKCy406lY{fP*B=0NSF8S{roysfI~As-1O;q-%zg)1{45hEk@@H@)0Ui zbDc2H&Tri@7@~k&t5cH;8ml^p)c(nDoz@pux9u7V5wL<}`K<(BMEj8dH_!E*Jlq`) ze*jdk_WE-z01FsbZ4fIRL~`p&f9*_9yJ<>Vmvx4V#kgnu5bcF>siOXC z&Ja|VubonPp%QED;i_@% literal 0 HcmV?d00001 From 6a7d137e5d954345ef362c250d0e4a619a02a5aa Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 10 Aug 2008 08:22:34 +0000 Subject: [PATCH 059/168] PATCH: [ 2038924 ] Major edit Compare_files help topic Major copy edit of Configuration.xml Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Configuration.xml | 1720 ++++++++++++++++++++------- 1 file changed, 1258 insertions(+), 462 deletions(-) diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index 7e4954a2f3c..aeb2c991004 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -1,663 +1,1456 @@
      - Options & configuration + Options and configuration<indexterm> + <primary>options</primary> + </indexterm> + + The Options dialog enables you to customize many WinMerge features. To + set WinMerge options: + + + + Click + Edit + + Options + in the menu or the + + + + + + WinMerge Options button + + Options button in the + toolbar. + + The Options dialog contains a number of pages, each containing a + group of related options. You can open any page by clicking its title in + the Categories list, on the left side of the + dialog. + + + + Configure the options you want to change using one or both of these + methods: - Options dialog can be opened from Edit-menu or from - toolbar button. Changes made are saved when dialog is closed using - OK-button (or pressing - Enter-key). + + + Directly in the options pages. + + + + Importing an options .ini file that you + exported previously (see + for details). + + + + + + When you have set all your options, click OK + to save them and dismiss the dialog. + + + + This topic describes the options in detail. There is a section for each + page in the Options dialog. + +
      + Importing and Exporting options<indexterm> + <primary>importing options files</primary> + </indexterm><indexterm> + <primary>exporting options files</primary> + </indexterm> + + If you change options frequently for different compare or merge + scenarios, or if you want to share your settings with other WinMerge users, + consider saving your settings by exporting them to an options file. Then, + whenever you want to use those settings, you can simply import the options + file instead of setting options manually. + + + + To export options + + + When you have set your options the way you want them, click + Export. In the Select file for export dialog, + specify a path and name for your options file (the type + ini is automatically appended), and click + Save. + + In the generated text ini file, each line + contains a name-value pair that defines a single option. + + -
      + + To import options + + + When you want to reuse your saved options, click + Import. In the Select file for import dialog, + navigate to the saved ini file and click + Open. + + The values in your imported options file replace all existing + settings. + + + +
      + +
      General options + The General page has these options: + +
      + Automatically scroll to first difference<indexterm> + <primary>autoscrolling to first difference</primary> + </indexterm> + + + + (default): Compare window opens to the + top of the folder or file, with no difference selected. + + + + : When it first opens, the Compare + window selects the first difference, scrolling to the location if + necessary. + + + + For a folder compare, selects the first different file or + folders. + + + + For a file compare, selects the first difference block in + the files. + + + + +
      +
      - Automatically scroll to first difference + Disable splash screen<indexterm> + <primary>splash screen, disabling</primary> + </indexterm> - When this option is enabled: + + + (default): A splash screen is + displayed when you start WinMerge. You can dismiss the screen at any + time by clicking it; otherwise it is automatically dismissed after a + few seconds. + + + + : Completely omits the splash screen + when you start WinMerge. Note that this does not make startup + faster. + + +
      + +
      + Close Windows with <keycap>ESC</keycap><indexterm> + <primary>closing windows using Esc key</primary> + </indexterm> - After folder compare selection is moved to first different - files or folders. + (default): Lets you use the + ESC key to close WinMerge windows. Pressing + ESC once closes one window, so with one File Compare + window open, it takes three key presses to close WinMerge: first the + File Compare window, then the Folder Compare window, and finally the + WinMerge window. + + Note that in the WinMerge command line, the + -e parameter enables you to close WinMerge by + pressing ESC just once. - After opening files for compare first difference in files - is scrolled visible and selected. + : Pressing ESC does + not close any WinMerge windows.
      - <indexterm> - <primary>Disabling splash screen</primary> - </indexterm>Disable splash screen + Automatically verify paths in Open-dialog + + + + (default): The Select Files or Folders + dialog checks both paths as you enter them. The + OK button remains disabled until both paths are + validated. Note that this checking can cause some delay. + - User can disable splash screen appearing when WinMerge is started. - It does not make WinMerge start faster (splash screen can be missed by - clicking it with mouse) but it saves one click. + + : The OK button + in the Select Files or Folders dialog is always enabled, and attempts + to open any paths you specify. Since there is no delay during + validation, this can speed up the selection of paths. However, if the + path cannot be opened, an error dialog is displayed. + +
      - <indexterm> - <primary>Esc key</primary> + <title>Allow only one instance to run<indexterm> + <primary>WinMerge window</primary> - <secondary>Closing windows</secondary> - </indexterm>Close Windows with <keycap>ESC</keycap> + opening multiple + - If this option is enabled, WinMerge closes document windows and - application with ESC key. One window is closed with one - keypress, so if user has file compare window open one needs three - keypresses to close WinMerge: file compare window, folder compare window - and then the application. + + + (default): You can run multiple + WinMerge instances. For example, if WinMerge is currently running and + you click the WinMerge desktop shortcut, a new WinMerge window is + opened. + + + + : Limits the WinMerge program to one + instance: + + + + If WinMerge is currently running and you try to start a new + instance, no new application window is opened: the current + WinMerge window is used instead. + + + + If you start a new instance with paths (for example on the + command line), a new Compare window is opened in the existing + WinMerge window. + + + + - Note that -e command line parameter overrides this option. If -e - parameter is given in command line, WinMerge closes with one - ESC key press. + Also see the related options under .
      - Automatically verify paths in Open-dialog + Ask when closing multiple windows - When enabled: Open-dialog checks both paths given for validity and - doesn't enable OK button until both paths are - valid. Unfortunately this checking needs little delay and some users - find this delay annoying. + + + (default): If you exit WinMerge while + multiple Compare windows are open, WinMerge prompts you to confirm + whether to close all the windows. + - When disabled: Open-dialog enabled OK - button by default and lets user to try to open all paths. However error - message is shown if path is not valid. This is faster to use, there is - no any delay in enabling OK. But user must look - at error-dialogs. + + : If you click + Exit and there are no pending file changes, + WinMerge closes immediately. + +
      - <indexterm> - <primary>Single-instance</primary> - </indexterm>Allow only one instance to run + Preserve file time in file compare<indexterm> + <primary>timestamps</primary> + + <secondary>preserving</secondary> + </indexterm> + + + + (default): If you save changes to a + file in WinMerge, the timestamp of the file is updated. + - Limits WinMerge program instances to one. If new instance is tried - to start, old instance is activated instead. If new instance is tried to - open with paths, new paths replace existing ones in previous instance. - Or, if multiple compare window support is enabled new compare windows - are opened for new paths. (See below.) + + : If you save changes to a file in + WinMerge, the timestamp of the file is not changed in your file + system. + +
      Open-dialog Auto-Completion - This option allows user to enable auto-completion for Open-dialog - paths. There are two modes for auto-completion: + Choose one of these options: - From file system - checks paths from - filesystem. I.e. It locates paths matching letters already typed and - if matching path is found, completes the path. + Disabled (default): No autocompletion is + performed when you enter paths in the Select Files or Folders + dialog. - From MRU list - checks paths only from - MRU list. This is handy when you have pretty limited set of paths - (usually in MRU lists) to compare. + From file system: Checks paths as you type. + It attempts to locate paths in the file system that match the letters + you type, and if a matching path is found, completes the path. + + + + From MRU list: Checks paths only from the + most recently used (MRU) list. This is handy when you have a limited + set of paths to compare.
      -
      - Enable multiple compare windows for +
      + Enable multiple compare windows for<indexterm> + <primary>Compare windows</primary> - <para>Allows opening multiple folder or file compare windows into one - WinMerge instance. WinMerge has separate compare documents for folder- - and file compare and this option allows selecting multi-window support - for both of them independently.</para> + <secondary>opening multiple</secondary> + </indexterm> - - File compare windows are always related to folder compare - windows. Even if you disable multiple file compare windows you still - can open one file compare window for every folder compare - window. - + Controls whether WinMerge allows you to open single or multiple + Compare windows. Specify the Folder compare and + File compare options independently: + + + + (default): You can only open one + Folder compare or File compare window at a time. + + + + : You can open multiple Folder or File + compare windows simultaneously. + File Compare windows are children of Folder Compare windows. + Therefore, you can open one File Compare window for every Folder + Compare window, even if the File compare + option is disabled. + + +
      - Reset messageboxes (Reset-button) + Reset - WinMerge allows user to hide (suppress) some common messageboxes. - For example if user doesn't want to see The files are - identical messagebox every time two identical files are - opened user can check checkbox in that messagebox and close messagebox. - Then that messagebox will not be shown again. + WinMerge allows you to suppress some common message boxes. For + example, when two identical files are opened, the message box titled, + The files are identical, is normally opened. If you + don't want this box to display any more, you can enable (check) the option + in that message box to not show the message again. - However sometimes user may want to see again those hidden - messageboxes. Selecting Reset button makes all - messageboxes visible again. + Later, you might decide that you want to see those messages again. + If so, click the Reset button to make the message + boxes display again. - It is recommended to reset messageboxes when updating to newer - version of WinMerge. Installer does that automatically but if - installer is not used then it should be done using this - Reset button. + We recommend that you not suppress messages when updating WinMerge + to a newer version. The installer enables their display automatically, + but if you don't use the installer, then remember to enable message + display by using the Reset button.
      -
      +
      Compare options - Several compare options allow to ignore some specific type of - differences. This is useful in reducing insignificant differences for - review purposes. - - Ignored difference is shown with different color and it cannot be - merged. Difference counts do not include ignored differences. So if files - contains only ignored differences they are shown as identical in directory - compare. + The options in this page enable you to change some of the ways that + WinMerge detects differences, such as comparing only file size, or ignoring + some types of differences, like case. - Ignoring differences affects merging! If user ignores whitespace - changes, then e.g. indentation changes in source code files are ignored. - That means file's indentation gets messed up when merging. It is - strongly recommended to turn off all difference ignore options before - merging files! + Customizing difference detection can be useful during comparisons, + when you might not be interested in some differences. However, these + options also affect merging. For example, if you ignore whitespace + changes, then indentation changes in source code files are not preserved + when you merge. + + For this reason, before you merge any differences, we strongly + recommend resetting the options on this page to their default settings, + especially the ignore options. To reset all the options on this page, + click the Defaults button.
      - <indexterm> - <primary>Ignore whitespace characters</primary> - </indexterm>Whitespace + About ignore options<indexterm> + <primary>ignoring differences</primary> + </indexterm> - Compare Whitespace, Ignore - whitespace change and Ignore all - whitespace are three different levels for comparing/ignoring - whitespace characters. + A number of options in the Compare page (described later in this + section) enable you to ignore certain differences. Ignored differences are + treated in special ways in WinMerge: - Ignore whitespace change ignores changes in - whitespace chars. First three lines in example below illustrate this, - those three lines are detected as identical if this option is set. - However change between zero and more whitespace characters is NOT - ignored. So fourth line is different from first two lines - Ignore whitespace change + + + They are marked with the Ignored Difference color. + - One space between words:Two Words + + Ignored differences cannot be merged + - Two spaces between words:Two Words + + Ignored differences are not included in difference counts + - Tab between words:Two Words + + Files containing only ignored differences are marked as + identical in a folder comparison + + +
      - No spaces between words:TwoWords - +
      + Whitespace<indexterm> + <primary>whitespace</primary> + + <secondary>detecting and ignoring differences</secondary> + </indexterm> + + Whitespace, the space between words and lines, is represented in + text files by special, nonprinting characters like spaces, tabs, and + linefeeds. The significance of whitespace varies a lot: spaces between + words are usually important; in some text documents, indents and linefeeds + are critical to meaning and readability; in structured code, linefeeds and + tabs might be significant. + + These whitespace options are available: + + + + Compare + + + Default: All whitespace is compared. If you are not sure which + option your document requires, this is the safest choice. In the + example below, all lines are detected as different. + + + Ignore whitespace change + + One space between words:Two Words + + Two spaces between words:Two Words + + Tab between words:Two Words + + No spaces between words:TwoWords + + + + + + Ignore change + + + Compares differences in whitespace. In the preceding example, + the first three lines have different whitespace, but are detected as + identical: tabs and multiple are treated as if they are single + space. The last line has no whitespace, so the difference is + not ignored (in effect, the words in the last + two lines are different): + + + + + Ignore all + + + Ignores all whitespace characters, except linefeeds (so lines + are detected, and preserved in a merge). All lines in the preceding + example are detected as identical. + + + +
      - Ignore all whitespace ignores all whitespace - characters, except linefeeds. WinMerge compares lines, and even when - this option is set linefeeds are intact. All lines in example below are - detected as identical. - Ignore all whitespace +
      + Ignore blank lines<indexterm> + <primary>blank lines</primary> - <para>One space between words:<screen format="linespecific">Two Words</screen></para> + <secondary>detecting and ignoring differences</secondary> + </indexterm> - Tab between words:Two Words + + + (default): Empty lines in the source + files are detected and represented in the File Compare window as blank + lines with the Deleted Difference colors. + - No spaces between words:TwoWords - + + : Empty lines in the source files are + ignored. They are represented in the File Compare window as blank + lines with the Ignored Difference colors. However the difference + cannot be merged. + +
      - Ignore blank lines + Ignore case<indexterm> + <primary>case (letter), detecting and ignoring differences</primary> + </indexterm> - Ignores differences that have only blank (empty) lines. Blank - lines are shown in file view, but difference is shown with ignored - difference colors and it cannot be merged. + + + (default): Comparisons are + case-sensitive. For example, LowerCase, + LOWERCASE, and lowercase are all + different. + + + + : Differences between lowercase and + uppercase letters are ignored. + +
      - Ignore case + Ignore carriage return differences (Windows/Unix/Mac)<indexterm> + <primary>EOL</primary> - <para>If this option is enabled WinMerge ignores differences between - lowercase and uppercase letters. For example "LowerCase" and "LOWERCASE" - and "lowercase" are same.</para> + <secondary>detecting and ignoring differences</secondary> + </indexterm> + + + + (default): WinMerge detects end of + line (EOL) style differences. For example, if you compare two lines + that have the same contents but different line endings, the lines are + considered to be different. When this happens, WinMerge displays a + dialog prompting you to confirm whether to detect or ignore the + difference. + + + + : EOL differences are ignored. + +
      - Ignore carriage return differences (Windows/Unix/Mac) + Enable moved block detection<indexterm> + <primary>moved differences</primary> + + <secondary>enabling and disabling detection</secondary> + </indexterm> - If this option is not set WinMerge does not detect EOL style - differences as differences. If two lines differ only by EOL characters - (e.g. Windows EOL and Unix EOL) WinMerge detects files as identical. + + + (default): WinMerge does not detect + when differences are due to moved lines. + + + + : WinMerge tries to detect lines that + are moved (in different locations in each file). Moved blocks are + indicated by the Moved and Selected + Moved difference colors. If the Location bar is displayed, + corresponding difference locations in the left and right location bars + are connected with a line. Showing moved blocks can make it easier to + visualize changes in files, if there are not too many. + + For an example, see the Location pane description in . + +
      - Enable moved block detection + Ignore time differences less than 3 seconds<indexterm> + <primary>timestamps</primary> + + <secondary>detecting and ignoring differences</secondary> + </indexterm> - When this option is enabled WinMerge tries to detect lines that - are moved inside file. Moved lines have own difference colors. Also - location pane can show moved lines with line between bars. This makes it - easier to visualise changes in files. However if there are a lot of - moved lines it may get messy looking. + + + (default): Files with different + timestamps are detected as different. + + + + : Sometimes (for example, when you use + network shares) small differences in timestamps are not significant. + To get more meaningful results in such situations, this option enables + you to ignore time differences smaller than three seconds. + + This option works only with the Modified + Date and Modified Date and + Size compare methods (described in ). It has no effect with other + methods. + + + This option should be enabled only when the time difference is + detected. Otherwise, it can cause incorrect compare results. + + + +
      + +
      + File Compare method<indexterm> + <primary>comparing files</primary> + + <secondary>detection options</secondary> + </indexterm> + + This option lets you determine how complete your file comparisons + are. Choose one of these five choices: + + + + Full Contents + + + Default: Full comparison of files by content, with all the + bells and whistles. This method invokes plugins and uses the + diffutils engine for fully accurate differencing and moved block + detection. This is the most complete and recommended method. + + + + + Quick Contents + + + Slimmed-down comparison of files by content. This method uses + streamlined file comparison code which skips plugins and moved block + detection. This method is faster than Full + Contents, because it does not load the files. + + Its drawback is that line filters are not applied when + comparing. For example, this method sees file as different even if + line filters are set to ignore all differences in the files. + + + + + Modified Date + timestamps + + comparing + + + + Compares only the modification dates on the files, so it is + far faster than either of the contents methods. But obviously, it is + only as accurate as the modification dates. + + + + + Modified Date and Size + + + Similar to Modified Date, but also checks + file sizes when dates are identical. + + + + + Size + file sizes + + comparing + + + + Compares only file sizes, so it is fast but not as accurate as + the contents methods. + + +
      - Ignore time differences less than 3 seconds + Stop after first difference<indexterm> + <primary>comparing files</primary> - <para><emphasis>Only for "<guilabel>Modified Date</guilabel>" and - "<guilabel>Modified Date and Size</guilabel>" compare - methods.</emphasis></para> + <secondary>stopping after first difference</secondary> + </indexterm><indexterm> + <primary>comparing folders</primary> - <para>It is possible that timestamps vary by one or two seconds in - certain situations. This usually happens with network shares. Normally - WinMerge determines such items as different. So this option allows - WinMerge to ignore time differences smaller than three seconds to help - getting more reliable results.</para> + <secondary>stopping after first difference</secondary> + </indexterm> - - This option should be enabled only when the time difference is - detected. Otherwise it can cause wrong compare results. - + This option is enabled only when the Quick + Contents compare method is selected. + + + + (default): WinMerge examines all + differences in the files. + + + + : This option optimizes comparisons by + examining files only until the first difference is found, instead + always scanning the entire files. + + The drawback is that WinMerge may be unable to identify binary + files as binary. This is likely to happen if the first difference is + near the beginning of the file. If you know what kind of files you are + comparing (for example, which are binary files), this option can be a + good way to speed up comparisons. However, don't enable this option if + you are not sure what kind of files you are comparing. + +
      - File compare method + Filter Comments<indexterm> + <primary>filtering</primary> + + <secondary>comments</secondary> + </indexterm> - File compare method has five choices: + - Full Contents - full comparison of files - by content, with all the bells and whistles. This method invokes - plugins and uses diffutils engine for fully accurate differencing - and moved block detection. This is the most complete and recommended - method. + (default): WinMerge compares comments + in code, along with other content. - Quick Contents - slimmed down comparison - of files by content. This method uses streamlined file comparison - code which skips plugins and moved block detection. The only - advantage of this method over Full Contents is that this method does - not load the files into method, and so is faster. + : This option optimizes comparisons by + detecting comments in certain programming language file types (such as + C++ and Java), and ignoring them. - Drawback is linefilters are not applied when comparing. Even - if linefilters ignore all differences in files and files are - considered identical by Full Contents -compare - method this method sees files as different. + The recognized file types and their comment markers are defined + in the file, IgnoreSectionMarkers.ini, at the top + of the WinMerge installation directory. + +
      +
      + +
      + Editor options<indexterm> + <primary>editing</primary> + + <secondary>options for File Compare window</secondary> + </indexterm> + +
      + Syntax highlighting<indexterm> + <primary>syntax highlighting</primary> + <secondary>enabling and disabling</secondary> + </indexterm> + + - Modified Date - comparison of - modification dates on files. This method only examines the - modification dates on the files, so it is far faster than either of - the contents methods, but obviously is only as accurate as the - modification dates. + (default): WinMerge can syntax + highlight many programming language and web formats. To see the + formats that are supported by default, click + View + + Syntax Highlight + . - Modified Date and Size - like above - Modified Date -comparison. But also checks file - sizes when dates are identical. + : Syntax highlighting consumes some + processing power, so if WinMerge screen updating seems to be slow, + turning off this option might help. + +
      +
      + Automatic rescan<indexterm> + <primary>rescanning files</primary> + + <secondary>enabling and disabling autoscan</secondary> + </indexterm> + + - Size - comparison of the sizes of the - files. This method only examines the file sizes, so it is fast, but - not so accurate like the contents methods. + (default): WinMerge rescans + automatically when you merge a difference, or if you manually rescan + (for example, click the Rescan button). + + + + : Forces WinMerge to rescan after every + edit event (a change to files, like typing). + + + To avoid slowing down your editing, WinMerge delays automatic + rescanning a little: it waits one second after each edit event. + Because each new edit event resets the timer, no rescans occur until + you pause or stop editing. +
      - Stop after first difference + Preserve original EOL chars<indexterm> + <primary>EOL</primary> - <note> - <para>This option is enabled only when <guilabel>Quick - Contents</guilabel> -compare method is selected.</para> - </note> + <secondary>preserving</secondary> + </indexterm><indexterm> + <primary>end of line</primary> - <para>This option allows to optimize compare by not looking whole files, - but only until first difference is found.</para> + <see>EOL</see> + </indexterm> - Drawback is WinMerge may be unable to recognize binary files as - such. This is even likely if first difference is in begin of file. Don't - enable this if you don't know which kind of files you are comparing. If - you know your files then this is a nice way to make compare even - faster. -
      -
      + + + (default): Assumes that files are + meant to be Windows files. If a file does not use the standard Windows + line ending, WinMerge considers this to be an error. It silently + changes the line endings to the Windows style instead of detecting + them as differences. Thus, the File Compare window status bar shows + the EOL style as Win. + + For most situations, you should leave this option disabled: this + default behavior works even when comparing two files that have + different line ending styles. + -
      - Editor options + + : Prevents WinMerge from automatically + changing line endings, so that it detects different EOL styles for + every line. This might be useful for handling files from systems with + different EOL styles (for example, Windows and Unix). + + + This is an advanced option for users who are familiar with EOL + bytes and who want to compare files with different EOL styles inside + one file. We recommend that you not enable this + option unless you need this advanced functionality. Remember, this + option is not required to compare two files with different EOL + styles. + + + +
      - Syntax highlighting - - From Editor-page user can enable/disable - syntax highlighting. WinMerge can syntax highlight many programming - language source codes, web formats etc. Syntax highlighting consumes - some processing power, so if WinMerge screen updating seems to be slow, - turning off this option might help. + Tab options<indexterm> + <primary>tabs</primary> + + <secondary>editing options</secondary> + </indexterm> + + + + Tab size + + + Width of a tab space. Specify a value + n : the resulting width is equivalent to + that of n characters. Default: 4. The + maximum value is 64. + + + + + Tab insert options + + + Determines what kind of character is used when you insert a + tab in text. Only one of these options can be enabled: + + + + Insert Tabs (default): Uses a single + tab character. + + + + Insert Spaces: Uses one or more + spaces (determined by the ) instead of + a tab character. For example, with the default tab size, four + spaces are inserted. + + + + +
      - <indexterm> - <primary>Automatic rescan</primary> - </indexterm>Automatic rescan + View line differences<indexterm> + <primary>line differences</primary> - <para>Enabling automatic rescanning forces WinMerge to rescan after - every change done to files, including typing. That's how WinMerge 1.7.1 - behaves. For bigger files this can make editing files very slow. To make - file editing faster edit events are 'delayed'.</para> + <secondary>viewing options</secondary> + </indexterm> - Delaying means WinMerge waits one second after last edit event - before rescanning. If new edit event happens during that time editing is - done and counter reset to one second. So there should be no rescans - during normal typing, but only after user stops typing. + WinMerge can highlight not only different lines, but also + differences within lines. You can enable and disable line difference + coloring using either the View Line Differences + option in this page, or by clicking + View - When automatic rescan is disabled, rescan is done only when user - selects Rescan or user merges - difference. + View Line Differences + . For example, when the menu item is checked, the option in + this page is also checked, and changing either setting automatically + changes the other. + + However, View Line Differences and the options + under it give you control over exactly what kinds of differences are + detected within lines: + + + + (default): WinMerge highlights + differences within lines (also enables the + View + + View Line Differences + menu item). + + When this option is enabled, you can choose one of these + suboptions. The best choice usually depends on the file types you are + comparing: + + + + Character level: Detects individual + characters that are different. This option can be useful for file + formats that do not have clear word breaks, or if you are looking + for single-character differences. For example, this level makes it + easy to spot a single changed character in the middle of a + word. + + + + Word-level (default): Detects words + that are different. Possible advantage: making it easy to copy and + paste words. + + + + Break at whitespace (default): + Words are assumed to be separated by whitespace characters. + This usually works for typical text files. + + For example, these two lines contain punctuation but no + whitespace. So, with the Break at + whitespace option, WinMerge detects no word breaks. + Instead, it highlights the text as a single word-level line + difference. + + 10,20,30,40,50 + + 10,25,30,45,50 + + + + Break at whitespace or punctuation: + Considers both whitespace and punctuation characters to be + word breaks. This is useful for handling lists that are + separated with punctuation (like comma-separated lists). In + the preceding example, WinMerge highlights only 20 and 40 in + the first line, and 25 and 45 in the second line. + + + + + - WinMerge 2.2 release delays more edit events than 2.0.x releases, - so selecting between automatic and manual rescan is mostly a matter of - taste. + + : WinMerge does not highlight + differences within lines, and all settings for the level and + whitespace options are ignored (also disables the + View + + View Line Differences + menu item). + +
      +
      -
      - Preserve original EOL chars +
      + Colors options<indexterm> + <primary>difference colors</primary> - <important> - <para>This is an advanced option for users who are familiar with EOL - bytes and who want to compare files with different EOL styles inside - ONE file. It is recommended that this option not be set unless this - advanced functionality is needed.</para> - </important> + <secondary>options</secondary> + </indexterm> - Setting this option allows handling and comparing files with - different EOL styles inside ONE file. Two files with different EOL - styles can be compared even without this option set! One example reveals - functionality behind this option. + Use this page if you want to change any of the difference colors used + in the File Compare window. You can set the background, deleted, and text + color. - This is one example -text. To show how -smart WinMerge -can be handling -EOL differences. + To change a color, click in its box to open a standard Color chooser + dialog. Choose one of the predefined colors or define your own custom color, + then click OK to load the new color in the + box. - And same text in bytes: + At any time, you can click Defaults to reload + the installed color scheme. +
      - 5468 6973 2069 7320 6F6E 6520 6578 616D 706C 6520 0D0A -7465 7874 2E20 546F 2073 686F 7720 686F 7720 0D0A -736D 6172 7420 5769 6E4D 6572 6765 0D -6361 6E20 6265 2068 616E 646C 696E 6720 0D0A -454F 4C20 6469 6666 6572 656E 6365 732E +
      + Text Colors options<indexterm> + <primary>text colors</primary> - <para>The example presents one simple text file with five lines of text. - All lines, except third, are terminated with Windows style EOL (0D0A). Third - line has Unix style EOL (0D).</para> + <secondary>options</secondary> + </indexterm> - If Preserve original EOL chars-option is not - set WinMerge determines file is meant to be Windows style file and converts - third line's last bytes to 0D0A before comparing. Missing EOL char is - usually an error in file, so WinMerge is smart and fixes this error - instead of reporting it as a difference. That's right, WinMerge changes - user's file without telling about it to user. WinMerge also shows files - EOL style as Windows in filecompare statusbar. + Use this page to change the colors used for text. First, check the + option, Use customized text colors. This activates the + text options. There is an option for three kinds of text: whitespace, + regular text, and selected text. For each kind of text , you can choose a + color for the background and the text. +
      - Advanced user might want to handle files without this automatic - fixing, file might be handled in systems with different EOL styles (e.g. - Windows and Unix). In that case, user can set this option and see - WinMerge showing EOL style for every line. -
      +
      + Syntax Colors options<indexterm> + <primary>syntax highlighting</primary> - <section> - <title>Tab options + color options + - From General-page user can set size tabulator - character in spaces. Maximum value is 64. + By default, the WinMerge File Compare window marks the syntax of + certain kinds of source code, as described in . This page lists the syntax + elements that are recognized, and enables you to change their text color and + weight. - Another selection is if user wants WinMerge to add tab characters - or spaces (amount specified by tab size -option) when - Tab-key is pressed. -
      + At any time, you can click Defaults to reload + the installed color scheme. +
      + +
      + Archive Support<indexterm> + <primary>archiving files</primary> + + <secondary>configuring support after installation</secondary> + </indexterm> + + This page contains options for configuring Winzip archive support + using 7-Zip.
      - <indexterm> - <primary>Highlighting line differences</primary> - </indexterm>Line Difference Coloring + Download 7-zip Plugin<indexterm> + <primary>7-Zip archive support</primary> + + <secondary>options</secondary> + </indexterm> + + If WinZip is already installed on your system, WinMerge + automatically detects it, and you don't need to configure anything here. + Otherwise, you can click this link to open the WinMerge downloads page in + your Web browser. There, you can download the 7-Zip Plugin installer (and + other WinMerge files). To install the plugin, see . Remember to close WinMerge before + running the 7-Zip installer. +
      - WinMerge can highlight exact differences in different lines. This - behaviour is controlled by these options First checkbox View - Line Differences controls if highlighting is enabled or - disabled. +
      + Enable archive file support - Next two choices are about level of highlighting. Best choice - usually depends on filetypes compared. + This option controls how WinMerge handles archive files (based on + 7-Zip integration). - Character level - this level tries to - find exact characters that are different. This is especially useful - when working with fileformats that do not have clear word-breaks. - This level is capable to highlight single changed character in - middle of word. It may save a lot of time when trying to find those - single-character differences. + (default): WinMerge recognizes 7-Zip + archives. + + WinMerge can access 7-Zip from two installation sources. If you + specified one of these methods earlier (for example, during the + WinMerge installation), you can change it here: + + + + Use stand-alone 7-Zip if available + + + + Use local 7-Zip from WinMerge folder + + - Word-level - this is what WinMerge - version 2.4 and earlier had. It tries to find different words to - highlight. There is extra value in selecting whole words - usually - it is easy to select words in editor so copy/paste is easier when - words are selected. This is also case with WinMerge editor. You can - for example select word in editor by double-clicking it with the - mouse. + : Turns off 7-Zip archive + integration. +
      - Word-level highlighting has one additional - option. Dropdown control below it controls how word-breaks are detected. - Normally (Break at whitespace selected) words are - assumed to be separated by whitespace characters. This is what we have - in normal text. - - When Break at whitespace or punctuation is - selected, also punctuation characters are considered as word-breaks. - When this is selected WinMerge can better handle comma separated lists - etc. For example, for lines: - - 10,20,30,40,50 - - and +
      + Detect archive type from file signature - 10,25,30,45,50 + + + (default): WinMerge recognizes only + archives whose file extension is known on your system (for example, in + the registry or through a file association). + - WinMerge would highlight whole lines when using Break at - whitespace but only numbers 20/25 and 40/25 when using - Break at whitespace or punctuation. + + : WinMerge can recognize archive files + even if their file extension is not known. To recognize an archive, + WinMerge searches the beginning of the file for the archive signature + bytes. + You can use this option to enable WinMerge to recognize Open + Office files. + + +
      -
      +
      System options
      - Send deleted files to Recycle Bin + Send deleted files to Recycle Bin<indexterm> + <primary>deleting files</primary> - <para>When this options is enabled files and folders deleted in - directory compare are moved to Recycle Bin. Note that use of Recycle Bin - may have disabled from system.</para> - </section> + <secondary>options</secondary> + </indexterm> -
      - Add to explorer context menu + + + (default): Files and folders that you + deletein a Folder Compare window are moved to the Recycle Bin, if it + is available. + + + Remember: if the Recycle Bin on your system has been + deactivated, this option does not work, and deleted files are + lost! + + - This option enables/disables shell integration. When enabled, new - menuitem WinMerge is added to explorer's - context menu. User can select one or two files/folders and then select - that menuitem to open files/folders to WinMerge. + + : Files and folders deleted in a + directory compare actually deleted. + +
      - Enable advanced menu + Add to explorer context menu<indexterm> + <primary>shell integration</primary> - <para>If this option is enabled there are two items shown in explorer's - context menu. First item (<guimenuitem>Compare</guimenuitem>) allows - user to select path to "memory" and then pick another path and compare - those two. This means user does not need to select both paths from same - view, but user can select them from different drives etc. Path is - forgotten from memory when its compared.</para> - - <para>Second item (<guimenuitem>Compare...</guimenuitem>) in menu always - opens WinMerge with selected path(s).</para> - </section> + <secondary>enabling and disabling</secondary> + </indexterm> -
      - Include subfolders by default + + + (default): Adds one or more WinMerge + shortcuts to the Windows Explorer context menu. After right-clicking + one or more files or folders, choose a WinMerge shortcut to open the + items in a WinMerge compare window. + + Two additional options are available if you use this + integration. Neither option is enabled by default, but you can enable + one or both: + + + + Enable advanced menu + + + + + (default): The + WinMerge shortcut is included in + the Windows Explorer context menu when you right-click one + or more files or folders. If you select a single item, the + Select Files or Folders dialog opens. If you select two + items, they are opened directly in a Compare window. + + + + : Replaces the + WinMerge shortcut in the Explorer + context menu with Compare + shortcuts, described in . The + Compare shortcuts enable you to + add a selected path to memory, then choose the second + separately (for example, in a different Explorer + view). + + + + + + + Include subfolders by default + + + + + (default): When you use the + WinMerge or + Compare shortcut, only the top + level of files is selected: the compare operation is + non-recursive. + + + + : The selection includes + subfolders, making the compare operation recursive. + + Another way to include subfolders is to press + Control while selecting the + WinMerge or + Compare shortcut in the Windows + Explorer context menu. + + + + + + - Shell Integration by default does not include subfolders into - comparison. This behavior can be changed with this option. The default - behavior can be also changed by holding down the - Control key while selecting the - Compare... item from the Explorer context - menu. + + : The + WinMerge shortcut is unavailable in Windows + Explorer. + +
      - <indexterm> - <primary>Configuring external editor</primary> - </indexterm>External editor + External editor<indexterm> + <primary>external editor</primary> + + <secondary>configuring</secondary> + </indexterm> - WinMerge has a pretty good editor for most basic editing needs. - However, it doesn't even compare to many other editors in functionality. - WinMerge allows user to define one's personally preferred editor to - external editor. Files can be opened in the external editor from the - directory compare's context menu. + The WinMerge File Compare window provides common editing functions. + If you prefer using your favorite, full-featured editor, you can configure + WinMerge to open an external editor from the Folder Compare context + menu. - Notepad is used as the default editor, because it is found on all - Windows platforms. + By default, Notepad is configured as the default external editor, + because it is found on all Windows systems. To configure a different + external editor, enter the full path to its executable file. - Command line parameters can be given, in format: - <path to .exe> + Along with the path, you can include any command line parameters + supported by the external tool, in this format: + path to executable + + To use the configured external editor, right-click a file in the + Folder Compare window and choose + Open Left + + with External Editor + or + Open Right + + with External Editor + .
      - Filter Folder + Filter Folder<indexterm> + <primary>filtering, folder used</primary> + </indexterm> + + Use this field to specify your own private folder for file filters. + By default this folder is your user profile directory (for example, + My Documents on Windows XP, or + Documents on Windows Vista). When you create a file + filter, it is automatically added to this folder. +
      - - Selecting filter file folder - +
      + Temporary files folder<indexterm> + <primary>temporary files, folder used</primary> + </indexterm> + + Specify the folder where WinMerge stores temporary files. Either one + of these options is available: - This option allows user to select own (private) folder for file - filters. By default this folder is user's My Documents folder. When new - private file filter is created, it is automatically added to this - folder. + + + System's temp folder (default): For example, this might be + C:\Windows\Temp on your system. + + + + Custom folder: Click Browse and select a + different folder where you have write access. + +
      -
      - <indexterm> - <primary>Backup files</primary> - </indexterm>Backup Files +
      + Backup Files<indexterm> + <primary>backup files, options</primary> + </indexterm> - This page allows user to select several backup-files related - options. + This page allows you to control how WinMerge creates backup + files.
      Create backup files in - Selects if backup files are created for folder- and file-compares. - In file compare backup files are created whenever files are saved. In - folder compare backup files are created whenever files are written over - (copied). + Specify when WinMerge should create backup files. You can enable or + disable each of these options independently: + + + + Folder compare (disabled by default): + Backup files are create whenever files are overwritten + (copied). + + + + File compare (enabled by default): Backup + files are created whenever files are saved. + +
      Create backup files into - Selects where backup files are created. The default is to create - backup files into the same folder than original file. This is usually a - good choice. The downside is that removing backup files from big folders - can take a lot of work. + Specify where backup files are created. Only one of these options + can be enabled: - The second option allows to define one global folder where all the - backup files are created. This allows easy cleanup of backup files. But - if there are many files with same filename in different folders, then - those files use the same backup file. + + + Original file's folder (enabled by + default): Backup files are created in the same folder as the source + file. This is usually a good choice. The down side is that cleaning up + backup files in big folders can take a lot of work. + + + + Global backup folder (disabled by default): + All backup files are created in one global folder. This makes them + easy to clean up. But, if there are multiple source files with same + file name, then the most recent backup file overwrites the previous + one of the same name. + +
      Backup filename - The default is to append a .bak extension to - the filename. Backup file of file.txt will be - file.txt.bak. + When WinMerge creates a backup file, it appends an extension to the + source file name. You can choose either or both of these extension + schemes: + + + + Append .bak -extension (enabled by + default): For example, the file.txt is backed up + to file.txt.bak. + - The second option allows adding a timestamp to the filename. As - the timestamp is almost always unique, this allows creating backups even - if there are files with same filename in different folders. And - basically this allows tracking the work with the file as every time the - file is saved, new backup copy is created. Beware that this can cause a - lot of files to be created. + + File compare (enabled by default): + Timestamps are almost always unique, so this option usually avoids + duplicating backup file names when the source files have the same + names. + + Also, storing a copy of a file each time you save it provides a + way to track changes to the file. However, you should consider that + this option can create a lot of files. + +
      -
      - Archive Support +
      + Version Control options<indexterm> + <primary>version control systems</primary> - <para>This page contains download link to 7-zip plugin and contains option - related to archive support.</para> + <secondary>integration configuration</secondary> + </indexterm> -
      - Enable archive file support + - Enables or disables archive file support (based on 7-Zip - integration). + Use this page to configure or disable the WinMerge integration with a + supported versioning system. - Like described in Installation section of this manual, there are - two different methods how 7-zip can be integrated. Integration method - can be changed using this option dialog after install. -
      + Choose one of these options: -
      - Detect archive type from file signature + + + None (default) + - Enabling this option allows WinMerge to recognize archive files - even if their file extension is not known. Basically WinMerge reads - beginning of the file and searches for archive-specific signature - bytes. + + Visual SourceSafe (less than 5.0) - - Enabling this option allows WinMerge to recognize and for - example Open Office files. - -
      + Also enter the path to SS.EXE. + + + + Visual SourceSafe (5.0 and above) + + + + Rational ClearCase + + Also enter the path to cleartool.exe. + +
      -
      - Codepage options +
      + Codepage options<indexterm> + <primary>codepage</primary> + + <secondary>options</secondary> + </indexterm> - These options allow selecting codepage WinMerge uses for ANSI files - and if codepage should be read from file contents for specific file - formats. + This page allow you to specify the codepage that WinMerge uses for + ANSI files, and whether the codepage of certain file formats should be + detected from the contents of the files.
      Default codepage for ANSI files - These three radiobuttons can be used to select default codepage - WinMerge uses when handling ANSI files. Usually default choice of - System codepage is best choice. However if user - knows that files are not in same codepage than system uses then user can - choose different codepage selecting Custom codepage - and typing codepage number to textbox next to it. + Choose one of these radio buttons to set the default codepage that + WinMerge uses when handling ANSI files: - - This option is read only when files are loaded. Changing this - option when the files are open in editor can cause unpredictable - changes to files when saving them. Select codepage before - loading the files. - + + + System codepage (default):The codepage used + by your Windows system. This default is usually the best choice. + However if you know that you are comparing files that do not use the + system codepage, consider one of the other options. + + + + According to WinMerge User Interface: The + encoding used by your installation of WinMerge. + + + + Custom codepage: Enter the codepage number + explicitly. For example, UTF-8 or + ISO-8851-1. + +
      @@ -666,46 +1459,49 @@ EOL differences. Uncheck this option in WinMerge.exe. Characters conversions can result in lossy conversions and the risk is - very high. WinMerge.exe can display files only - with your current codepage. + very high. WinMerge.exe can display files only with + your current codepage. - This option is interesting when your documents use a codepage - different from your current codepage (your current codepage is the - codepage of your Windows configuration). - - For example, you may merge two Slovak or two Japanese files in an - English environment. With the required fonts, and this option set, your - Slovak, or Japanese, files will be displayed with Slovak, or Japanese, - characters. - - Actually, WinMerge detects the codepage for these extensions : - .html, .rc (resource files for VC++) and .xml. - - WinMerge also detects a codepage difference between the left/right - files. To avoid lossy conversions during merge/copy/paste, WinMerge - proposes you to ignore the codepage information. - - - When you paste/copy text to an external application, the - external application must use the same codepage as WinMerge does. If - your external editor does not support custom codepages, disable this - option. Refer to the documentation for your external editor (for - copying to WinMerge, Internet Explorer offers codepage - selection). - -
      -
      - -
      - Import and Export of options + + + (default): WinMerge does not read + codepage information from the source files. It uses the default + codepage setting instead. + - Options can be exported to and imported from file. Currently - WinMerge supports Windows ini-file formatted text files. Exporting is done - by selecting the Export... button. WinMerge asks - for location and filename and then saves the file. Importing is done by - selecting the Import... -button. + + : WinMerge detects the codepage for + these extensions : html, + rc (resource files for VC++) + and xml. The detected codepage + overrides the setting for the default codepage option. + + This option is of interest when your documents use a codepage + that is different from the codepage of your Windows + configuration. + + For example, you might merge two Slovak or two Japanese files in + an English environment. With this option enabled (and with the + required fonts), your Slovak, or Japanese, the files are displayed + using Slovak, or Japanese, characters. + + WinMerge also detects a codepage difference between the + left/right files. To avoid lossy conversions when you merge, copy, or + paste, we suggest that you ignore the codepage information. + + + When you copy or paste text to an external application, the + external application must use the same codepage as WinMerge does. + Refer to the documentation for your external editor. For copying to + WinMerge, Internet Explorer offers codepage selection. If your + external editor does not support custom codepages, disable this + option. + + + +
      From 18933597e027b41aa111574484490fa22a324729 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 10 Aug 2008 08:32:37 +0000 Subject: [PATCH 060/168] PATCH: [ 2038924 ] Major edit Compare_files help topic Build/HTML generation changes Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/build/build_common.xsl | 51 ++++++++++++++ Docs/Users/Manual/css/all.css | 89 +++++++++++++++++------- 2 files changed, 116 insertions(+), 24 deletions(-) diff --git a/Docs/Users/Manual/build/build_common.xsl b/Docs/Users/Manual/build/build_common.xsl index c8d41fa6a1c..7dc111b00f9 100644 --- a/Docs/Users/Manual/build/build_common.xsl +++ b/Docs/Users/Manual/build/build_common.xsl @@ -34,6 +34,7 @@ html/param.xsl parameters images/ .gif +A @@ -61,4 +62,54 @@ html/docbook.xsl + + + + + + + + + + + + + + + + + + + + + + +       + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Docs/Users/Manual/css/all.css b/Docs/Users/Manual/css/all.css index fcfb809e1a8..abe6c0577ff 100644 --- a/Docs/Users/Manual/css/all.css +++ b/Docs/Users/Manual/css/all.css @@ -6,7 +6,7 @@ body { body,th,td { font-family: Verdana,Helvetica,Arial,sans-serif; - font-size: 80%; + font-size: 80%; } pre,code,tt { @@ -14,10 +14,6 @@ pre,code,tt { font-size: 100%; } -ul { - list-style-type: square; -} - /* Default link style */ a:link { color:#3366CC; text-decoration:underline; } a:visited { color:#003399; text-decoration:underline; } @@ -27,37 +23,79 @@ a:active { color:#003399; text-decoration:none; } a[name]:hover { color:black; text-decoration:none; } -div.navheader, -div.navfooter { +/* Nav headers and footers */ +div.navheader, div.navfooter { background: #FFCC00; border-top: 1px solid black; border-bottom: 1px solid black; + padding: 1px 0 1px 0; } -div.navheader>table>tbody>tr>th { +div.navheader * * * th { display:none; } +div.navheader a, div.navheader a:visited, div.navfooter a, div.navfooter a:visited { + display: inline-block; + padding: 2px 4px 2px 4px; + text-decoration: none; + color: #ffdd700; + background-color: #F0E68C; + border: 1px solid #004080; +} -div.article, -div.section, -div.appendix, -div.index { - padding: 5px; +div.navheader a:hover, div.navfooter a:hover { + color: #000; + background: #fff; } -/* topic title */ -div.article>div>div>div>h2 { +/* Main topic divs */ +div.book,div.article,div.appendix,div.index { + margin: 0 10px 0 10px; +} + +div.section { + margin: 0 10px 0 20px; +} + +hr { + border: 0; + height: 1px; + color: #707070; + background-color: #707070; +} + +/* Help title page*/ +div.titlepage { + text-align: center; +} + +div.book h1 { + font-size: 200%; + color: #3333cc; + letter-spacing: 0.05em; +} + +/* Topic titles */ +div.article h2, div.appendix h2, div.index h2 { font-size: 160%; text-align: center; color: #3333cc; } div.section h2 { + text-align: left; font-size: 140%; } div.section h3 { + text-align: left; font-size: 120%; + color: #3333cc; +} +div.section h4 { + text-align: left; + font-size: 110%; + color: #3333cc; } #ads { @@ -168,18 +206,21 @@ div.section h3 { font-size: 100%; } -/* table of contents */ +/* Table of contents */ .toc dt { - margin-top: 1em; + line-height: 1.75em; + font-weight: bold; } .toc dd dl dt { - margin-top: 0; + line-height: 1.25em; + font-weight: normal; } -/*.toc .sect1,*/ -.toc .article, -.toc .appendix, -.toc .index { - font-size: 120%; - font-weight: bold; +/* TOC title */ +div.toc p{ + font-size: 150%; +} + +div.toc a:visited, div.toc a:link { + text-decoration: none; } From 77251ef451ed02508e386d2bd4f3ddd31298c1fb Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 11 Aug 2008 08:39:04 +0000 Subject: [PATCH 061/168] BUG: [ 2027325 ] "Syntax Highlight" menu item enabled, if option disabled --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/MergeDoc.cpp | 12 ++++++++++-- Src/MergeEditView.cpp | 9 ++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 08245ec8616..0cb1fd43c65 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -31,6 +31,8 @@ WinMerge 2.9.1.6 BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) BugFix: External editor command line switches did not work (#2037862) BugFix: Editing line filters updated wrong filter (#2025130) + BugFix: Could change syntax highlight mode when highlighting was + disabled from options (#2027325) Translation updates: - Chinese Traditional (#2039929) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 21e348b1f46..1bf0ad56fd0 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2238,10 +2238,18 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file sextL = GetFileExt(sLeftFile.c_str(), m_strDesc[0].c_str()); sextR = GetFileExt(sRightFile.c_str(), m_strDesc[1].c_str()); } - BOOL bLeftTyped = pLeft->SetTextType(sextL.c_str()); + + BOOL syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT); + BOOL bLeftTyped = FALSE; + BOOL bRightTyped = FALSE; + + if (syntaxHLEnabled) + { + bLeftTyped = pLeft->SetTextType(sextL.c_str()); pLeftDetail->SetTextType(sextL.c_str()); - BOOL bRightTyped = pRight->SetTextType(sextR.c_str()); + bRightTyped = pRight->SetTextType(sextR.c_str()); pRightDetail->SetTextType(sextR.c_str()); + } // If other side didn't have recognized texttype, apply recognized // type to unrecognized one. (comparing file.cpp and file.bak applies diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 6f5be203a3a..ae352c7c67d 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -2320,6 +2320,9 @@ void CMergeEditView::RefreshOptions() SetSelectionMargin(GetOptionsMgr()->GetBool(OPT_VIEW_FILEMARGIN)); + if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT)) + SetTextType(CCrystalTextView::TextType::SRC_PLAIN); + SetWordWrapping(GetOptionsMgr()->GetBool(OPT_WORDWRAP)); SetViewLineNumbers(GetOptionsMgr()->GetBool(OPT_VIEW_LINENUMBERS)); m_cachedColors.clrDiff = GetOptionsMgr()->GetInt(OPT_CLR_DIFF); @@ -3242,7 +3245,11 @@ void CMergeEditView::OnUpdateChangeScheme(CCmdUI* pCmdUI) const bool bIsCurrentScheme = (m_CurSourceDef->type == (pCmdUI->m_nID - ID_COLORSCHEME_FIRST)); pCmdUI->SetRadio(bIsCurrentScheme); - pCmdUI->Enable(TRUE); + BOOL syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT); + if (syntaxHLEnabled) + pCmdUI->Enable(TRUE); + else + pCmdUI->Enable(FALSE); } /** From bd3136f6e6e4b3f07d9a959a26f44ccfd0d07a08 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 11 Aug 2008 21:17:49 +0000 Subject: [PATCH 062/168] BUG: [ 2000996 ] Syntax coloring boldface not working in most fonts --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/editlib/ccrystaltextview.cpp | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 0cb1fd43c65..77bd5804b72 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -33,6 +33,7 @@ WinMerge 2.9.1.6 BugFix: Editing line filters updated wrong filter (#2025130) BugFix: Could change syntax highlight mode when highlighting was disabled from options (#2027325) + BugFix: Boldfacing did work only for Courier font (#2000996) Translation updates: - Chinese Traditional (#2039929) diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp index 546e9a07092..8df0bf6c2ba 100644 --- a/Src/editlib/ccrystaltextview.cpp +++ b/Src/editlib/ccrystaltextview.cpp @@ -2296,15 +2296,14 @@ GetFont (BOOL bItalic /*= FALSE*/ , BOOL bBold /*= FALSE*/ ) CClientDC dc (GetDesktopWindow ()); m_lfBaseFont.lfHeight = -MulDiv (11, dc.GetDeviceCaps (LOGPIXELSY), 72); } - m_lfBaseFont.lfWeight = bBold && !_tcsnicmp (m_lfBaseFont.lfFaceName, _T ("Courier"), 7) ? FW_BOLD : FW_NORMAL; - m_lfBaseFont.lfItalic = (BYTE) (bItalic && !_tcsnicmp (m_lfBaseFont.lfFaceName, _T ("Courier"), 7)); + m_lfBaseFont.lfWeight = bBold ? FW_BOLD : FW_NORMAL; + m_lfBaseFont.lfItalic = (BYTE) bItalic; if (!m_apFonts[nIndex]->CreateFontIndirect (&m_lfBaseFont)) { delete m_apFonts[nIndex]; m_apFonts[nIndex] = NULL; return CView::GetFont (); } - } return m_apFonts[nIndex]; } From fe16419ae4633997db025efe505685aecf459b83 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 12 Aug 2008 07:02:28 +0000 Subject: [PATCH 063/168] PATCH: [ 2030359 ] Manual: document -u command line parameter Use -u in command line definition (trunk r5790) --HG-- branch : R2_10 --- Docs/Users/Manual/Command_line.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml index 42738e3bc60..70f785ddedb 100644 --- a/Docs/Users/Manual/Command_line.xml +++ b/Docs/Users/Manual/Command_line.xml @@ -28,7 +28,7 @@ - + From cd640bd9727a2ebf19efabf89edd282afa8b315e Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 12 Aug 2008 21:06:27 +0000 Subject: [PATCH 064/168] PATCH: [ 2047054 ] Add icon for "Open Conflict File" menu item --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/MainFrm.cpp | 1 + Src/Merge2.rc | 1 + Src/res/open_conflict.bmp | Bin 0 -> 774 bytes Src/resource.h | 1 + 5 files changed, 4 insertions(+) create mode 100644 Src/res/open_conflict.bmp diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 77bd5804b72..9768d39278c 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -19,6 +19,7 @@ WinMerge 2.9.1.6 Unlimited undo (#2033754) Add wait cursor for undo and redo (#2039228) Rename color scheme menu item "None" and add separator (#2027300) + Add icon for "Open Conflict File" menu item (#2047054) 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) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 019b5c7a53d..d1099cde9bc 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -96,6 +96,7 @@ static const CPtrList &GetDocList(const CMultiDocTemplate *pTemplate); * @brief A table associating menuitem id, icon and menus to apply. */ const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = { + { ID_FILE_OPENCONFLICT, IDB_FILE_OPENCONFLICT, CMainFrame::MENU_ALL }, { ID_EDIT_COPY, IDB_EDIT_COPY, CMainFrame::MENU_ALL }, { ID_EDIT_CUT, IDB_EDIT_CUT, CMainFrame::MENU_ALL }, { ID_EDIT_PASTE, IDB_EDIT_PASTE, CMainFrame::MENU_ALL }, diff --git a/Src/Merge2.rc b/Src/Merge2.rc index 74fa8566c2e..03821cb89c7 100644 --- a/Src/Merge2.rc +++ b/Src/Merge2.rc @@ -138,6 +138,7 @@ IDB_TOOLBAR_DISABLED32 BITMAP "res\\ToolbarDisabled32.bmp" IDB_TOOLBAR_ENABLED32 BITMAP "res\\ToolbarEnabled32.bmp" IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp" IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp" +IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp" ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/res/open_conflict.bmp b/Src/res/open_conflict.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fe6a36dcf520451ea6206901fb4fa34709e4cbbc GIT binary patch literal 774 zcma))F{;8q5QawuOSQC1`|tol8XpJ&8=GMJNG9O$eUkeK+(pw%V_f^Xn3 z3<1;npML+8mp&h%pYHJXU{0)jqbcGSc(r+o+e0`9f?Kh%JtR4!aGh(5D2jaF$0Z=6 zrpb(UmrocQ!N+lIm=_C1Mx<%#d7kJ$&gkmHr;;}Fb&oCR;$pUj2dk`I7$Z+$%rb5v z5BD&GjS#P@3VhRpLI*%m6oBC&%Q76NMc){6*JKvu>s}&HWWC{s5y9F_Vos|;jG{Q literal 0 HcmV?d00001 diff --git a/Src/resource.h b/Src/resource.h index db6c9f9a388..1970ce7a71a 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -100,6 +100,7 @@ #define IDB_TOOLBAR_ENABLED32 357 #define IDB_VIEW_ZOOMIN 358 #define IDB_VIEW_ZOOMOUT 359 +#define IDB_FILE_OPENCONFLICT 361 #define IDI_FOLDER 500 #define IDI_LFOLDER 501 #define IDI_RFOLDER 502 From d3b66b5079aa077bf2d50785d4ab78b9ac5e5af6 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 13 Aug 2008 05:28:25 +0000 Subject: [PATCH 065/168] PATCH: [ 2046002 ] Fix losing focus after folder compare operations --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Common/CShellFileOp.cpp | 2 -- Src/DirActions.cpp | 2 ++ Src/MainFrm.cpp | 3 +++ Src/Merge.cpp | 1 + Src/Merge.h | 26 ++++++++++++++++++++++++++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 9768d39278c..230dc1171c5 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -35,6 +35,7 @@ WinMerge 2.9.1.6 BugFix: Could change syntax highlight mode when highlighting was disabled from options (#2027325) BugFix: Boldfacing did work only for Courier font (#2000996) + Bugfix: Lost focus after folder compare operations (#2046002) Translation updates: - Chinese Traditional (#2039929) diff --git a/Src/Common/CShellFileOp.cpp b/Src/Common/CShellFileOp.cpp index 1ec24f5f78e..93f4a06a979 100644 --- a/Src/Common/CShellFileOp.cpp +++ b/Src/Common/CShellFileOp.cpp @@ -540,9 +540,7 @@ int nAPIRet; } // drum roll please.... - ((CFrameWnd *)AfxGetMainWnd())->BeginModalState(); nAPIRet = SHFileOperation ( &m_rFOS ); // tah-dah! - ((CFrameWnd *)AfxGetMainWnd())->EndModalState(); // Save the return value from the API. if ( NULL != lpnAPIReturn ) { diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index dbfce6d1a45..63c2079ae78 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -973,8 +973,10 @@ void CDirView::PerformActionList(FileActionScript & actionScript) actionScript.SetParentWindow(this->GetSafeHwnd()); + theApp.AddOperation(); if (actionScript.Run()) UpdateAfterFileScript(actionScript); + theApp.RemoveOperation(); } /** diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index d1099cde9bc..a8fd825139d 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1756,6 +1756,9 @@ void CMainFrame::ActivateFrame(int nCmdShow) */ void CMainFrame::OnClose() { + if (theApp.GetActiveOperations()) + return; + // Check if there are multiple windows open and ask for closing them BOOL bAskClosing = GetOptionsMgr()->GetBool(OPT_ASK_MULTIWINDOW_CLOSE); if (bAskClosing) diff --git a/Src/Merge.cpp b/Src/Merge.cpp index a2323019676..97294f8058a 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -137,6 +137,7 @@ CMergeApp::CMergeApp() : , m_bNonInteractive(false) , m_pOptions(NULL) , m_pLog(NULL) +, m_nActiveOperations(0) { // add construction code here, // Place all significant initialization in InitInstance diff --git a/Src/Merge.h b/Src/Merge.h index 5dd9b110b79..0d9aaf11fc3 100644 --- a/Src/Merge.h +++ b/Src/Merge.h @@ -113,6 +113,31 @@ class CMergeApp : public CWinApp void ReloadMenu(); + //@{ + /** + * @name Active operations counter. + * These functions implement counter for active operations. We need to + * track active operations during whose user cannot exit the application. + * E.g. copying files in folder compare is such an operation. + */ + /** + * Increment the active operation counter. + */ + void AddOperation() { InterlockedIncrement(&m_nActiveOperations); } + /** + * Decrement the active operation counter. + */ + void RemoveOperation() + { + ASSERT(m_nActiveOperations > 0); + InterlockedDecrement( &m_nActiveOperations); + } + /** + * Get the active operations count. + */ + LONG GetActiveOperations() const { return m_nActiveOperations; } + //@} + //{{AFX_MSG(CMergeApp) afx_msg BOOL OnOpenRecentFile(UINT nID); afx_msg void OnAppAbout(); @@ -127,6 +152,7 @@ class CMergeApp : public CWinApp CLogFile * m_pLog; int m_nLastCompareResult; bool m_bNonInteractive; + LONG m_nActiveOperations; /**< Active operations count. */ }; extern CMergeApp theApp; From 8f31f64134fecdf2e0048695f8fe0952b14d8a6f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 14:50:48 +0000 Subject: [PATCH 066/168] Bump ShellExtension version to 1.14.3. --HG-- branch : R2_10 --- ShellExtension/ShellExtension.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc index d706bb85dd4..68316b00fe0 100644 --- a/ShellExtension/ShellExtension.rc +++ b/ShellExtension/ShellExtension.rc @@ -264,8 +264,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,14,2,0 - PRODUCTVERSION 1,14,2,0 + FILEVERSION 1,14,3,0 + PRODUCTVERSION 1,14,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -283,7 +283,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "http://winmerge.org\0" VALUE "FileDescription", "WinMerge Shell Integration library\0" - VALUE "FileVersion", "1.14.2.0\0" + VALUE "FileVersion", "1.14.3.0\0" VALUE "InternalName", "ShellExtension\0" VALUE "LegalCopyright", "Copyright 2003-2008\0" VALUE "LegalTrademarks", "\0" @@ -291,7 +291,7 @@ BEGIN VALUE "OriginalFilename", "ShellExtension.DLL\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "WinMerge Shell Integration library\0" - VALUE "ProductVersion", "1.14.2.0\0" + VALUE "ProductVersion", "1.14.3.0\0" VALUE "SpecialBuild", "\0" END END From b62aa466794cc134b62c1d9adb53bb178d995c10 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 14:51:57 +0000 Subject: [PATCH 067/168] Bump manual revision to 1.4.5. --HG-- branch : R2_10 --- Docs/Users/Manual/WinMerge_help.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 020aa7dd03f..b9363333f7e 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -25,7 +25,7 @@ WinMerge - Revision 1.4.4 + Revision 1.4.5 2004-2008 From 8194c31f23815862d3398ab516db1c90c352deb5 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 15:42:44 +0000 Subject: [PATCH 068/168] PATCH: [ 1991259 ] Convert editor find/replace to use PCRE regexps Bugfix to non-ascii chars in unicode build from Takashi --HG-- branch : R2_10 --- Src/editlib/ccrystaltextview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp index 8df0bf6c2ba..c6229583f17 100644 --- a/Src/editlib/ccrystaltextview.cpp +++ b/Src/editlib/ccrystaltextview.cpp @@ -104,6 +104,7 @@ #include "ViewableWhitespace.h" #include "SyntaxColors.h" #include "Ucs2Utf8.h" +#include "unicoder.h" #include "pcre.h" // Escaped character constants in range 0x80-0xFF are interpreted in current codepage @@ -4550,8 +4551,13 @@ FindStringHelper (LPCTSTR pszFindWhere, LPCTSTR pszFindWhat, DWORD dwFlags, if (result >= 0) { +#ifdef UNICODE + pos = ucr::stringlen_of_utf8(compString, ovector[0]); + nLen = ucr::stringlen_of_utf8(compString, ovector[1]) - pos; +#else pos = ovector[0]; nLen = ovector[1] - ovector[0]; +#endif } else pos = -1; From 65d80d679acb4ca32fb5dee15a01ff341c75a411 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 15:48:27 +0000 Subject: [PATCH 069/168] PATCH: [ 2050348 ] Release notes update for 2.10 beta --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReleaseNotes.html | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 230dc1171c5..f690752642b 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -20,6 +20,7 @@ WinMerge 2.9.1.6 Add wait cursor for undo and redo (#2039228) Rename color scheme menu item "None" and add separator (#2027300) Add icon for "Open Conflict File" menu item (#2047054) + Release notes update (#2050348) 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) diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html index b4a386fdb7f..682d03b0747 100644 --- a/Docs/Users/ReleaseNotes.html +++ b/Docs/Users/ReleaseNotes.html @@ -57,13 +57,13 @@

      WinMerge 2.9.10 Beta Release Notes
    7. Known Issues
      8. -

      July 2008

      +

      August 2008

      About This Release

      This is a WinMerge beta release which is meant for preview the current state of -WinMerge development. This release is not recommended for the production. +the WinMerge development. This release is not recommended for the production.

      @@ -98,16 +98,42 @@

      Installing for all users

      after installing.

      +

      Focus losing bug has been fixed

      +

      +WinMerge lost focus after doing folder compare operations (copy, delete, etc). +This annoying bug has now been fixed. +

      + +

      Plugins disabled by default

      +

      +Plugins are now disabled by default. One must enable plugins from new Plugins- +dialog (Plugins/List... from the main menu). This was done because some plugins +can cause unexpected behavior and compare results when they are run by default. +

      + +

      Unlimited undo

      +

      +Undo limitation is now removed. Although the limit was high, merging large files +with lots of differences could hit that limit. If all differences were copied +in such files that "copy all" operation could not be undo anymore. +

      +

      Changes

        +
      • Add ShellExtension menu for drive letters (root folders)
      • Fix location pane flickering, optimize location pane
        • +
      • Refresh compare after changing filter
        • +
      • Add -u commandline parameter as alternative to -ub
      • Open conflict files by drag&dropping file to main window
        • +
      • Fix: the external editor command line switches didn't work
        • +
      • Fix: only Courier font had boldfacing enabled in the editor
      • Manual improvements

      Translation updates

      • New Slovenian translation
        • +
      • Chinese Traditional updated

      Known Issues

      From 0f3fe17fee779d54bcd9c33052766d0e4e132fe0 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 15:55:21 +0000 Subject: [PATCH 070/168] Update PO files from English.POT for 2.9.10 beta release. --HG-- branch : R2_10 --- Src/Languages/Brazilian.po | 2549 ++++++++++++++-------------- Src/Languages/Bulgarian.po | 2549 ++++++++++++++-------------- Src/Languages/Catalan.po | 2549 ++++++++++++++-------------- Src/Languages/ChineseSimplified.po | 2549 ++++++++++++++-------------- Src/Languages/Croatian.po | 2549 ++++++++++++++-------------- Src/Languages/Czech.po | 2549 ++++++++++++++-------------- Src/Languages/Danish.po | 2549 ++++++++++++++-------------- Src/Languages/Dutch.po | 2549 ++++++++++++++-------------- Src/Languages/French.po | 2549 ++++++++++++++-------------- Src/Languages/German.po | 2549 ++++++++++++++-------------- Src/Languages/Greek.po | 2549 ++++++++++++++-------------- Src/Languages/Hungarian.po | 2549 ++++++++++++++-------------- Src/Languages/Italian.po | 2549 ++++++++++++++-------------- Src/Languages/Japanese.po | 2549 ++++++++++++++-------------- Src/Languages/Korean.po | 2549 ++++++++++++++-------------- Src/Languages/Norwegian.po | 2549 ++++++++++++++-------------- Src/Languages/Polish.po | 2549 ++++++++++++++-------------- Src/Languages/Portuguese.po | 2549 ++++++++++++++-------------- Src/Languages/Romanian.po | 2549 ++++++++++++++-------------- Src/Languages/Russian.po | 2549 ++++++++++++++-------------- Src/Languages/Slovak.po | 2549 ++++++++++++++-------------- Src/Languages/Slovenian.po | 2549 ++++++++++++++-------------- Src/Languages/Spanish.po | 2549 ++++++++++++++-------------- Src/Languages/Swedish.po | 2549 ++++++++++++++-------------- Src/Languages/Turkish.po | 2545 +++++++++++++-------------- Src/Languages/Ukrainian.po | 2549 ++++++++++++++-------------- 26 files changed, 34214 insertions(+), 32056 deletions(-) diff --git a/Src/Languages/Brazilian.po b/Src/Languages/Brazilian.po index 9791191b8f9..c81555187f8 100644 --- a/Src/Languages/Brazilian.po +++ b/Src/Languages/Brazilian.po @@ -74,7 +74,7 @@ msgstr "Co&rtar" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -86,7 +86,7 @@ msgid "&Paste" msgstr "&Colar" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -97,62 +97,64 @@ msgid "Op&en" msgstr "Ab&rir" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "com &o Aplicativo Registrado" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "com &o Editor Externo" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&com..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Arquivo" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Ab&rir o Arquivo do Conflito..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&jeto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Sa&lvar Projeto..." @@ -163,1911 +165,1920 @@ msgid "Recent Projects" msgstr "Projetos Recentes" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "S&air" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Opes..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Visualizar" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Selecionar a &Fonte..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Usar a Fonte P&adro" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Nenhum" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Pequeno" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&Barra de Status" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Ba&rra das Abas" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Idioma..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Gerar Patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Desempacotamento Manual" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Desempacotamento Automtico" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Editar com o Desempacotador" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Debug" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Carregar Config..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Resetar as Opes" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Janela" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "Fe&char" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Fec&har Tudo" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar o &Painel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Lado a Lado &Horizontalmente" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Lado a Lado &Verticalmente" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Em Cascata" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Ajuda" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Ajuda do WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "N&otas sobre o Lanamento" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Tradues" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "C&onfigurao" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "S&uporte para Arquivos desativado..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU Licena para o Pblico em Geral" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Sobre o WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "S&omente-Leitura a Esquerda" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "S&omente-Leitura a Direita" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Codifi&cao do Arquivo" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecio&nar Tudo\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Mostr&ar Itens Idnticos" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Mostr&ar Itens Diferentes" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra&r os Itens nicos a Esquerda" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar &os Itens nicos a Direita" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Mostra&r os Itens Pulados" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "M&ostrar Arquivos Binrios" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar os &Itens Escondidos" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Compa&rar as Estatsticas" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Atuali&zar\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Atualizar os Selecionados\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Unir" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Diferena Seguinte\tAlt+Pra Baixo" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Diferena Anterior\tAlt+Pra Cima" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primeira Diferena\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Diferena Atual\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "<ima Diferena\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar p&ara a Direita\tAlt+Direita" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar p&ara a Esquerda\tAlt+Esquerda" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Apagar\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar as Colunas..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Gerar &Relatrio..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salvar\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Salvar &a Esquerda" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Salvar" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Salvar &Como..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Salvar &a Direita" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Configu&rao da Pgina" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Pr-Visualiz&ao da Impresso" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Converter os Finais das Linhas para" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modo de Unio\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "&Codificao do Arquivo..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Co&rtar\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecionar a &Diferena da Linha\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "A&char...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&ituir...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Scripts" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Vazio >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avanado" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar Com Os Nmeros das Linhas\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Bookmarks" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Ativar o Bookmark\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Bookmark Seguinte\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Bookmark Anterior\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Limpar Todos os Bookmarks" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir Para...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Mais &Zoom\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Menos &Zoom\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Destacar a Sintaxe" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "&Trancar os Painis" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Visualizar os Espaos em Branco" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Vis&ualizar as Diferenas das Linhas" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Visualizar &os Nmeros das Linhas" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Visual&izar as Margens" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "O&rganizar as Linhas" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Tr&ocar os Painis" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Pain&el da Diferena" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Pa&inel de Localizao" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a Direita e Avanar\tAlt+Ctrl+Direita" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar ¶ a Esquerda e Avanar\tAlt+Ctrl+Esquerda" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Copiar &Tudo para a Direita" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Cop&iar Tudo para a Esquerda" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Comp&arar" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Co&mparar Especial" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Esquerda para a Direita" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "E&squerda para..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Direita para a Esquerda" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "D&ireita para..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Mover" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Esquerda para..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Direita para..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Apagar" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Esquerda" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Direita" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Re&nomear" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Esconder os Itens" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&Abrir a Esquerda" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "A&brir a Direita" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&iar os nomes dos caminhos" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Esquerda (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Direita (%1 de %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambos (%1 de %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Copiar &os nomes dos arquivos" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Esquerda... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Direita... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambos... (%1 de %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Diferenas... (%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Atualizar" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Copiar o Caminho Completo" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Copiar &o nome do arquivo" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Configuraes do Prediffer" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Sem prediffer" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Auto prediffer" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "I&r para a Diferena" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Nenhum dos Blocos Movidos" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Todos os Blocos Movidos" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco Movido par&a a Diferena Atual" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Sobre o WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Build Privado)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visitar a Home Page do WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Contribuidores" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Selecionar Arquivos ou Pastas" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Esquerda:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Procurar..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Direita:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Pro&curar..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Selecionar..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Desempacotador:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Selecionar..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Incluir as Sub-pastas" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Arquivos ou Pastas para Comparar" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projeto:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Usurio:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Senha:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Link para o projeto VSS Destino" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Veja Isso" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Salvar Como..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Sistema de Verses" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Sistema de Verses:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Caminho para o cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticame&nte rolar para a primeira diferena" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Desativar a Tela de Inicializao" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fe&char as janelas com o ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticamente verificar os caminhos no dilogo-Abrir" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Per&mitir apenas uma instncia a executar" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "Pe&rguntar quando fechar mltiplas janelas" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preservar a hora do arquivo na comparao dos arquivos" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-Concluso do dilogo-Abrir:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Ativar mltiplas janelas de comparao para" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&Comparar as pastas" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Com¶r os arquivos" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite esconder algumas caixas de mensagens comuns. Pressione o boto Resetar para tornar todas as caixas de mensagens visveis de novo." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Resetar" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Idiomas" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Idiomas disponveis:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Achar" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "Ac&har:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Combinar &apenas palavras inteiras" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Combinar &com o caso sensitivo" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "Express&o regular" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "N&o organizar o final do arquivo" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direo" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Pra cima" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Pra baixo" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Achar o Prximo" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Su&bstituir por:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&No organizar o final do arquivo" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Substituir" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Seleo" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "No &arquivo inteiro" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Substituir" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Substituir &Tudo" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Veja Isso" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Comentrios" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn aps o checkout" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtros das linhas" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Ativar os Filtros das Linhas" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresses Regulares (uma por linha):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Salvar" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Novo" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Remover" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Diferena:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Diferena Selecionada:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "2 Plano" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Apagado" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Diferena Ignorada:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Movido:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Selecionado o Movido:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Diferena das Palavras:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Diferena das Palavras Selecionadas:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Padres" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dilogo" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar os arquivos apagados para o Recycle Bin" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integrao" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Adicionar ao menu de contexto do explorer" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "A&tivar o menu avanado" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir as sub-pastas por padro" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Editor externo:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filtrar a pasta:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "P&rocurar..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Pasta dos arquivos temporrios" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "P&asta temporria do sistema" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "P&asta personalizada:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Pr&ocurar..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Gerador de Patches" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Arquivo&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Arquivo&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Trocar" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Anexar ao arquivo existente" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "E&spaos em branco" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Com¶r" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnorar as mudanas" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&norar tudo" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ar as linhas em branco" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Caso sensi&tivo" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inclu&ir a linha de comando" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir no e&ditor externo" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Exibir Colunas" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Mover &pra Cima" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Mover &pra Baixo" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Selecionar o Desempacotador" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Desempacotador do arquivo:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Exibir todos os desempacotadores, no verificar a extenso" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lista das extenses:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descrio:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Progresso da Comparao das Pastas" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparando os itens..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ir Para" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "I&r para:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Arquivo" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nha" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Diferena" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Ir Para" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Espao em branco" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorar a mudana" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnorar tudo" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar as li&nhas em branco" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorar &caso sensitivo" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar diferenas de retorno dos procedimentos (Win/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "A&tivar a deteco dos blocos movidos" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Combinar as linhas similares" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar as diferenas de hora menores do que 3 segundos" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Mtodo para Comparar Arquivos:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "P&arar aps a primeira diferena" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Comentrios do Filtro" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Destacar a sintaxe" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Re-escaneamento automtico" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar os caracteres EOL originais" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Abas" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tamanho das abas:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Inserir Abas" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Inserir &Espaos" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Coloramento das Diferenas das Linhas" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Visualizar as diferenas das linhas" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&Nvel dos caracteres" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&Nvel das palavras:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtros dos arquivos" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Teste" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Apagar..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Salvar os arquivos modificados?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Arquivo do lado esquerdo" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Salvar mudanas" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Descartar mudanas" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Arquivo do lado direito" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S&alvar mudanas" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Des&cartar mudanas" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Descartar Tudo" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Cdigo da pgina" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Cdigo da Pgina Padro" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecionar o cdigo de pgina padro assumido quando carregar arquivos no-unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "Detectar a info do cdigo de pgina para estes arquivos : .html, .rc, .xml - precisa reiniciar a sesso" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Cdigo de pgina do sistema" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "De Acordo com a Interface do Usurio do WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Cdigo de pgina personalizado :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suporte para arquivos desativado" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Incapaz de detectar a verso do 7-Zip (no instalado?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "O suporte para arquivos requer que o 7-Zip 3.11 ou posterior esteja instalado no seu computador, ou que seus componentes essenciais sejam copiados para o diretrio do programa para operao isolada." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Deve haver tambm um plugin com interface apropriada (Merge7z*.dll) no caminho." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Por favor use a verso do 7-Zip recomendada abaixo at que os plugins de interface para as verses posteriores se tornem disponveis." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Verso" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2076,54 +2087,54 @@ msgstr "" "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Verso recomendada do 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "atual" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado no seu computador:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "faltando" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes do 7-Zip para operao isolada:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "desatualizado" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins no caminho:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2132,488 +2143,499 @@ msgstr "" "No exibir esta mensagem de novo.\n" "(Voc pode sempre chamar de novo esta mensagem no menu Ajuda.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Download do Plugin" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opes" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Categorias" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nomes das funes:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Comentrios:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nmeros:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Strings:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Pr-processador:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Usurio 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Usurio 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Relatrio sobre a Comparao das Pastas" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Reportar &Arquivo:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Procurar..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Estilo:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar para a rea de Transferncia" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartilhado ou Privado" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Que tipo de filtro voc quer criar?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro Compartilhado (para todos os usurios nesta mquina)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro Privado (s para o usurio atual)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Suporte para Arquivos" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte para arquivos requer o plugin do 7-zip instalado:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar o Plugin do 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Ativar o suporte para arquivos dentro do arquivo" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usar 7-zip isolado se disponvel" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sar 7-Zip local da pasta do WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar o tipo de arquivo da assinatura do arquivo" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Comparar as Estatsticas" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Arquivos:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binrio:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "nico" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Idnticos" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Afeta" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Afeta)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Selecionar o Cdigo da Pgina para" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Carregamento do Arquivo:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Salvamento do &Arquivo:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Usar o mesmo cdigo de pgina para ambos" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testar Filtro" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testando o filtro ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Inserir o texto para testar:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nome da Pasta" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Teste" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Fechar" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Usar cores de texto personalizadas" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Cores de texto personalizadas" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Espao vazio:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Texto regular:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Seleo:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Caminhos" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "S&omente-leitura" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "So&mente-leitura" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Salvar..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Arquivos de Backup" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Criar arquivos de backup em:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Pasta do arquivo original" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Pasta de backup global:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nome do arquivo de backup:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Anexar a extenso .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "A&nexar a estampa de tempo" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Confirmar a Cpia" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Voc tem certeza que voc quer copiar os itens XXX?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Da esquerda" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Para a direita" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Sim" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "No" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041604e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x416, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2622,7 +2644,7 @@ msgstr "" "Criar documentos vazios\n" "Novos Documentos (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2631,7 +2653,7 @@ msgstr "" "Abrir um documento existente\n" "Abrir" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" "Fechar o documento ativo\n" "Fechar" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2649,7 +2671,7 @@ msgstr "" "Salvar o documento ativo\n" "Salvar" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2658,7 +2680,7 @@ msgstr "" "Salvar o documento ativo com um novo nome\n" "Salvar Como" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" "Mudar as opes de impresso\n" "Configurar Pgina" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2676,7 +2698,7 @@ msgstr "" "Mudar a impressora e as opes de impresso\n" "Configurar a impresso" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2685,7 +2707,7 @@ msgstr "" "Imprimir o documento ativo\n" "Imprimir" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2694,12 +2716,12 @@ msgstr "" "Exibir pginas completas\n" "Pr-Visualizar Impresso" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Tornar todos os itens escondidos visveis de novo" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2708,32 +2730,32 @@ msgstr "" "Abrir o arquivo do projeto\n" "Arquivo do projeto (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao tentar abrir o arquivo do projeto" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao tentar salvar o arquivo do projeto" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Arquivo do Projeto" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Arquivo do projeto carregado com sucesso." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Arquivo do projeto salvo com sucesso." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2742,7 +2764,7 @@ msgstr "" "Salvar os caminhos atuais e opes no arquivo do projeto\n" "Salvar o Arquivo do Projeto" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2751,7 +2773,7 @@ msgstr "" "Exibir as informaes do programa, nmero da verso e copyright\n" "Sobre" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2760,27 +2782,27 @@ msgstr "" "Sair do aplicativo; alertar para salvar os documentos\n" "Sair" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Abrir este documento" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" "Troca para o prximo painel da janela\n" "Painel Seguinte" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2798,7 +2820,7 @@ msgstr "" "Troca de volta para o painel da janela anterior\n" "Painel Anterior" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2807,7 +2829,7 @@ msgstr "" "Organiza as janelas para que elas se sobreponham\n" "Janelas em Cascata" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2816,7 +2838,7 @@ msgstr "" "Organizar as janelas lado a lado no sobrepostas horizontalmente\n" "Janelas Lado a Lado Horizontalmente" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2825,7 +2847,7 @@ msgstr "" "Organizar as janelas lado a lado no sobrepostas verticalmente\n" "Janelas Lado a Lado Verticalmente" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" "Copia a seleo e a pe na rea de Transferncia\n" "Copiar" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2843,7 +2865,7 @@ msgstr "" "Corta a seleo e a pe na rea de Transferncia\n" "Cortar" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2852,7 +2874,7 @@ msgstr "" "Achar o texto especificado\n" "Achar" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2861,7 +2883,7 @@ msgstr "" "Inserir os contedos da rea de Transferncia\n" "Colar" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2870,7 +2892,7 @@ msgstr "" "Repetir a ltima ao\n" "Repetir" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2879,7 +2901,7 @@ msgstr "" "Substitui o texto especfico com um texto diferente\n" "Substituir" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2888,7 +2910,7 @@ msgstr "" "Seleciona o documento inteiro\n" "Selecionar Tudo" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2897,7 +2919,7 @@ msgstr "" "Desfazer a ltima ao\n" "Desfazer" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2906,7 +2928,7 @@ msgstr "" "Refazer a ao desfeita anteriormente\n" "Refazer" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2915,7 +2937,7 @@ msgstr "" "Mostrar ou esconder a barra de ferramentas\n" "Ativar a Barra de Ferramentas" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2924,7 +2946,7 @@ msgstr "" "Mostrar ou esconder a barra de status\n" "Ativar a Barra de Status" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2933,7 +2955,7 @@ msgstr "" "Mostrar ou esconder a barra das abas\n" "Ativar a Barra das Abas" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2942,57 +2964,57 @@ msgstr "" "Automaticamente redimensionar os painis\n" "Trancar os Painis" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Mudar o tamanho da janela" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Mudar a posio da janela" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um cone" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho completo" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Trocar para a prxima janela do documento" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Trocar para a janela do documento anterior" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e alerta para salvar os documentos" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Restaurar a janela para o tamanho normal" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Ativar a Lista de Tarefas" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Ativar esta janela" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3001,7 +3023,7 @@ msgstr "" "Fechar o modo de pr-visualizao da impresso\n" "Cancelar a Pr-Visualizao" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3020,7 +3042,7 @@ msgstr "" "WinMerge.FileCompare\n" "Comparao dos Arquivos do WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3039,23 +3061,23 @@ msgstr "" "WinMerge.FolderCompare\n" "Comparao das Pastas do WinMerge" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar os caracs. EOL originais" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Pressione qualquer tecla" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o direito no caminho para copiar" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3064,152 +3086,152 @@ msgstr "" "Desenvolvedores:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vem com ABSOLUTAMENTE NENHUMA GARANTIA. Este um software livre e voc bem vindo para redistribu-lo sob certas circunstncias; veja o GNU Licena para o Pblico em Geral no menu Ajuda para detalhes." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Abortar" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Tentar de novo" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignorar &tudo" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Sim" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Sim para &todos" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "No para t&odos" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Pular" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Pular &tudo" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "No exibir esta &mensagem de novo." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "No perguntar esta &questo de novo." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Cores da sintaxe" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Cores do Texto" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Controle da Verso" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Para:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Da esquerda:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Para a esquerda:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Da direita:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Para a direita:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Verso %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opes (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as caixas de mensagens agora sero exibidas de novo." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Modificaes foram feitas na sesso de comparao do arquivo atual. Algumas configuraes podem no acontecer at que a comparao do arquivo atual seja reiniciada." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A mudana da fonte selecionada no ser aplicada a qualquer das janelas das diferenas atualmente visveis." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3220,7 +3242,7 @@ msgstr "" "\n" "Por favor use valores de 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3231,127 +3253,129 @@ msgstr "" "\n" "Por favor reinicie o WinMerge aps o reset." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Arquivos dos Projetos do WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Arquivos das opes (*.ini)|*.ini|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Arquivos Texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Arquivos XML (*.xml)|*.xml|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Contedos Completos" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Contedos Rpidos" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Data Modificada" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Data e Tamanho Modificados" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Local" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Descrio" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Selecionar o nome do arquivo para o novo filtro" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtros dos Arquivos (*.flt)|*.flt|Todos os Arquivos (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3364,7 +3388,7 @@ msgstr "" "Por favor copie o arquivo %1 para a pasta WinMerge/Filtros:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3377,7 +3401,7 @@ msgstr "" "\n" "Por favor tenha certeza de que a pasta exista e gravvel." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3388,7 +3412,7 @@ msgstr "" "\n" "Por favor selecione a pasta do filtro em Opes/Sistema." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3401,12 +3425,12 @@ msgstr "" "\n" "Talvez o arquivo seja somente-leitura?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Localizar o filtro do arquivo para instalar" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3417,208 +3441,223 @@ msgstr "" "\n" "No pde copiar o novo arquivo do filtro para a pasta do filtro." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "O arquivo do filtro j existe. Sobrescrever o filtro existente?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Expresso regular" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Caminho para o cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Caminho para o SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultado da Comparao dos Pastas" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Comparao de Arquivo" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Sem ttulo a esquerda" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Sem ttulo a direita" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "O Arquivo Deles" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Meu Arquivo" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Escaneando arquivos..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Abrindo a seleo" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Copiando da Esquerda para a Direita" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Copiando da Direita para a Esquerda" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Copiando Tudo para a Esquerda" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Copiando Tudo para a Direita" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Copiando os arquivos..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Apagando os arquivos..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Movendo os arquivos..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Criando o relatrio..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Unir" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Diferena %1 de %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferenas Achadas" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 Diferena Achada" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Itens: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecione duas pastas ou arquivos existentes para comparar" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Seleo de Pastas" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecione duas pastas ou dois arquivos para comparar." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "O caminho esquerdo invlido!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "O caminho direito invlido!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Ambos os caminhos so invlidos!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Escolher dois arquivos para ativar a seleo do desempacotador." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "No pde comparar o arquivo e a pasta!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Arquivo no achado: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Arquivo no desempacotado: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3631,12 +3670,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Falhou em analisar o arquivo do conflito." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3647,32 +3686,32 @@ msgstr "" "%1\n" "no um arquivo de conflito." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Salvar Como" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Salvar as mudanas em %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 est marcado como somente-leitura. Voc gostaria de sobrescrever o arquivo somente-leitura ? (No para salvar com um novo nome de arquivo.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Erro ao verificar a habilidade de gravar no destino" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Erro ao fazer o backup do arquivo" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3685,7 +3724,7 @@ msgstr "" "\n" "Continuar de qualquer maneira?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3702,7 +3741,7 @@ msgstr "" "\t-usar um nome de arquivo diferente (Pressione Ok)\n" "\t-abortar a operao atual (Pressione Cancelar)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3717,7 +3756,7 @@ msgstr "" "\n" "Voc quer salvar a verso desempacotada em outro arquivo?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3732,7 +3771,7 @@ msgstr "" "\n" "Voc quer salvar a verso despachada em outro arquivo?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3747,7 +3786,7 @@ msgstr "" "\n" "Sobrescrever o arquivo mudado?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3756,7 +3795,7 @@ msgstr "" "%1\n" "est marcado como somente-leitura. Voc gostaria de sobrescrever o item somente-leitura?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3771,17 +3810,17 @@ msgstr "" "\n" "Se voc quer atualizar os arquivos feche a comparao do arquivo atual e carregue os arquivos de novo." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Salvar o Arquivo a Esquerda Como" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Salvar o Arquivo a Direita Como" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3792,42 +3831,42 @@ msgstr "" "\n" "Atualize os documentos antes de continuar." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Voc deve especificar o caminho de um projeto do SourceSafe para continuar (ex: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Ver os arquivos da VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "O Sistema de Verses retornou um erro enquanto tentava verificar o arquivo. Incapaz de continuar..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar o comando do sistema de verses." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A Pasta de Trabalho VSS e o local do arquivo atual no combinam. Continuar?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "No foram achadas base(s) de dados VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Erro da VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3838,7 +3877,7 @@ msgstr "" " Por favor, verifique a spec da config da visualizao usada.\n" " Desfazer a operao de verificao?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3847,170 +3886,169 @@ msgstr "" "O Sistema de Verses retornou um erro enquanto tentava desfazer o checkout do arquivo.\n" " Por favor, verifique a spec da config da visualizao usada." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor do que 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e acima)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Quebrar no espao em branco" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebrar no espao em branco ou pontuao" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar o item selecionado para o diretrio nomeado" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar o item selecionado para o diretrio personalizado" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Apagar o item selecionado a esquerda" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Apagar o item selecionado a direita" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Apagar o(s) item(ns) selecionado(s) em ambos os lados" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Esconder o(s) item(ns) selecionado(s) (filtro on the fly)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Renomear o item selecionado em ambos os lados" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Direita para a Esquerda (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Esquerda para a Direita (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Direita para a Esquerda (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerda para a Direita (%1 de %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Esquerda para... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Direita para... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerda para... (%1 de %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Direita para... (%1 de %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Selecionar a pasta de destino" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - selecionar a pasta de destino:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - selecionar a pasta de destino:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Arquivos Afetados)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Arquivos Afetados)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4021,17 +4059,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Voc tem certeza de que voc quer copiar:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voc tem certeza que voc quer copiar os itens %d:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4050,458 +4088,473 @@ msgstr "" "\n" "Por favor atualize a comparao." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Abrir o arquivo a esquerda" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Abrir o arquivo a esquerda no editor externo" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Abrir o arquivo a esquerda com..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Abrir o arquivo a direita" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Abrir o arquivo a direita no editor externo" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Abrir o arquivo a direita com..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Falhou em executar o editor externo: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extenso desconhecida no editor externo: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar os nomes dos arquivos para a rea de transferncia" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar os nomes dos caminhos do lado esquerdo para a rea de transferncia" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar os nomes dos caminhos do lado direito para a rea de transferncia" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar os nomes dos caminhos de ambos os lados para a rea de transferncia" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Formato do arquivo desconhecido" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Adicionar os itens do lado esquerdo ao arquivo" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Adicionar os itens do lado direitos ao arquivo" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Adicionar os itens de ambos os lados ao arquivo" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adicionar itens diferentes ao arquivo (de ambos os lados)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mover o arquivo selecionado a esquerda para o diretrio personalizado" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mover o arquivo selecionado a direita para o diretrio personalizado" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nome do Arquivo" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Pasta" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultado da comparao" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Data da Esquerda" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Data da Direita" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extenso" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Tamanho a Esquerda" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Tamanho a Direita" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Tamanho a Direita (Curto)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Tamanho a Esquerda (Curto)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Hora da Criao a Esquerda" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Hora da Criao a Direita" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Arquivo Mais Novo" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Verso do Arquivo a Esquerda" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Verso do Arquivo a Direita" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Resultado Curto" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atributos da Esquerda" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atributos da Direita" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "EOL a esquerda" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "EOL a direita" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Codificao a Esquerda" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Codificao a Direita" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Diferena Ignorada." -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Diferenas" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binrio" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Incapaz de comparar os arquivos" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Arquivo pulado" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Pasta pulada" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Apenas a esquerda: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Apenas a direita: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Os arquivos binrios so idnticos" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Os arquivos binrios so diferentes" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Os arquivos so diferentes" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Apenas a Esquerda" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Apenas a Direita" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Erro" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 item selecionado" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 itens selecionados" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nome do arquivo ou nome da pasta." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome da sub-pasta quando as sub-pastas so includas." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparao, formulrio longo" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Data de modificao do lado esquerdo." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Data de modificao do lado direito." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Extenso do arquivo." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do arquivo a esquerda em bytes." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do arquivo a direita em bytes." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do arquivo a esquerda abreviado." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do arquivo a direita abreviado." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Hora de criao do lado esquerdo." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Hora da criao do lado direito." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Diz qual lado tem a data de modificao mais nova." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verso do arquivo do lado esquerdo, s para alguns tipos de arquivos." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verso do arquivo do lado direito, s para alguns tipos de arquivos." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Resultado curto da comparao." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL do arquivo do lado esquerdo" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL do arquivo do lado direito" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Codificao do lado esquerdo." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Codficao do lado direito." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nmero de diferenas ignoradas no arquivo. Estas diferenas so ignoradas pelo WinMerge e no podem ser unidas." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nmero de diferenas no arquivo. Este nmero no inclui as diferenas ignoradas." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostrar um asterisco (*) se o arquivo binrio." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Comparar o %1 com o %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vrgula" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Lista separada por aba" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML Simples" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "XML Simples" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "O arquivo do relatrio j existe. Voc quer sobrescrever o arquivo existente?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4510,32 +4563,32 @@ msgstr "" "Erro ao criar o relatrio:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "O relatrio foi criado com sucesso." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo arquivo est aberto em ambos os painis." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Os arquivos selecionados so idnticos." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Um erro ocoreu enquanto comparava os arquivos." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Os arquivos temporrios no puderam ser criados. Verifique suas configuraes do caminho dos temporrios." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4550,7 +4603,7 @@ msgstr "" "\n" "Nota: Se voc quer sempre tratar todos os tipos de retorno de procedimentos como equivalentes, configure a opo 'Ignorar diferenas de retorno dos procedimentos..' na aba Comparar do dilogo das opes (disponvel em Editar/Opes)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4561,22 +4614,22 @@ msgstr "" " Com as opes atuais, eles sero unificados ao tipo principal.\n" " Voc quer mudar as opes e preservar os EOL diferentes?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Um erro ocorreu enquanto prediffing o arquivo '%1' com o plugin '%2'. O prediffing no est mais aplicado." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "A pasta selecionada invlida." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "No pode abrir um arquivo binrio no editor." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4591,7 +4644,7 @@ msgstr "" "%1\n" "no outro lado e abrir estas pastas?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4602,132 +4655,132 @@ msgstr "" "Exibir cada arquivo na sua pgina de cdigo dar uma melhor exibio mas unir/copiar ser perigoso.\n" "Voc gostaria de tratar ambos os arquivos como estando na pgina do cdigo padro do windows? (recomendado)" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Aviso: Os arquivos usam codificaes diferentes, esquerda=%s e direita=%s, e a unio pode levar a perda de informao." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informao perdida devido a erros de codificao: em ambos os arquivos" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informao perdida devido a erros de codificao: no arquivo direito" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informao perdida devido a erros de codificao: no arquivo esquerdo" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Sem diferena" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Diferena da linha" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituiu %1 string(s)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "No pde achar a string \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copiar o Caminho Completo" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copiar o Nome do Arquivo" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Painel de Localizao" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Painel das Diferenas" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Arquivo patch gravado com sucesso." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. o item no foi achado ou diretrio!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. o item no foi achado ou diretrio!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O arquivo do patch j existe. Voc quer sobrescrev-lo?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 arquivos selecionados]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "No pde gravar no arquivo %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "O caminho de sada especificado no um caminho absoluto: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Especificar um arquivo de sada" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No pode criar um arquivo patch dos arquivos binrios." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "No pode criar um arquivo patch dos diretrios." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4738,17 +4791,17 @@ msgstr "" "\n" "Criar um patch requer que no hajam mudanas no salvas nos arquivos." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "A pasta no existe." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Os resultados da comparao dos diretrios atuais sero limpados." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4759,7 +4812,7 @@ msgstr "" "Todos os componentes necessrios (7-zip e/ou Merge7z*.dll) para o suporte para arquivos no podem ser achados.\n" "Veja o manual para mais info sobre o suporte para arquivos e como ativ-lo." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4768,7 +4821,7 @@ msgstr "" "\n" "Nota: A integrao do 7-Zip est desativada nas configuraes do WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4777,37 +4830,37 @@ msgstr "" "\n" "Nota: A integrao do 7-Zip est restrita a operao isolada nas configuraes do WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Selecione o arquivo para exportar" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Selecione o arquivo para importar" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Opes importadas do arquivo" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Opes exportadas para o arquivo." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Falhou em importar as opes do arquivo." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Falhou em gravar as opes no arquivo." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4818,473 +4871,493 @@ msgstr "" "\n" "Voc quer continuar?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Erro da expresso regular" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Nenhuma combinao" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Expresso regular invlida" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Caractere de comparao invlido" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Nome da classe do caractere invlido" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Rastreando o backslash" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Referncia anterior invlida" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "No comparvel [ ou [^ " -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "No comparvel ( ou \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "No comparvel \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contedo invlido de \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Final do alcance invlido" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Sem memria" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Expresso regular precedente invlida" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Final prematuro da expresso regular" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Expresso regular muito grande" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "No comparvel ) ou \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Europeu Ocidental" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Europeu Oriental" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Leste Asitico" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Sudeste & Sudoeste Asitico" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Oriente Mdio" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "No aplicvel" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirlico" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latim US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS rabe" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grego" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Margem do Bltico" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latim 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grego 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latim 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirlico" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugus" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islands" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Francs do Canad" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nrdico" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirlico CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grego 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Tailands" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japons" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chins Simplificado" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chins Tradicional" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latim 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirlico (Eslavo)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latim 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grego" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latim 5 (Turco)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows rabe" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows da Margem do Bltico" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romano" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grego" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirlico" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh da Europa Central" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Se aproxima do ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Se aproxima do ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Se aproxima do ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Se aproxima do ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Se aproxima do ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Salvar o arquivo a esquerda" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Salvar o arquivo a direita" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Salvar o arquivo a esquerda com o nome..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Salvar o arquivo a direita com o nome..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Mudar o status somente-leitura do arquivo/diretrio a esquerda" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Mudar o status somente-leitura do arquivo/diretrio a direita" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converter o EOL para o modo do Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converter o EOL para o modo do Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converter o EOL para o modo do Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Trocar entre os modos de edio e unio" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5293,12 +5366,12 @@ msgstr "" "Visualizar e ajustar as propriedades da codificao do arquivo\n" "Propriedades da codificao do arquivo" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir e determinar o arquivo do conflito" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5307,7 +5380,7 @@ msgstr "" "Selecionar a rea da diferena na linha atual\n" "Diferena na Linha Atual" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5316,7 +5389,7 @@ msgstr "" "Ir para a linha ou diferena\n" "Ir para (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5325,7 +5398,7 @@ msgstr "" "Definir as opes do programa\n" "Opes" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5334,37 +5407,37 @@ msgstr "" "Atualizar a exibio\n" "Atualizar (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar as linhas selecionadas para a rea de transferncia adicionando nmeros da linha ao comeo da linha" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Atualizar os itens selecionados" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Ativar o bookmark" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Ir para o bookmark seguinte" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Ir para o bookmark anterior" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Limpar todos os bookmarks" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5373,7 +5446,7 @@ msgstr "" "Exibe itens que so exatamente os mesmos\n" "Mostrar Itens Idnticos" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5382,7 +5455,7 @@ msgstr "" "Exibe itens que tem diferenas\n" "Mostrar Itens Diferentes" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5391,7 +5464,7 @@ msgstr "" "Exibe itens que existem apenas no lado esquerdo\n" "Mostrar Itens nicos a Esquerda" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5400,7 +5473,7 @@ msgstr "" "Exibe itens que existem apenas no lado direito\n" "Mostrar Itens nicos a Direita" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5409,7 +5482,7 @@ msgstr "" "Exibe os arquivos binrios\n" "Mostrar Arquivos Binrios" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5418,7 +5491,7 @@ msgstr "" "Exibe os itens pulados\n" "Mostrar os Itens Pulados" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5427,7 +5500,7 @@ msgstr "" "Selecionar a fotne para a visualizao\n" "Selecionar a Fonte para a Visualizao" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5436,27 +5509,27 @@ msgstr "" "Reverter para usar a fonte padro do sistema para a visualizao\n" "Fonte Padro" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Mostrar os caracteres do espao em branco" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Ativar o Painel das Diferenas" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "O painel da localizao mostra a fotografia global dos arquivos" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostrar o dilogo das estatsticas de comparao das pastas" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5465,7 +5538,7 @@ msgstr "" "Selecionar o idioma da interface do usurio atual\n" "Idioma" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5474,12 +5547,12 @@ msgstr "" "Mostra as diferenas dentro das linhas com cores diferentes\n" "Mostrar a Diferena das Linhas" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Trocar as posies dos dois painis" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5488,7 +5561,7 @@ msgstr "" "Mostra os nmeros das linhas\n" "Mostrar os Nmeros das Linhas" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5497,7 +5570,7 @@ msgstr "" "Ativar a organizao das palavras\n" "Organizar as Linhas" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5506,22 +5579,22 @@ msgstr "" "Mostra as margens da seleo para ambos os painis\n" "Mostrar as Margens da Seleo" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Aumentar o tamanho do texto" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Diminuir o tamanho do texto" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Resetar o zoom do texto para o tamanho padro" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5530,7 +5603,7 @@ msgstr "" "Rolar para o diferena anterior\n" "Diferena Anterior (Alt+Pra Cima)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5539,7 +5612,7 @@ msgstr "" "Rolar para a diferena seguinte\n" "Diferena Seguinte (Alt+Pra baixo)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5548,7 +5621,7 @@ msgstr "" "Rolar para a primeira diferena\n" "Primeira Diferena (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5557,7 +5630,7 @@ msgstr "" "Rolar para a diferena atual\n" "Diferena Atual (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5566,7 +5639,7 @@ msgstr "" "Rolar para a ltima diferena\n" "ltima Diferena (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5575,7 +5648,7 @@ msgstr "" "Copiar o texto selecionado para o arquivo da direita\n" "Copiar para a Direita (Alt+Direita)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5584,7 +5657,7 @@ msgstr "" "Copiar o texto selecionado para o arquivo da esquerda\n" "Copiar para a Esquerda (Alt+Esquerda)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5593,7 +5666,7 @@ msgstr "" "Copiar a diferena para a direita e avanar para a prxima\n" "Copiar para a Direita e Avanar (Ctrl+Alt+Direita)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5602,7 +5675,7 @@ msgstr "" "Copiar a diferena para a esquerda e avanar para a prxima\n" "Copiar para a Esquerda e Avanar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5611,7 +5684,7 @@ msgstr "" "Copiar todas as diferenas para o arquivo da direita\n" "Tudo para a Direita" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5620,72 +5693,77 @@ msgstr "" "Copiar todas as diferenas para o arquivo da esquerda\n" "Tudo para a Esquerda" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Apagar os itens selecionados de ambos os diretrios" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item selecionado (comparar o primeiro item se mltiplos itens esto selecionados)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selecionar e re-ordenar as colunas de comparao dos diretrios" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Gerar um arquivo-patch" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Selecionar e modificar os filtros" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relatrio dos resultados da comparao" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O usurio seleciona o desempacotador (sem desempacotamento quando comparando diretrios)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O desempacotador adaptado est aplicado a ambos os arquivos (um arquivo s precisa da extenso)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecione um desempacotador para editar este arquivo" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Sem prediffer (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarreg-los (para desenvolvedores)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5694,12 +5772,12 @@ msgstr "" "Ativa o prximo arquivo visvel\n" "Ativar o prximo arquivo" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5708,22 +5786,22 @@ msgstr "" "Abre a Ajuda do WinMerge\n" "Ajuda do WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Emite a info da verso atual do WinMerge e configurao para o arquivo texto" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Exibe a GNU Licena para o Pblico em Geral" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Build Privado: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5732,7 +5810,7 @@ msgstr "" "Abre o documento das notas do lanamento\n" "Notas do Lanamento" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5741,262 +5819,267 @@ msgstr "" "Abre o website das tradues\n" "Tradues" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Configuraes dos Plugins" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Sem prediffer" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediff se possvel" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no achado - scripts .sct desativados" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Abrir o arquivo com o aplicativo registrado" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Abrir o arquivo com o editor externo" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Abrir o arquivo com um programa particular" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "No exibir os blocos movidos" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Exibir todos os blocos movidos" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Exibir os blocos movidos apenas da diferena atual" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferena sob o cursor" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "I&ir para a Diferena %1 de %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "I&r para a Linha %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Desativado" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Do sistema de arquivos" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Da lista da MRU" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Bsico" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Objeto Porttil" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Recursos" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Esconder a barra de ferramentas" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra de ferramentas pequena" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra de ferramentas grande" diff --git a/Src/Languages/Bulgarian.po b/Src/Languages/Bulgarian.po index 1d2bc2d9561..fec2ff9be36 100644 --- a/Src/Languages/Bulgarian.po +++ b/Src/Languages/Bulgarian.po @@ -72,7 +72,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "&" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr " &..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "&" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr " & " #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr " & " #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr " " #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr " &...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "& ..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr " " #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr " &..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr " & " #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr " " #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "& " #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr " " #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "& ..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "& " -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "& " -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "& " -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "& " -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "& ..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr " " -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr " &" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr " &\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr " &" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr " &" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr " &" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge \tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr " &..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU " -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "& WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "& " -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr " & " -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "& " -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr " &\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr " & " -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr " & " -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr " & " -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr " & " -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr " & " -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr " & " -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr " & " -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr " " -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr " &\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "&\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "& \tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "& \tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "& \tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "& \tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "& \tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr " &\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr " &\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "& ..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr " &..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr " & " -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr " &..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr " & " -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr " " -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "&" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "& " -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr " \tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr " ..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr " & \tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "& \tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "& \tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "& \tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "& \tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "& " -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "& ...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr " " -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr " " -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "& " -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr " " -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr " " -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr " " -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr " " -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr " " -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr " &" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "& \tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr " & \tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr " & " -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "& " -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr " " -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr " & " -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr " & ..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr " & " -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr " & ..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr " & ..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr " & ..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "& " -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "& " -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "&" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "& " -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "& " -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr " &" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr " & " -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "& " -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr " &" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr " " -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "& " -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "&" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "& " -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "& " -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "& " -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr " & " -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr " WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr " ." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr " WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr " ..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr " &:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr " &:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "& " -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr ":" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr " " -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr " :" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr ":" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr ":" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr ":" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr " VSS " -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr " " -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr " ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr " " -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr " " -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "& cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr " & " -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "& " -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr " & ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "& " -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr " & " -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr " " -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr " " -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "- -:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr " " -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr " &" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr " &" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge . , ." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr " :" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "& :" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr " & " -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "/ " -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr " &" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr " " -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "& :" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr " " -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr " " -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr " & " -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr ". &" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn checkout" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr " " -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr " " -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr " ( ):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr ":" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr " :" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr " :" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr ":" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr " :" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr " :" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr " :" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "& " -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "& " -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr " & " -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr " " -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "& :" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "& :" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr " " -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr " " -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr " " -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "&..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr " " -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "& " -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "&:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "& " -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "& " -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "& " -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "& " -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "/ " -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr " " -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr " & " -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr " " -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr " " -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr " :" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr " , " -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr " :" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " " -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr " ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr ":" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr ":" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr " " -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "& :" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr " :" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr " " -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "& " -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "& " -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr " & " -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr " &/ " -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr " &" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr " " -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr " - 3 " -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr " :" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "& " -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr " " -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "& " -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "& " -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "& EOL " -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "& :" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "& " -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr " &" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr " " -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr " " -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr " &" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr " &:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr " " -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr " ?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr " " -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "& " -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "& " -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr " " -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "& " -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "& " -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr " " -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr " " -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr " -Unicode :" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,32 +2029,32 @@ msgstr "" " : .html, .rc, .xml \n" " " -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr " " -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr " WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr " :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - " -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr " 7-Zip ( ?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2052,12 +2063,12 @@ msgstr "" " 7-Zip 3.11 - , \n" " ." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr " (Merge7z*.dll) ." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2066,12 +2077,12 @@ msgstr "" " 7-Zip \n" " ." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2080,540 +2091,551 @@ msgstr "" " \n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr " 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip :" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip :" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr " :" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr " .\n( .)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr " " -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " " -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr " :" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr " :" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr ":" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr ":" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr ":" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr ":" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr ":" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr " 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr " 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr " " -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr ":" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "& " -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr " " -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr " ?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr " ( )" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr " ( )" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr " " -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr " 7-Zip :" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr " 7-zip " -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "& " -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "& 7-Zip " -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr " 7-Zip WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "& " -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr " " -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr ":" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr ":" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr ":" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr ":" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr ":" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr ":" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr ":" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "()" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr " " -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "& :" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr " :" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "& " -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr " " -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr " ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "& :" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "& " -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "& " -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr " " -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr " :" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr " :" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr ":" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr " " -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr " " -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr " " -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr " :" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr " :" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr " " -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr " " -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr " :" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr " .bak -" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr " " -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr " " -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr " XXX ?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr " " -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr " " -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040204e3" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x402, 1251" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2622,7 +2644,7 @@ msgstr "" " \n" " (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2631,7 +2653,7 @@ msgstr "" " \n" " (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" " \n" "" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2649,7 +2671,7 @@ msgstr "" " \n" " (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2658,7 +2680,7 @@ msgstr "" " \n" " " -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" " \n" " " -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2676,7 +2698,7 @@ msgstr "" " \n" " " -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2685,7 +2707,7 @@ msgstr "" " \n" "" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2694,12 +2716,12 @@ msgstr "" " \n" "" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr " " -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2708,32 +2730,32 @@ msgstr "" " \n" " (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr " " -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr " " -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr " " -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr " ." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr " ." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2742,7 +2764,7 @@ msgstr "" " \n" " " -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2751,7 +2773,7 @@ msgstr "" " , \n" "" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2760,27 +2782,27 @@ msgstr "" " ; \n" "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr " " -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" " \n" " " -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2798,7 +2820,7 @@ msgstr "" " \n" " " -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2807,7 +2829,7 @@ msgstr "" " \n" " " -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2816,7 +2838,7 @@ msgstr "" " \n" " " -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2825,7 +2847,7 @@ msgstr "" " \n" " " -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" " Clipboard\n" "" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2843,7 +2865,7 @@ msgstr "" " Clipboard\n" "" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2852,7 +2874,7 @@ msgstr "" " \n" "" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2861,7 +2883,7 @@ msgstr "" " Clipboard\n" "" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2870,7 +2892,7 @@ msgstr "" " \n" "" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2879,7 +2901,7 @@ msgstr "" " \n" "" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2888,7 +2910,7 @@ msgstr "" " \n" " " -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2897,7 +2919,7 @@ msgstr "" " \n" " (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2906,7 +2928,7 @@ msgstr "" " \n" " (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2915,7 +2937,7 @@ msgstr "" " \n" " " -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2924,7 +2946,7 @@ msgstr "" " \n" "" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2933,62 +2955,62 @@ msgstr "" " \n" " TabBar" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr " \n " -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr " " -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr " " -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr " " -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr " " -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr " " -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr " " -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr " " -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr " " -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr " " -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr " " -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2997,183 +3019,183 @@ msgstr "" " \n" " " -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr " EOL" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr " " -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr " " -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr ":\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge . ; GNU ." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "& " -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr " &" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr " &" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr " &" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr " &" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr " ." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr " ." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr " " -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr " " -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr " " -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr ":" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr " :" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr " :" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr " :" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr " :" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr " %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr " (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr " ." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr " . ." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr " ." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3184,7 +3206,7 @@ msgstr "" "\n" ", 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3195,127 +3217,129 @@ msgstr "" "\n" ", WinMerge ." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "|*.exe;*.bat;*.cmd| (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr " (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " (*.ini)|*.ini| (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr " (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt| (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML (*.htm,*.html)|*.htm;*.html| (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML (*.xml)|*.xml| (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr " " -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr " " -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr " " -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr " " -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr " " -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " (*.flt)|*.flt| (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3328,7 +3352,7 @@ msgstr "" ", %1 WinMerge/Filters:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3341,7 +3365,7 @@ msgstr "" "\n" ", ." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3352,7 +3376,7 @@ msgstr "" "\n" ", /." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3365,12 +3389,12 @@ msgstr "" "\n" " ?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr " " -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3381,208 +3405,223 @@ msgstr "" "\n" " ." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr " . ?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr " " -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "& cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "& SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr " " -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr " " -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr " " -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr " " -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr " " -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr " " -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr " ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr " " -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr " " -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr " " -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr " " -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr " " -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr " ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr " ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr " ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr " ..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr ": %s : %d/%d : %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr ": %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr ": %s : %d/%d : %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr " %1 %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 " -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 " #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr " %1 %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr ": %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr " " -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr " " -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr " ." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr " !" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr " !" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr " !" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " ." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr " !" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr " : %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr " : %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3595,42 +3634,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr " " -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "\n%1\n ." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr " " -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr " %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 . ? (, .)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr " " -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr " " -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3643,7 +3682,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3699,7 @@ msgstr "" "\t- ( Ok)\n" "\t- ( )?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3714,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3729,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3744,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3714,7 +3753,7 @@ msgstr "" "%1\n" " . ?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3729,17 +3768,17 @@ msgstr "" "\n" " , ." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr " " -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr " " -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3750,42 +3789,42 @@ msgstr "" "\n" " ." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " SourceSafe (: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr " VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System . ..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr " versioning system." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS . ?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr " VSS !" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr " VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3796,7 +3835,7 @@ msgstr "" " , .\n" " ?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3805,170 +3844,169 @@ msgstr "" "Versioning System .\n" " , ." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe ( .5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (.5.0 )" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr " " -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr " " -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr " " -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr " " -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr " " -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr " " -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr " () " -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr " () ('on the fly' )" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr " " -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr " (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr " (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr " ... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr " ... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr " ... (%1 %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr " ... (%1 %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr " (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "(%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr " " -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - :" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr " - :" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 )" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 %2 )" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3979,17 +4017,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr " :" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " %d :" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4008,458 +4046,473 @@ msgstr "" "\n" ", ." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr " " -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr " " -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr " ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr " " -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr " " -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr " ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr " : %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr " : %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr " " -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr " " -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr " " -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr " " -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr " " -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr " " -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr " " -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr " " -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr " ( )" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr " " -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr " " -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr " " -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr " " -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr " " -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr " " -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr " " -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr " ()" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr " ()" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr " " -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr " " -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr " " -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr " " -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr " " -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr " " -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr " " -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr " " -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr " EOL" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr " EOL" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr " " -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr " " -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr " " -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr " " -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr " " -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr " " -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr " " -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr " : %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr " : %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr " " -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr " " -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr " " -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr " " -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr " " -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr " : %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 " -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 " -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr " ." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr " , ." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr " , ." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr " ." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr " ." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr " ." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr " ." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr " ." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr " ." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr " ." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr " ." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr " ." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr " - ." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr " ." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr " ." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr " ." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "EOL " -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "EOL " -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr " ." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr " ." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " . WinMerge ." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " . ." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " (*), ." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr " %1 %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr ", " -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr ", " -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr " HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr " XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " . ?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4468,32 +4521,32 @@ msgstr "" " :\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr " ." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr " ." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr " ." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr " ." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " . ." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4508,32 +4561,32 @@ msgstr "" "\n" ": , ' ..' ( /)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 " EOL (Windows/Unix/Mac) '%1'.\n .\n , EOL ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr " '%1' '%2'. ." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr " ." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr " ." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 " .\n\n :\n%1\n ?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4544,132 +4597,132 @@ msgstr "" " - , .\n" " , Windows ()?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr ": , =%s =%s, ." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " , : " -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr " , : " -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr " , : " -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr " " -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr " " -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr " %1 ()." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr " \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr " " -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr " " -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr " ." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. !" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. !" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " . ?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 ]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr " %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " : %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr " " -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr " ." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr " ." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4680,17 +4733,17 @@ msgstr "" "\n" " ." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr " ." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr " ." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4701,7 +4754,7 @@ msgstr "" " (7-zip / Merge7z*.dll) .\n" " ." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4710,7 +4763,7 @@ msgstr "" "\n" ": 7-Zip WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4719,37 +4772,37 @@ msgstr "" "\n" ": 7-Zip WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr " " -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr " " -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr " ." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr " ." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr " ." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr " ." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4760,473 +4813,493 @@ msgstr "" "\n" " ?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr " " -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr " " -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr " " -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr " " -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr " " -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr " " -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr " " -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr " [ [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr " ( \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr " \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr " \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr " " -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr " " -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr " " -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr " " -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr " " -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr " ) \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr " " -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr " " -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr " " -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW " -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr " " -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " " -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " " -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " " -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " " -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " " -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " " -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr " " -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr " " -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr " ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr " ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr " /" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr " /" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr " EOL Windows " -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr " EOL Unix " -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr " EOL Mac " -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr " " -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5235,12 +5308,12 @@ msgstr "" " \n" " " -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr " " -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5249,7 +5322,7 @@ msgstr "" " \n" " " -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5258,7 +5331,7 @@ msgstr "" " \n" " (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5267,7 +5340,7 @@ msgstr "" " \n" "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5276,37 +5349,37 @@ msgstr "" " \n" " (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr " , " -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr " " -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr " " -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr " " -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr " " -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr " " -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5315,7 +5388,7 @@ msgstr "" " , \n" " " -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5324,7 +5397,7 @@ msgstr "" " , \n" " " -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5333,7 +5406,7 @@ msgstr "" " , \n" " " -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5342,7 +5415,7 @@ msgstr "" " , \n" " " -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5351,7 +5424,7 @@ msgstr "" " \n" " " -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5360,7 +5433,7 @@ msgstr "" " \n" " " -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5369,7 +5442,7 @@ msgstr "" " \n" " " -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5378,42 +5451,42 @@ msgstr "" " \n" " " -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr " " -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "/ " -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr " " -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr " " -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr " \n" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr " \n " -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr " " -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5422,7 +5495,7 @@ msgstr "" " \n" " " -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5431,7 +5504,7 @@ msgstr "" " \n" " " -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5440,47 +5513,47 @@ msgstr "" " \n" " " -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr " " -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr " " -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr " " -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr " \n (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr " \n (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr " \n (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr " \n (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr " \n (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5489,7 +5562,7 @@ msgstr "" " \n" " (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5498,7 +5571,7 @@ msgstr "" " \n" " (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5507,7 +5580,7 @@ msgstr "" " \n" " (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5516,7 +5589,7 @@ msgstr "" " \n" " (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5525,7 +5598,7 @@ msgstr "" " \n" " " -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5534,367 +5607,377 @@ msgstr "" " \n" " " -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr " " -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr " ( )" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr " " -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr " -" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr " " -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr " " -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr " ( )" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ( )" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr " " -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr " ()" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr " " -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr " " -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr " ( )" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr " \n " -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr " " -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr " WinMerge\nWinMerge " -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr " WinMerge " -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr " GNU " -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr " : %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr " \n" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr " \n" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr " " -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr " " -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr " , " -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH - .sct " -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr " " -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr " " -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr " " -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr " " -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr " " -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr " " -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr " " -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr " %1 %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr " %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr " " -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr " MRU " -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr " " -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr " " -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr " " diff --git a/Src/Languages/Catalan.po b/Src/Languages/Catalan.po index 1ff9fa3e1b2..92a1251a397 100644 --- a/Src/Languages/Catalan.po +++ b/Src/Languages/Catalan.po @@ -71,7 +71,7 @@ msgstr "&Retalla" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "C&opia" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "Engan&xa" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Vs a..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "O&bre" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "amb l'&aplicaci registrada" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "amb l'&editor extern" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "a&mb..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Fitxer" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nou\tControl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Obre...\tControl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Obre un &projecte...\tControl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Desa el P&rojecte..." @@ -160,1855 +162,1864 @@ msgid "Recent Projects" msgstr "Projectes re¢s" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Surt" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "E&dita" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "O&pcions..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Visualitzaci" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "&Tipus de lletra..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Empra el tipus de lletra del &sistema" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Barra d'ei&nes" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Cap" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Petita" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Gran" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Barra d'est&at" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Barra de ta&bulacions" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "Idio&ma..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Eines" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtres..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Genera un peda..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Connectors" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Desempaquetament &manual" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Desempaquetament &automtic" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Edita amb el desempaquetador" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Recarrega els connectors" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Depuraci" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Carrega la configuraci..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Reinicialitza les opcions" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Fi&nestra" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Tanca" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "T&anca-ho tot" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Canvia de &subfinestra\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Finestres en mosaic &horitzontal" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Finestres en mosaic &vertical" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "Finestres en &cascada" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Ajuda" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Suport d'&arxivament inhabilitat..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Quant al WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Fes l'es&querra noms de lectura" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Fes la dre&ta noms de lectura" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Codificaci del fitxer" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecciona-ho &tot\tControl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Mostra els elements &idntics" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Mostra els elements di&ferents" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra els elements nics de l'&esquerra" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostra els elements nics de la &dreta" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Mostra els elements &omesos" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Mostra els fitxers &binaris" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Mostra els elements ama&gats" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Estadstiques de &comparaci" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Actualit&za\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualitza &seleccionats\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "Co&mbinaci" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "&Compara\tRetorn" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Propera diferncia\tAlt+Avall" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferncia a&nterior\tAlt+Amunt" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pri&mera diferncia\tAlt+Inici" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferncia &actual\tAlt+Retorn" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Da&rrera diferncia\tAlt+Fi" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copia a la &dreta\tAlt+Dreta" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copia a l'&esquerra\tAlt+Esquerra" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "S&uprimeix\tSupr" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Personalitza les columnes..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Gene&ra un informe..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Desa\tControl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Desa l'&Esquerra" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Desa" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "&Anomena i desa..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Desa la D&reta" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Imprimeix..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Configuraci de la pgina" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "&Visualitzaci prvia de la impressi" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Converteix retorns de lnia a" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Mode de combinaci\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfs\tControl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Re&fs\tControl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Retalla\tControl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "C&opia\tControl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "Engan&xa\tControl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecciona &la diferncia a la lnia\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Cerca...\tControl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Subst&itueix...\tControl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Seqncies d'ordres" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Buit >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "&Avanat" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copia amb els nmeros de lnia\tControl+Maj+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Punts d'inters" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Activa/desactiva el punt d'inters\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Segent punt d'inters\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Punt d'inters previ\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Esborra tots els punts d'inters" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Vs a...\tControl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Ressaltat de sintaxi" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Mostra els es&pais" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Mostra les &diferncies de la lnia" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Mostra els &nmeros de lnia" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Mostra els &marges" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "A&justa les lnies" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "&Intercanvia les subfinestres" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Subfinest&ra de diferncies" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Subfinestra d'&ubicaci" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copia a la dreta i a&vana\tAlt+Control+Dreta" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copia a l'esquerra i avan&a\tAlt+Control+Esquerra" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Copia-ho &tot a la dreta" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Copia-ho t&ot a l'esquerra" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Prediferenciaci" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Compa&ra" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "D'&esquerra a dreta" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "D'e&squerra a..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "De &dreta a esquerra" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "De d&reta a..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Mou" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "D'&esquerra a..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "De &dreta a..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Suprimeix" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "De l'&esquerra" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "De la &dreta" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "D'&ambds costats" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Canvia el &nom" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Amaga els elements" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Obre l'&esquerra" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Obre la &dreta" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "C&opia els camins" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "L'&esquerra (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "La &dreta (%1 de %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambds costats (%1 de %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Co&pia els noms" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "Co&mprimeix" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "L'&esquerra... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "La &dreta... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambds costats... (%1 de %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Di&ferncies... (%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "Actualit&za" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Copia el cam sencer al fitxer" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Copia el nom del &fitxer" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Ajustos de prediferenciaci" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Sense prediferenciaci" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Prediferenciaci &automtica" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "V&s a la diferncia" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "Blocs &no moguts" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Tots el blocs moguts" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocs moguts per a la &diferncia actual" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Quant al WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Muntatge privat)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Tots els drets reservats." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visiteu la plana web del WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "D'acord" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Collaboradors" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Tria de fitxers o directoris..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Esquerra:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Navega..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Dreta:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "N&avega..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "&Tria..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Desem&paquetador:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "T&ria..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Inclou-hi les subcarpetes" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Estat:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Cancella" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Fitxers o directoris a comparar" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "&Base de dades:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "&Projecte:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "&Usuari:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "&Contrasenya:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "En&llaa amb el projecte de destinaci del VSS" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Aplica a &tots els elements" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "&Extreu (check-out)" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "&Anomena i desa..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Sistema de control de versions" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "Sistema de control de &versions" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cam al cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Desplaa automticament fins a la primera diferncia" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Inhabilita la pantalla de &benvinguda" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "T&anca les finestres amb ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verifica els cam automticament al dileg d'Obrir" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Permet d'executar noms una instncia" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Autocompletar al dileg d'obrir:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Permet mltiples finestres de comparaci per" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Comparaci de &carpetes" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Comparaci de &fitxers" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "El WinMerge permet ocultar alguns quadres de missatges comuns. Premeu el bot de Reinicialitzaci per a fer visibles tots els quadres de missatges altre cop." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Reinicialitza" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Idioma" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Idiomes disponibles:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Cerca" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Cerca:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "N&oms paraules senceres" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "&Distingeix entre majscules i minscules" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Expressi regular" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "No facis la &volta al final del fitxer" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direcci" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "A&munt" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "A&vall" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Segent" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Substitueix" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Substitueix-ho p&er:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "No facis la &volta al final del fitxer" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Substitueix a" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Selecci" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "&Fitxer sencer" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "S&ubstitueix-ho" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Su&bstitueix-ho tot" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "&Extreu (check-out)" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Comentaris" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Reintegra (check-in) desprs d'extreure (check-out)" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtres de lnia" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Habilita els filtres de lnia" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions ®ulars (una per lnia):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Desa" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nova" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Edita" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Suprimeix" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Diferncia:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Diferncia seleccionada:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Fons" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Lnia absent" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Diferncia ignorada:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Text mogut:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Text mogut seleccionat:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Paraula diferent:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Paraula diferent seleccionada:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Predeterminats" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dileg" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Desa els fitxers suprimits a la Paperera de reciclatge" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integraci" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Afegeix un men contextual a l'explorador del Windows" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Habilita el &men avanat" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "In&clou subcarpetes de forma predeterminada" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Editor extern:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filtre de carpeta:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "N&avega..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Generador de pedaos" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fitxer &1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fitxer &2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Inter&canvia" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "A&fegeix al final del fitxer existent" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "E&stil:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Espais" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Co&mpara'ls" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "&Ignora'n els canvis" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "I&gnora'ls tots" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ign&ora les lnies en blanc" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Distingeix entre majscules i minscules" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inc&lou-hi la lnia de comandes" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Obre-ho en un &editor extern" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Visualitzaci de columnes" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Tria el desempaquetador" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "&Desempaquetador de fitxer:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "&Visualitza tots els desempaquetadors sense verificar l'extensi" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "&Llistat d'extensions:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "&Descripci:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Progrs de la comparaci de carpeta" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "&Atura" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparant elements..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Elements comparats:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Elements totals:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Anar" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&Anar a:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fitxer" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Anar a on" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&Lnia" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Diferncia" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Vs-hi" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Comparaci" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Espais en blanc" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Compara els &espais" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Ignora els &canvis en els espais" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignora t&ots els espais" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "&Ignora les lnies en blanc" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignora &majscules/minscules" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "&Habilita detecci de blocs desplaats" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Em&parella les lnies similars" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignora diferncies en l'&hora inferiors a 3 segons" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Mtode de comparaci de &fitxers:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Atura desprs de la primera diferncia" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "&Filtra els comentaris" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Ressalta la sintaxi" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Re-explora &automticament" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preserva els caracters de salt de lnia originals" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulacions" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Mida de les tabulacions:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Insereix tabulacions" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "In&sereix espais" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Acoloriment de diferncia de lnia" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "&Veure les diferncies de la lnia" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "Nivell de &carcter" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "Nivell de ¶ula:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtres de fitxer" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "&Prova" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "&Installa..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "&Nou..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "&Edita..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "&Suprimeix..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Voleu desar els fitxers modificats?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Fitxer del costat esquerre" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Desa-hi els canvis" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "D&escarta'n els canvis" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Fitxer del costat dret" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "De&sa-hi els canvis" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Des&carta'n els canvis" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Descarta-ho tot" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Pgina de codis" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Pgina de codis predeterminada" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecciona la pgina de codis predeterminada assumida en carregar fitxers no-Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2017,32 +2028,32 @@ msgstr "" "Detecta la informaci de pgina de codis per a fitxers : .html, .rc, .xml\n" "Cal reiniciar la sessi" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Pgina de codis del sistema" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "En funci de l'idioma de l'interfcie d'usuari del WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Pgina de codis personalitzada:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suport d'arxivament inhabilitat" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "No es pot detectat la versi del 7-Zip (potser no est installat?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2052,12 +2063,12 @@ msgstr "" "ordinador, o els seus components essencials estiguin copiats al directori del programa per a\n" "un funcionament independent." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Tamb cal un connector d'enlla adient (Merge7z*.dll) al cam." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2066,12 +2077,12 @@ msgstr "" "Useu la versi del 7-Zip recomanada a continuaci fins que hi hagi connectors d'enlla\n" "disponibles per a versions posteriors." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Versi" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2080,540 +2091,551 @@ msgstr "" "Connector requerit\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versi recomanada del 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Programari del 7-Zip installat:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "cap" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "absent" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Components del 7-Zip (funcionament indep.):" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "antiquat" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Cam als connectors:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Baixada del connector" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opcions" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importa..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exporta..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Paraules clau:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Noms de funci:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Comentaris:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operadors:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Cadenes:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocessador:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Usuari 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Usuari 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Negreta" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Informe de comparaci de directoris" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "&Fitxer d'informe:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "N&avega..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Estil:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copia al Porta-retalls" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtre compartit o privat" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Quina mena de filtre voleu crear?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtre compartit (per a tots els usuaris d'aquesta mquina)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre privat (noms per a l'usuari actual)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Suport d'arxivament" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Per al suport d'arxivament cal tenir installat el connector del 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Baixar el connector del 7-Zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Habilita el suport de fitxers d'arxivament" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Usa el 7-Zip independent si est disponible" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&sa el 7-Zip local de la carpeta del WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecta el tipus d'arxiu a partir de la signatura del fitxer" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Estadstiques de comparaci" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Carpetes:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Fitxers:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diferents" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binaris:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "nics" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Esquerra:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Dreta:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Idntics" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Tanca" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Afectament" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Selecciona pgina de codis per a" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Crrega de fitxers:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Desament de fitxers:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Empra la mateixa pgina de codis a ambds" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Aplica" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Cancella" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Prova de filtre" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Provant el filtre ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Entreu el text a provar:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nom de la carpeta" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Prova" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Tanca" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Usa colors de text personalitzats" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Color de text personalitzat" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Espais:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Text regular:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Selecci:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Camins" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Noms de &lectura" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Noms de l&ectura" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "&Obre..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "De&sa..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Fitxers de cpia de seguretat" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Crea els fitxers de cpia de seguretat en:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Crea els fitxers de cpia de seguretat a:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Carpeta del fitxer &original" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "Carpeta de cpia de seguretat &global:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nom de fitxer de cpia de seguretat:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Afegeix l'extensi .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "A&fegeix una marca horria" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Confirmaci de cpia" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Esteu segur que voleu copiar XXX elements?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "D'esquerra" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "A dreta" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "S" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040304e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x403, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Preparat" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2622,7 +2644,7 @@ msgstr "" "Crea un document nou\n" "Nou (Control-N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2631,7 +2653,7 @@ msgstr "" "Obre un document existent\n" "Obrir (Control+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" "Tanca el document actiu\n" "Tanca" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2649,7 +2671,7 @@ msgstr "" "Desa el document actiu\n" "Desa (Control+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2658,7 +2680,7 @@ msgstr "" "Desa el document actiu amb un nom nou\n" "Anomena i desa" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" "Canvia les opcions d'impressi\n" "Format de pgina" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2676,7 +2698,7 @@ msgstr "" "Canvia la impressora i les opcions d'impressi\n" "Configuraci d'impressi" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2685,7 +2707,7 @@ msgstr "" "Imprimeix el document actiu\n" "Imprimeix" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2694,12 +2716,12 @@ msgstr "" "Visualitza pgines senceres\n" "Visualitzaci prvia de la impressi" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Torna a fer visibles tots els elements amagats" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2708,32 +2730,32 @@ msgstr "" "Obre un fitxer de projecte\n" "Fitxer de projecte (Control+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "S'ha produt un error desconegut en intentar obrir un fitxer de projecte" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "S'ha produt un error desconegut en intentar desar un fitxer de projecte" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Fitxer de projecte" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "El fitxer de projecte s'ha carregat amb xit." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "El fitxer de projecte s'ha desat amb xit." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2742,7 +2764,7 @@ msgstr "" "Desa els camins i les opcions actuals a un fitxer de projecte\n" "Desa fitxer de projecte" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2751,7 +2773,7 @@ msgstr "" "Visualitza informaci del programa, nmero de versi i copyright\n" "Quant a" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2760,27 +2782,27 @@ msgstr "" "Surt de l'aplicaci i us demana que deseu els documents\n" "Surt" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Obre aquest document" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" "Canvia a la segent subfinestra\n" "Subfinestra segent" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2798,7 +2820,7 @@ msgstr "" "Canvia de nou a la subfinestra anterior\n" "Subfinestra prvia" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2807,7 +2829,7 @@ msgstr "" "Organitza les finestres perqu se sobreposin\n" "Finestres en cascada" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2816,7 +2838,7 @@ msgstr "" "Organitza les finestres en mosaic\n" "Finestres en mosaic" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2825,7 +2847,7 @@ msgstr "" "Organitza les finestres en mosaic\n" "Finestres en mosaic" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" "Copia els elements seleccionats al Porta-retalls\n" "Copia" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2843,7 +2865,7 @@ msgstr "" "Elimina els elements seleccionats i els copia al Porta-retalls\n" "Retalla" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2852,7 +2874,7 @@ msgstr "" "Cerca el text especificat\n" "Cerca" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2861,7 +2883,7 @@ msgstr "" "Insereix el contingut del Porta-retalls\n" "Enganxa" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2870,7 +2892,7 @@ msgstr "" "Repeteix la darrera acci\n" "Repeteix" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2879,7 +2901,7 @@ msgstr "" "Substitueix un text especfic per un altre de diferent\n" "Substitueix" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2888,7 +2910,7 @@ msgstr "" "Selecciona el document sencer\n" "Selecciona-ho tot" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2897,7 +2919,7 @@ msgstr "" "Desf la darrera acci\n" "Desfs (Control+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2906,7 +2928,7 @@ msgstr "" "Ref la darrera acci desfeta\n" "Refs (Control+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2915,7 +2937,7 @@ msgstr "" "Mostra o amaga la barra d'eines\n" "Barra d'eines" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2924,7 +2946,7 @@ msgstr "" "Mostra o amaga la barra d'estat\n" "Barra d'estat" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2933,62 +2955,62 @@ msgstr "" "Mostra o amaga la barra de tabulacions\n" "Barra de tabulacions" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Canvia la mida de la finestra" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Canvia la posici de la finestra" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Redueix la finestra a una icona" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Engrandeix la finestra a la mida mxima" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Canvia a la segent finestra de document" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Canvia a la finestra de document prvia" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Tanca la finestra activa i demana per a desar el document" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Restaura la finestra a la mida normal" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Activa la llista de tasques" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Activa aquesta finestra" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2997,183 +3019,183 @@ msgstr "" "Tanca el mode de visualitzaci prvia\n" "Tanca" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Preserva els caracters de salt de lnia originals" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Premeu qualsevol tecla" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Clica amb el bot dret al cam a copiar" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&D'acord" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Avorta" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Reintenta" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignora-ho &tot" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&S" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "S a &tot" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "No a t&ot" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Omet" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Omet-ho &tot" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "No tornis amostrar aquest missatge." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "No tornis a preguntar-ho." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Colors de sintaxi" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Colors de text" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Control de versions" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "D'esquerra:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "A esquerra:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "De dreta:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "A dreta:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Versi %1 - Catal" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opcions (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Tots el quadres de missatges es mostraran altre cop." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "S'han fet modificacions a la sessi de comparaci actual i alguns canvis poden no ser efectius fins que no reinicieu la comparacio." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "El canvi triat de tipus de lletra no ser aplicat a totes les finestres de diferncies visibles actualment." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3184,7 +3206,7 @@ msgstr "" "\n" "Useu valors entre 1 i %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3195,127 +3217,129 @@ msgstr "" "\n" "Reinicieu el WinMerge desprs de la reinicialitzaci." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Obre" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programes|*.exe;*.bat;*.cmd|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fitxers de projecte del WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fitxers d'options de configuraci (*.ini)|*.ini|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fitxers de text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fitxers HTML (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fitxers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Tot el contingut" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Contingut en un cop d'ull" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Data de modificaci" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Data de modificaci i mida" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Mida" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Ubicaci" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Descripci" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Selecciona un nom de fitxer per al nou filtre" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fitxer (*.flt)|*.flt|Tots els fitxers (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3328,7 +3352,7 @@ msgstr "" "Copieu el fitxer %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3341,7 +3365,7 @@ msgstr "" "\n" "Verifiqueu que la carpeta existeix i s'hi pot escriure." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3352,7 +3376,7 @@ msgstr "" "\n" "Seleccioneu la carpeta de filtres a opcions/sistema." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3365,12 +3389,12 @@ msgstr "" "\n" "Potser el fitxer s noms de lectura?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Localitza el fitxer de filtre a installar" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3381,208 +3405,223 @@ msgstr "" "\n" "No s'ha pogut copiar el nou fitxer de filtre a la carpeta de filtres." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El fitxer de filtre ja existeix. Voleu sobreescriure el filtre existent?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Expressi regular" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Cam al cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Cam al SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultats de la comparaci dels directoris" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Comparaci de fitxers" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Fitxer esquerre sense ttol" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Fitxer dret sense ttol" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "S'estan examinant els fitxers..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "S'est obrint la selecci" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "S'est copiant de l'esquerra a la dreta" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "S'est copiant de la dreta a l'esquerra" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "S'est copiant tot a l'esquerra" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "S'est copiant tot a la dreta" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "S'estan copiant els fitxers..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "S'estan suprimint els fitxers..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "S'estan movent els fitxers..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Creant l'informe..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Cars: %d/%d Salt: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Lnia: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Cars: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Combina" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Diferncia %1 de %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "S'han trobat %1 difernces" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "S'ha trobat una diferncia" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Element %1 de %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Elements: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecciona dos directoris o fitxers existents per a comparar" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Selecci de directori" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecciona dos directoris o dos fitxers per a comparar." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "El cam de l'esquerra s invalid!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "El cam de la dreta s invalid!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Ambds camins sn invalids!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Tria dos fitxers per a habilitar la selecci del desempaquetador." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "No es pot comparar un fitxer i un directori!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "El fitxer no s'ha trobat: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "El fitxer no s'ha desempaquetat: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3595,42 +3634,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Anomena i desa" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Voleu desar els canvis a %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "El fitxer %1 est marcat com a noms de lectua. Voldreu substituir el fitxer noms de lectura? (No es tracta de desar amb un nom nou.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Hi ha hagut un error en comprovar si la destinaci era modificable" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Hi ha hagut un error en crear una cpia de seguretat del fitxer" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3643,7 +3682,7 @@ msgstr "" "\n" "Voleu continuar tot i aix?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3699,7 @@ msgstr "" "\t-desar-lo amb un nom diferent (premeu D'acord)\n" "\t-avortar l'operaci actual (Premeu Cancellar)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3714,7 @@ msgstr "" "\n" "Voleu desar la versi desempaquetada en un altre fitxer?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3729,7 @@ msgstr "" "\n" "Voleu desar la versi desempaquetada en un altre fitxer?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3744,7 @@ msgstr "" "\n" "Voleu sobreescriure el fitxer?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3714,7 +3753,7 @@ msgstr "" "%1\n" "est marcat com a noms de lectura. Voleu substituir l'element noms de lectura?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3729,17 +3768,17 @@ msgstr "" "\n" "Si voleu refrescar els fitxers, tanqueu la comparaci de fitxers actual i carregueu-los de bell nou." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Anomena i desa el fitxer de l'esquerra" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Anomena i desa el fitxer de la dreta" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3750,42 +3789,42 @@ msgstr "" "\n" "Cal que refresqueu els documents abans de continuar." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Cal que especifiqueu el cam a un projecte del SourceSafe per tal de continuar (p.ex.: $/ElMeuProjecte)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Extreu (check-out) fitxers del VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "El sistema de control de versions ha retornat un error en extreure (check-out) el fitxer. No es pot continuar..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "S'ha produt un error en executar una ordre del sistema de control de versions." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La carpeta de treball del VSS i la ubicaci del fitxer actual no concorden. Voleu continuar?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "No s'han trobat cap base de dades del VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Error del VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3796,7 +3835,7 @@ msgstr "" "Reviseu les especificacions de configuraci de la vista emprada.\n" "Voleu desfer la operaci d'extracci (check-out)?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3805,170 +3844,169 @@ msgstr "" "El sistema de control de versions ha retornat un error en intentar desfer l'extracci (check-out) del fitxer.\n" "Reviseu les especificacions de configuraci de la vista emprada." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Cap" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (anterior al 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i posterior)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Separa a l'espai" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Separa a l'espai o puntuaci" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copia l'element seleccionat al directori indicat" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copia l'element seleccionat en un directori a triar" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Suprimeix els elements seleccionats a l'esquerra" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Suprimeix els elements seleccionats a la dreta" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Suprimeix els element(s) seleccionat(s) a ambdues bandes" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Amaga el(s) element(s) seleccionat(s) (filtratge al vol)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Canvia el nom de l'element seleccionat a ambds costats" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Dreta a esquerra (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Esquerra a dreta (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Dreta a esquerra (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Esquerra a dreta (%1 de %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Esquerra a... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Dreta a... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Esquerra a... (%1 de %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreta a... (%1 de %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Esquerra (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Dreta (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Ambds (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerra (%1 de %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Dreta (%1 de %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Ambds (%1 de %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Selecciona la carpeta de destinaci" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Costat esquerre - seleccioneu la carpeta de destinaci:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Costat dret - seleccioneu la carpeta de destinaci:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fitxers afectats)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 fitxers afectats)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3979,17 +4017,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Esteu segur que voleu copiar:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Esteu segur que voleu copiar %d elements:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4008,458 +4046,473 @@ msgstr "" "\n" "Actualitzeu la comparaci." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Obre el fitxer de l'esquerra" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Obre el fitxer de l'esquerra en un editor extern" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Obre el fitxer de l'esquerra amb..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Obre el fitxer de la dreta" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Obre el fitxer de la dreta en un editor extern" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Obre el fitxer de la dreta amb..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "No s'ha pogut executar l'editor extern: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extensi desconeguda a l'editor extern: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copia els noms dels fitxers al Porta-retalls" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copia el cam al fitxer de l'esquerra al Porta-retalls" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copia el cam al fitxer de la dreta al Porta-retalls" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copia els camins als fitxers d'ambds costats al Porta-retalls" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "El format de l'arxiu s desconegut" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Afegeix els elements del costat esquerre a l'arxiu" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Afegeix els elements del costat dret a l'arxiu" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Afegeix els elements d'ambds costats a l'arxiu" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Afegeix els elements diferents a l'arxiu (d'ambds costats)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mou els fitxers seleccionats de l'esquerra al directori especificat" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mou els fitxers seleccionats de la dreta al directori especificat" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nom" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Directori" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultat de la comparaci" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Data esquerra" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Data dreta" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extensi" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Mida esquerra" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Mida dreta" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Mida dreta (breu)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Mida esquerra (breu)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Data de creaci esquerra" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Data de creaci dreta" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Fitxer ms nou" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Versi del fitxer esquerra" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Versi del fitxer dreta" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Resultat breu" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atributs esquerra" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atributs dreta" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Salt de lnia esquerra" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Salt de lnia dreta" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Codificaci esquerra" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Codificaci dreta" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Diferncies ignorades" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Diferncies" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binari" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "No es pot comparar els fitxers" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Element avortat" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Fitxer oms" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Directori oms" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Noms esquerra: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Noms dreta: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Els fitxers binaris sn idntics" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Els fitxers binaris sn diferents" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Els fitxers sn diferents" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Noms l'esquerre" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Noms el dret" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps transcorregut: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 element seleccionat" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elements seleccionats" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nom del fitxer o directori." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom del subdirectori quan s'incloguin els subdirectoris." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparaci, en forma llarga." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Data de modificaci del costat esquerre." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Data de modificaci del costat dret." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Extensi del fitxer." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Mida en bytes del fitxer esquerre." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Mida en bytes del fitxer dret." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Mida del fitxer esquerre en format abreujat." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Mida del fitxer dret en format abreujat." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Data de creaci del fitxer esquerre." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Data de creaci del fitxer dret." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Diu quin costat te una data de modificaci ms recent." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versi del fitxer del costat esquerre, noms per a alguns tipus de fitxer." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versi del fitxer del costat dret. noms per a alguns tipus de fitxer." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Resultat breu de la comparaci." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atributs del costat esquerre." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atributs del costat dret." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Tipus de salt de lnia del fitxer del costat esquerre" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Tipus de salt de lnia del fitxer del costat dret" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Codificaci del costat esquerre." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Codificaci del costat dret." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre de diferncies ignorades al fitxer. Aquestes diferncies sn ignorades pel WinMerge i no es poden combinar." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de diferncies al fitxer. Aquest nombre no inclou les diferncies ignorades.." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisc (*) si el fitxer s binari." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Compara %1 amb %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Llista delimitada per comes" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Llista delimitada per tabulacions" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML smple" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "XML smple" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "El fitxer d'informe ja existeix. Voleu sobreescriure'l?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4468,32 +4521,32 @@ msgstr "" "Hi ha hagut un error creant l'informe:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "L'informe s'ha creat satisfactriament." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "El mateix fitxer s obert a ambdues subfinestres." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Els fitxers seleccionats sn idntics." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "S'ha produt un error en comparar els fitxers." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "No s'han pogut obrir els fitxers temporals. Comproveu els ajustos de cam temporal." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4508,32 +4561,32 @@ msgstr "" "\n" "Nota: Si voleu tractar els salts de lnia sempre com a equivalents, especifiqueu l'opci 'Ignora diferncies de salt de lnia...' al quadre d'opcions (disponible des del men Edita/Opcions...)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Hi ha hagut un error prediferenciant el fitxer '%1' amb el connector '%2'. No es tornar a aplicar la prediferenciaci." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada s invlida." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "No es poden obrir fitxers binaris a l'editor." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4544,132 +4597,132 @@ msgstr "" "En mostrar cada fitxer en la seva prpia pgina de codis millora la seva visualitzaci per fa perillosa la combinaci/cpia.\n" "Voleu tractar ambds fitxers com si fossin en la pgina de codis predeterminada del Windows (recomanat)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Advertiment: Els fitxers empren codificacions diferents, l'esquerre=%s i el dret=%s, i en combinar-los es podria perdre informaci." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "S'ha perdut informaci degut a errors de codificaci: ambds fitxers" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "S'ha perdut informaci degut a errors de codificaci: fitxer dret" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "S'ha perdut informaci degut a errors de codificaci: fitxer esquerre" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Sense diferncies" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Diferncia de lnia" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "S'ha(n) substitut %1 cadena(s)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "No s'ha trobat la cadena \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copia el cam sencer del fitxer" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copia el nom del fixer" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Subfinestra d'ubicaci" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Subfinestra de diferncies" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "El peda s'ha generat satisfactriament." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. no s'ha trobat l'element o aquest s un directori!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. no s'ha trobat l'element o aquest s un directori!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "El fitxer de peda ja existeix. El voleu sobreescriure?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 fitxers seleccionats]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "No s'ha pogut escriure al fitxer %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "El cam de sortida especificat no s un cam absolut: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Especifiqueu un fitxer de sortida" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No es pot crear un peda de fitxers binaris." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "No es pot crear un peda de directoris." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4680,17 +4733,17 @@ msgstr "" "\n" "Cal que no hi hagi cap fitxer pendent de salvar per tal de crear un peda." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existeix." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "S'esborraran els resulats actuals de la comparaci de directoris." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4701,7 +4754,7 @@ msgstr "" "Els components necessaris (7-zip i/o Merge7z*.dll) per al suport d'arxivament no s'han pogut trobar.\n" "Vegeu el manual per a ms informaci quan al suport per a arxivament i com habilitar-lo." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4710,7 +4763,7 @@ msgstr "" "\n" "Nota: La integraci del 7-Zip est desabilitada des dels ajustos del WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4719,37 +4772,37 @@ msgstr "" "\n" "Nota: La integraci del 7-Zip est restringida com a operaci independent des dels ajustos del WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Trieu el fitxer per a exportar" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Trieu el fitxer per a importar" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "S'ha importat les opcions des del fitxer." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "S'ha exportat les opcions al fitxer." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "No s'ha pogut importar les opcions del fitxer." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "No s'ha pogut escriure les opcions al fitxer." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4757,473 +4810,493 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Hi ha un error a l'expressi regular" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "No s'ha trobat cap coincidncia" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "L'expressi regular s invlida" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "El carcter de collaci s invlid" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "El nom de la classe de carcter s invlid" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Hi ha una barra inversa al final" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "La referncia vers enrere s invlida" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Una construcci [ o [^ est desaparellada" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Una construcci ( o \\( est desaparellada" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Una construcci \\{ est desaparellada" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "El contingut de la construcci \\{\\} s invlid" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "El final del rang s invlid" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Sense memria" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "L'expressi regular precedent s invlida" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "L'expressi regular acaba prematurament" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "L'expressi regular s massa llarga" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Una construcci ) o \\) est desaparellada" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Europeu occidental" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Europeu oriental" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Est asitic" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Sudest i sudoest asitic" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Orient Mitj" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "No aplicable" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirllic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Llat US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS rab" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grec" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Bltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Llat 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grec 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Llat 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turc" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugus" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islands" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canada francs" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nrdic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grec 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Tai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japons" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Xins simplificat" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Kore" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Xins tradicional" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Llat 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirillic (Eslau)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Llat 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grec" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Llat 5 (Turc)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows rab" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Bltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Rom" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grec" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa central" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turc" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Semblant a ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Semblant a ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Semblant a ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Semblant a ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Semblant a ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Barrejat" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Desa el fitxer de l'esquerra" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Desa el fitxer de la dreta" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Desa i anomena el fitxer de l'esquerra..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Desa i anomena el fitxer de la dreta..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Canvia l'estat de noms de lectura per al fitxer de l'esquerra" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Canvia l'estat de noms de lectura per al fitxer de la dreta" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Commuta entre els modes d'edici i el de combinaci" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5232,12 +5305,12 @@ msgstr "" "Mostra i ajusta les propietats de codificaci de fixter\n" "Propietats de codificaci de fitxer" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5246,7 +5319,7 @@ msgstr "" "Selecciona l'rea de diferncia a la lnia actual\n" "Diferncia a la lnia actual (F4)" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5255,7 +5328,7 @@ msgstr "" "Va fins a una lnia o una diferncia\n" "Vs a (Control+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5264,7 +5337,7 @@ msgstr "" "Especifica opcions del programa\n" "Opcions" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5273,37 +5346,37 @@ msgstr "" "Actualitza la visualitzaci\n" "Actualitza (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copia les lnies seleccionades al Porta-retalls afegint-hi els nmeros de lnia al inici de lnia" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Actualitza els elements seleccionats" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Activa/desactiva el punt d'inters" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Va al segent punt d'inters" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Va al punt d'inters anterior" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Esborra tots els punts d'inters" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5312,7 +5385,7 @@ msgstr "" "Visualitza els elements que singuin exactament iguals\n" "Mostra elements idntics" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5321,7 +5394,7 @@ msgstr "" "Visualitza els elements que tinguin diferncies\n" "Mostra elements diferents" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5330,7 +5403,7 @@ msgstr "" "Visualitza els elements existents nicament a l'esquerra\n" "Mostra elements nics de l'esquerra" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5339,7 +5412,7 @@ msgstr "" "Visualitza els elements existents nicament a la dreta\n" "Mostra elements nics de la dreta" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5348,7 +5421,7 @@ msgstr "" "Visualitza els elements binaris\n" "Mostra elements binaris" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5357,7 +5430,7 @@ msgstr "" "Visualitza els elements omesos\n" "Mostra elements omesos" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5366,7 +5439,7 @@ msgstr "" "Selecciona el tipus de lletra per a les visualitzacions de diferncies\n" "Selecciona tipus de lletra per a diferncies" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5375,42 +5448,42 @@ msgstr "" "Recupera el tipus de lletra del sistema per a la visualitzaci de diferncies\n" "Tipus de lletra del sistema" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Mostra els carcters d'espais" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Mostra la subfinestra de diferncies" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Mostra la subfinestra d'ubicaci amb una image general dels fitxers" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra el quadre de dileg d'estadstiques de comparaci de carpeta" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercanvia la posici d'ambdues subfinestres" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5419,7 +5492,7 @@ msgstr "" "Mostra els nmeros de lnia\n" "Mostra els nmeros de lnia" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5428,7 +5501,7 @@ msgstr "" "Permet l'ajustament de paraules\n" "Ajusta les lnies" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5437,47 +5510,47 @@ msgstr "" "Mostra els marges de selecci per a ambds subfinestres\n" "Mostra els marges de selecci" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5486,7 +5559,7 @@ msgstr "" "Copia el text seleccionat al fitxer de la dreta\n" "Copia al fitxer de la dreta (Alt+Dreta)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5495,7 +5568,7 @@ msgstr "" "Copia el text seleccionat al fitxer de l'esquerra\n" "Copia al fitxer de l'esquerra (Alt+Esquerra)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5504,7 +5577,7 @@ msgstr "" "Copia la diferncia a la dreta i avana a al segent\n" "Copia a la dreta i avana (Control+Alt+Dreta)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5513,7 +5586,7 @@ msgstr "" "Copia la diferncia a l'esquerra i avana a la segent\n" "Copia a l'esquerra i avana (Control+Alt+Esquerra)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5522,7 +5595,7 @@ msgstr "" "Copia totes les difernces al fitxer de la dreta\n" "Tot a la dreta" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5531,367 +5604,377 @@ msgstr "" "Copia totes les difernces al fitxer de l'esquerra\n" "Tot a l'esquerra" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Suprimeix els elements seleccionats d'ambds directoris" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compara l'element seleccionat (compara el primer element en cas de selecci mltiple)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Tria i reordena les columnes de comparaci de directoris" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Genera un fitxer de pedaos" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Tria i modifica els filtres" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Genera un informe a partir dels resultats de comparaci" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "L'usuari tria el desempaquetador (no hi ha desempaquetament en comparar directoris)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "El desempaquetador adaptat s'aplica a ambds fitxers (noms hi cal l'extensi en un fitxer)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Tria un desempaquetador per a editar aquest fitxer" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "No prediferencia (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Connectors suggerits" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Altres connectors" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarrega el connectoris i els torna a carregar (per a desenvolupadors)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Tanca totes les finestres obertes" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Treu informaci de versi i configuraci actuals del WinMerge en un fitxer de text" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Muntatge privat: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Ajustos del connector" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "No prediferencis" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediferencia quan sigui possible" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "No s'ha trobat el WSH - seqncies d'ordres .sct inhabilitades" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Obre el fitxer amb l'apliaci registrada" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Obre el fitxer amb l'editor extern" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Obre el fitxer amb una aplicaci particular" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "No mostra els blocs moguts" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostra noms els blocs moguts des de la diferncia actual" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Va fins a la diferncia sota la busca" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Va fins a la diferncia %1 de %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Va fins a la lnia %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Inhabilitat" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Des del sistema de fitxers" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Des de la llista de recents" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Amaga la barra d'eines" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Mostra la barra d'eines petita" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Mostra la barra d'eines gran" diff --git a/Src/Languages/ChineseSimplified.po b/Src/Languages/ChineseSimplified.po index f1a9da3a18e..66a3385bee7 100644 --- a/Src/Languages/ChineseSimplified.po +++ b/Src/Languages/ChineseSimplified.po @@ -72,7 +72,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "(&C)" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "ճ(&P)" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "ת(&G)..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "(&E)" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "Ĭϳ(&R)" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "ⲿ༭(&E)" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "ѡ(&W)..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "ļ(&F)" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "½(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "(&O)...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "򿪳ͻļ(&E)..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "򿪹(J)...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "湤(&V)..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "򿪵Ĺ" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "˳(&X)" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "༭(&E)" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "ѡ(&O)..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "ͼ(&V)" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "ѡ(&F)..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "ʹĬ(&O)" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "(&T)" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "(&N)" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "С(&S)" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "(&B)" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "״̬(&S)" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "ǩ(&B)" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "(&L)..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "(&T)" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "(&F)..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "ɲ(&G)..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "(&P)" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "ֶ(&M)" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Զ(&A)" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "ý(&E)" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "װ(&R)" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "(&D)" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "(&L)..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "ѡ(&R)" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "(&W)" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "ر(&O)" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "ȫر(&S)" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "л(&P)\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "ˮƽƽ(&H)" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "ֱƽ(&V)" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "(&C)" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "(&H)" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "˵(&E)" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "(&T)" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "(&O)" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "ѹ֧ѽ(&R)..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr " WinMerge(&A)..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "ֻ(&E)" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Ҳֻ(&G)" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "ļ(&C)" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "ѡ(&A)\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "ʾȫͬĿ(&I)" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "ʾͬĿ(&D)" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "ʾֻĿ(&E)" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "ʾֻҲĿ(&G)" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "ʾĿ(&K)" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "ʾļ(&H)" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "ʾصĿ(&E)" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "ԱȽͳ(&R)" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "ˢ(&S)\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "ˢѡ(&R)\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "ϲ(&M)" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Ա(&M)\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "һͬ(&N)\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "һͬ(&P)\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "һͬ(&F)\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "ǰͬ(&C)\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "һͬ(&L)\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "ƵҲ(&R)\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Ƶ(&E)\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "ɾ(&D)\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "ѡ(&C)..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "ɱ(&R)..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "(&S)\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "(&L)" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "(&S)" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Ϊ(&A)..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Ҳ(&R)" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "ӡ(&P)..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "ҳ(&T)" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "ӡԤ(&W)" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "зָתΪ(&C)" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "ϲģʽ(&M)\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "ļ(&F)..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "(&U)\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "ظ(&R)\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "(&T)\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "(&C)\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "ճ(&P)\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "ѡڲͬ(&D)\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "(&I)...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "滻(&C)...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "ű(&S)" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "߼" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "кŸ(&C)\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "ǩ(&B)" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "/ȡ(&T)\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "һ(&N)\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "һ(&P)\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "(&C)" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "ת(&G)...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "(&Z)" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ŵ(&I)\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "С(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "С(&N)\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "﷨" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "(&L)" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "ʾհ׺Ʊ(&V)" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "ʾڲͬ(&W)" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "ʾк(&N)" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "ʾҳ(&M)" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Զ(&R)" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Ҵ(&A)" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Աȴ(&P)" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "λô(&C)" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "ƵҲಢǰ\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Ƶಢǰ\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "ȫƵҲ(&A)" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "ȫƵ(&Y)" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "ԤԱ(&P)" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Ա(&A)" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Ա(&M)" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "(&L)" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "(&E)..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "ҵ(&R)" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "ҵ(&I)..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "ƶ(&M)" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "(&L)..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "ҵ(&R)..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "ɾ(&D)" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "(&L)" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "Ҳ(&R)" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "(&B)" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "(&N)" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "(&H)" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "(&O)" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Ҳ(&P)" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "ȫ(&Y)" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "(&L)(%1 %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "Ҳ(&R)(%1 %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "(&B)(%1 %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "ļ(&F)" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "(&L)...(%1 %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "Ҳ(&R)...(%1 %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "(&B)...(%1 %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "಻ͬ(&D)...(%1 %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "ˢ(&R)" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "ȫ(&C)" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "ļ(&F)" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "ԤԱ" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "ʹ(&N)" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Զ" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "תͬ(&O)" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "ʾƶ(&N)" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "ƶ(&A)" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "ǰͬƶ(&C)" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr " WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Ȩ" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr " WinMerge ҳ!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "ȷ" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "ѡļļ..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "(&L):" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "(&B)..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "Ҳ(&R):" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "(&W)..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "(&F):" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "ѡ..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "(&U):" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "ѡ(&S)..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "Ŀ¼(&I)" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "״̬:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "ȡ" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "ҪԱȵļļ" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "ݿ:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr ":" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "û:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr ":" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "ӵĿ VSS " -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "ӦĿ" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "ǩ" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Ϊ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "汾ϵͳ" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "汾ϵͳ(&V)" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe ·(&P):" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Զһͬ(&S)" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "ͣûӭĻ(&D)" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESCرմ(&O)" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "ڡ򿪡ԻԶ֤·(&A)" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "ֻһʵ(&O)" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "رնʱѯ(&K)" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Աʱļʱ䲻(&P)" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "򿪡ԻԶ(&P):" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Աȴ" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "ļжԱ(&F)" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "ļԱ(&E)" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMergeһЩʾϢ, áťʹصϢʾ." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "õ:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "(&N):" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "ȫƥ(&W)" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "ִСд(&C)" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "ʹʽ(&E)" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "ļĩβٴͷ(&O)" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "(&U)" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "(&D)" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "һ(&F)" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "滻" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "滻Ϊ(&P):" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "ļĩβٴͷ(&D)" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "滻Χ" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "ѡ(&S)" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "ļ(&O)" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "滻(&R)" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "ȫ滻(&A)" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "ע" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "ǩǩ" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "й" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Էʽ" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "ʽ (ÿһ):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "½" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "༭" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "ɾ" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "ɫ" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "ͬ:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "ѡ:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "ɾ" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "ԹIJͬ:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "ƶ:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "ѡеƶ:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "ʲͬ:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "ѡеĵʲͬ:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Ĭ" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Ի" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "ϵͳ" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "ɾļվ(&S)" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "ӵԴҼ˵(&A)" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "߼˵(&N)" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Ĭϰļ(&C)" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "ⲿ༭(&E)" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "·(&F):" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "(&R)..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "ʱļ" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "ϵͳʱļ(&Y)" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Զļ(&U):" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "(&O)..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "ļ&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "ļ&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "½(&S)" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "ӵļĩβ(&A)" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "(&R):" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "ʽ(&F)" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "ʽ(&Y):" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "(&C):" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "հ(&H)" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Ա(&P)" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Կհ׺Ʊ(G)" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "пհ׺Ʊ(&N)" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Կ(&E)" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "ִСд(&T)" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "(&D)" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "ⲿ༭(&X)" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "ѡʾ" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "(&U)" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "(&D)" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "ѡ" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "ļ:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "չʾн" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "չ:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "ļжԱȽ" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "ֹͣ" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "ڶԱ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "ѶԱ:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr ":" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "ת" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "ת(&O):" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "ļ" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "ת" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "(&N)" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "ͬ(&D)" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "ת(&G)" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Ա" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "հ" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Աȿհ׺Ʊ(&C)" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Կհ׺Ʊ(&I)" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "пհ׺Ʊ(&G)" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Կ(&K)" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "ԴСд(&C)" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Իз(Windows/Unix/Mac)(&R)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "ƶ(&N)" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "ƥƵ(&M)" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Բ3ʱ(&O)" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "ļԱȷ(&F)" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "״ֹͬͣ(&T)" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "ע" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "༭" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "﷨(&H)" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Զɨ(&A)" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "ֻз(&P)" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Ʊ" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "(&T)" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Ʊ(&I)" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "ո(&S)" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "ڶԱ" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "ʾڲͬ" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "ַ(&C)" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "ʼ(&W):" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "ļ" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "װ..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "½..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "༭..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "ɾ..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "޸ĺļ" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "ļ" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "޸(&S)" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "޸(&D)" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Ҳļ" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "޸(&A)" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "޸(&C)" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "޸" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "ҳ" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Ĭϴҳ" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "ѡ򿪷UnicodeļʱĬϵĴҳ" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,32 +2029,32 @@ msgstr "" "ļдҳ : .html, .rc, .xml\n" "ҪWinMerge" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "ϵͳҳ" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr " WinMerge ûһ" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "ָҳ :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ѹ֧ѽ" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "޷ 7-Zip 汾 (ûаװ?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2052,24 +2063,24 @@ msgstr "" "ѹ֧Ҫļϰװ 7-Zip 3.11 ߵİ汾\n" "ǽƵļԹʹá" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "ڲ·лҪʵĽӿڲ(Merge7z*.dll)" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "ڶӦ°7-ZipIJ֮ǰʹƼİ汾" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "汾" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2078,540 +2089,551 @@ msgstr "" "ҪIJ\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Ƽ 7-Zip 汾" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "ִ" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "ϰװ 7-Zip " -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "û" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "ʹõ 7-Zip " -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "·еIJ" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "ʾϢ(&M)\n(ڰ˵Ϣ)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "ز" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "ѡ" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " " -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "ؼ:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr ":" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "ע:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr ":" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr ":" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "ַ:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Ԥָ:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "û 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "û 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Ӵ" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "ļжԱȱ" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "ļ(&F):" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "ʽ(&S):" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "Ƶ(&C)" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "˽й" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Ҫֹ" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "(Ϊû)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "˽й(ֻΪǰû)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "ѹ֧" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "ѹ֧Ҫװ 7-Zip :" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr " 7-zip " -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "ѹļ֧(&E)" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "ʹеĵ 7-Zip (&U)" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "ʹ WinMerge Ŀ¼Դ 7-Zip (&S)" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "ݼļ(&D)" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "ԱȽͳ" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "ļ:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "ļ:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "ͬ" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "ı:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr ":" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "ڵ" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr ":" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Ҳ:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "ȫͬ" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "ܼ:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "ر" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Ӱ췶Χ" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Ӱ)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "ѡҪʹõĴҳ" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "ļ(&F):" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "ļ(&S):" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "ʹͬĴҳ(&U)" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "Ӧ(&A)" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "ȡ(&C)" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "ڲ ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "Բ(&E):" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "ļ(&F)" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "(&T)" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "ر(&C)" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "ʹԶɫ(&U)" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Զɫ" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "հ:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "ͨ:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "ѡ:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "·" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "ֻ(&E)" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "ֻ(&A)" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "ļ" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "²ʱļ:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "ļ:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "ԭļļ(&O)" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "ȫֱļ(&G):" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "ļ:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr " .bak չ(&A)" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "ʱ(&P)" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "ȷϸ" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "ȷҪ XXX Ŀô?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Ҳ" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040903a8" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x804, 936" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2620,7 +2642,7 @@ msgstr "" "½һĵ\n" "½ (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2629,7 +2651,7 @@ msgstr "" "һִļ\n" " (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2638,7 +2660,7 @@ msgstr "" "رյǰļ\n" "ر" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2647,7 +2669,7 @@ msgstr "" "浱ǰļ\n" " (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2656,7 +2678,7 @@ msgstr "" "һƱ浱ǰļ\n" "Ϊ" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2665,7 +2687,7 @@ msgstr "" "Ĵӡѡ\n" "趨" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2674,7 +2696,7 @@ msgstr "" "Ĵӡʹӡѡ\n" "ӡ趨" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2683,7 +2705,7 @@ msgstr "" "ӡǰļ\n" "ӡ" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2692,12 +2714,12 @@ msgstr "" "ԤӡЧ\n" "ӡԤ" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "ʾصĿ" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2706,32 +2728,32 @@ msgstr "" "򿪹ļ\n" "򿪹 (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "򿪹ļʱδ֪" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "湤ļʱδ֪" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "ļ" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "ɹ򿪹ļ." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "ɹ湤ļ." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2740,7 +2762,7 @@ msgstr "" "ѵǰ·ѡ浽ļ\n" "湤ļ" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2749,7 +2771,7 @@ msgstr "" "ʾϢ汾ͰȨ\n" "" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2758,27 +2780,27 @@ msgstr "" "˳Ӧóʾļ\n" "˳" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "ļ" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2787,7 +2809,7 @@ msgstr "" "лһ\n" "һ" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2796,7 +2818,7 @@ msgstr "" "лһ\n" "һ" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2805,7 +2827,7 @@ msgstr "" "дDZ˴˸\n" "" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2814,7 +2836,7 @@ msgstr "" "ںƽʾ\n" "ƽ̴" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2823,7 +2845,7 @@ msgstr "" "ƽʾ\n" "ƽ̴" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2832,7 +2854,7 @@ msgstr "" "ѡݵ\n" "" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2841,7 +2863,7 @@ msgstr "" "ɾѡݲõ\n" "" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2850,7 +2872,7 @@ msgstr "" "ָ\n" "" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2859,7 +2881,7 @@ msgstr "" "е\n" "ճ" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2868,7 +2890,7 @@ msgstr "" "ظϴεĶ\n" "ظ" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2877,7 +2899,7 @@ msgstr "" "ֲָ滻\n" "滻" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2886,7 +2908,7 @@ msgstr "" "ѡȫ\n" "ȫѡ" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2895,7 +2917,7 @@ msgstr "" "ϴεĶ\n" "" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2904,7 +2926,7 @@ msgstr "" "ظ֮ǰδɵĶ\n" "ظ" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2913,7 +2935,7 @@ msgstr "" "ʾع\n" "л" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2922,7 +2944,7 @@ msgstr "" "ʾ״̬\n" "л״̬" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2931,62 +2953,62 @@ msgstr "" "ʾرǩ\n" "лǩ" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "ԶС\n" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "ĴڴС" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Ĵλ" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "СΪһͼ" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "󴰿ڵĻ" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "лһļ" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "лһļ" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "رյǰڲʾļ" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "ڻԭɱ׼ĴС" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "嵥" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2995,183 +3017,183 @@ msgstr "" "رմӡԤģʽ\n" "ȡԤ" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nnFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge ļԱ" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "ֻз" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "밴" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Ҽ·Ƶ" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Ա:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "ȷ(&O)" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "ֹ(&A)" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "(&R)" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "(&I)" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "(&A)" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "(&Y)" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "ȫ(&A)" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "(&N)" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "ȫ(&L)" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "(&C)" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "(&S)" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "ȫ(&A)" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "ʾϢ(&M)" -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "ѯʴ(&Q)" -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "﷨" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "ıɫ" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "汾" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr ":" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr ":" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr ":" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Ҳ:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Ҳ:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "汾 %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "ѡ (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "ʾϢѾΪʾ" -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "ǰļڶԱڼ޸ġǰļԱǰһЩòЧ" -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "ѡIJӦõѾ򿪵ĶԱȴڡ" -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3182,7 +3204,7 @@ msgstr "" "\n" "ʹ 1 - %1 ֵ֮." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3193,127 +3215,129 @@ msgstr "" "\n" "֮ WinMerge ." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "|*.exe;*.bat;*.cmd|ļ (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "ļ (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge ļ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "ļ (*.ini)|*.ini|ļ (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "ıļ (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|ļ (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML ļ (*.htm,*.html)|*.htm;*.html|ļ (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML ļ (*.xml)|*.xml|ļ (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "ȫ" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "޸" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "޸ںļС" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "ļС" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "λ" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "ѡ¹ļ" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ļ (*.flt)|*.flt|ļ (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3325,7 +3349,7 @@ msgstr "" "\n" "ļ %1 Ƶ WinMerge/Filters ļ." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3338,7 +3362,7 @@ msgstr "" "\n" "ȷϴļдڲд." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3349,7 +3373,7 @@ msgstr "" "\n" "ѡ/ϵͳѡһ·." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3362,12 +3386,12 @@ msgstr "" "\n" "ļǷΪֻ?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "ѡҪװĹļ" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3378,208 +3402,223 @@ msgstr "" "\n" "޷ļƵ·?" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "ļѾ. Ƿ񸲸ԭй?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "ʽ" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "cleartool.exe ·(&P):" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "SS.EXE ·(&P):" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "ļжԱȽ" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "ļԱ" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "δ " -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "δ " -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "ǵļ" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "ҵļ" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "ɨļ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "ѡ" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "ڴิƵҲ" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "ڴҲิƵ" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "ȫƵ" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "ȫƵҲ" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "ڸļ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "ɾļ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "ƶļ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr ": %s : %d/%d ַ: %d/%d з: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr ": %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr ": %s : %d/%d ַ: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "ϲ" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr " %1 ͬ( %2 )" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "ҵ %1 ͬ" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "ҵ 1 ͬ" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "ֻ" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr " %1 Ŀ %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Ŀ: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "ѡѴڵļлļжԱ" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "ѡļ" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "ѡҪжԱȵļлļ" -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "·!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Ҳ·!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "·!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "ѡļý." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "ļļ֮жԱ!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Ҳļ: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "ļδ: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3592,42 +3631,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "ͻļʱʧ" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "ļ\n%1\nһͻļ" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Ϊ" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "ĵ %1" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 Ϊֻϣֻļѡ񡱿ļ档" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "ĿдԼ" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "ļʱ" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3640,7 +3679,7 @@ msgstr "" "\n" "Ȼ" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3657,7 +3696,7 @@ msgstr "" "\t-ļ(ȷ)\n" "\t-ֹǰ(ȡ)" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3672,7 +3711,7 @@ msgstr "" "\n" "Ҫδİ汾Ϊļ" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3687,7 +3726,7 @@ msgstr "" "\n" "Ҫδİ汾Ϊļ" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3702,7 +3741,7 @@ msgstr "" "\n" "Ҫѱ޸ĵļ" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3711,7 +3750,7 @@ msgstr "" "%1\n" "ļΪֻҪֻļ" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3726,17 +3765,17 @@ msgstr "" "\n" "ҪˢļݣرյǰԱȴڲ´ļ" -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "ļΪ" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "ҲļΪ" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3747,42 +3786,42 @@ msgstr "" "\n" "ˢĵټ" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "ָһ SourceSafe Ŀ·Ա (磺 $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "VSSǩļ..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "ǩ(Checkout)ļʱ汾ϵͳһ޷..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "ִа汾ϵͳʱ" -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ļ(Working Folder)뵱ǰļλòǷ" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "δҵ VSS ݿ⣡" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "VSS ش:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3793,7 +3832,7 @@ msgstr "" " һʹеͼ˵.\n" " ǩ?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3802,170 +3841,169 @@ msgstr "" "ڳԳǩļʱ汾ϵͳһ.\n" " һʹеͼ˵. " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 ǰ汾)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 Ժ汾)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Կհ׷ָ" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Կհ׻ָ" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "ѡеĿƵҲļ" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "ѡеĿƵָļ" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "ɾѡеĿ" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "ɾҲѡеĿ" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "ɾѡеĿ" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "ѡеĿ(ʱ)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "ΪѡеĿ" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Ҳൽ (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "ൽҲ (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Ҳൽ (%1 %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "ൽҲ (%1 %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "ൽ... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Ҳൽ... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "ൽ... (%1 %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Ҳൽ... (%1 %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Ҳ (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Ҳ (%1 %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "ѡĿļ" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - ѡĿļ:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Ҳ - ѡĿļ:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(Ӱ %1 ļ)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(Ӱ %2 ļе %1 )" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3977,17 +4015,17 @@ msgstr "" "%1\n" "" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "ȷҪ:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "ȷҪ %d Ŀ:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4006,458 +4044,473 @@ msgstr "" "\n" "ˢ±Ƚϴ." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "ļ" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "ⲿ༭ļ" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "ѡԴļ ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Ҳļ" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "ⲿ༭Ҳļ" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "ѡԴҲļ ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "ⲿ༭ʧ: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "δ֪ⲿ༭չ: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "ļƵ" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "·Ƶ" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Ҳ·Ƶ" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "·Ƶ" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "δ֪ѹʽ" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "ӵѹ" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Ҳӵѹ" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "ӵѹ" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "вͬӵѹ" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "ѡеļƶָļ" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Ҳѡеļƶָļ" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "ļ" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "ļ" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "ԱȽ" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Ҳ" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "չ" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "ļС" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "ҲļС" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "ҲļС ()" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "ļС ()" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "ཨʱ" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Ҳཨʱ" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "µļ" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "ļ汾" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Ҳļ汾" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "̵Ľ" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Ҳ" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "໻з" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Ҳ໻з" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "ļ" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Ҳļ" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "ԵIJͬ" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "ͬ" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "޷Աļ" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Ŀȡ" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "ļ" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "ļ" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr ": %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Ҳ: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "ļȫͬ" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "ļͬ" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "ļͬ" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "ֻ" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "ֻҲ" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "ִʱ: %ld " -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "ѡ 1 Ŀ" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "ѡ %1 Ŀ" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "ļļ" -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "ļ" -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "ԱȽϳĸʽ" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "޸ڡ" -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Ҳ޸ڡ" -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "ļչ" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "ļֽ" -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Ҳļֽ" -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "ļȵļ̱ʾ." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Ҳļȵļ̱ʾ." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Ĵʱ䡣" -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "ҲĴʱ䡣" -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "ʾıǽ޸Ĺġ" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "ļİ汾ֻһЩļЧ" -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Ҳļİ汾ֻһЩļЧ" -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "̸ʽĶԱȽ" -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "ԡ" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Ҳԡ" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "ļĻз" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "ҲļĻз" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "ļַ롣" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Ҳļַ롣" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ԹIJͬ. WinMergeԵIJͬ, ޷ǽкϲ." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ļеIJͬ. ԵIJͬ." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "ڶļʾǺ(*)" -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Ա %1 %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "ŷָб" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Ʊָб" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "ļѾڣҪ" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4466,32 +4519,32 @@ msgstr "" "ʱ:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "ɹ档" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "򿪵ͬһļ" -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "ѡļȫͬ" -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "һڶԱļʱ" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "޷ʱļʱ·á" -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4506,32 +4559,32 @@ msgstr "" "\n" "ʾǺԻзIJͬڡ༭/ѡġԱȡҳйѡԻз족" -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "ʹò%2ļ%1ԤԱʱһԤԱȽᱻá" -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "ѡеļЧ" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "޷ñ༭򿪶ļ" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 "ļֻһ޷򿪡\n\nǷҪһഴһӦļУ\n%1\nҴļУ" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4542,132 +4595,132 @@ msgstr "" "ֱԲͬҳʾнϺõЧǺϲ/ƻΣա\n" "ҪWindowsĬϵĴҳʾļ(Ƽ)" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr ": ļʹòַͬ, =%s Ҳ=%s, ϲпϢʧ." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ַļϢʧ" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "ַҲļϢʧ" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "ַļϢʧ" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "ûвͬ" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "ڲͬ" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "滻 %1 ַ" -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "޷ַ%s" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "ȫ" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "ļ" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "λʾ" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "ͬʾ" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "ɹдpatchļ" -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Ŀδҵһļ!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Ŀδҵһļ!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "patchļѾڣҪ" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[ѡ %1 ļ]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "ͨ" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "ͳһ" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "޷дļ %1" -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "ָ·Ǿ·: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "ָļ" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "޷Ϊļ patch" -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "޷Ϊļд patch" -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4678,17 +4731,17 @@ msgstr "" "\n" " patch ҪļûδĸĶ" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "ļвڡ" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "ǰļжԱȽᱻ" -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4700,7 +4753,7 @@ msgstr "" "ûҵ֧ѹҪ(7-zip Merge7z*.dll)\n" "鿴ֲйѹּ֧õĸϢ" -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4709,7 +4762,7 @@ msgstr "" "\n" "ע: 7-Zip ɹ WinMerge б." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4718,37 +4771,37 @@ msgstr "" "\n" "ע: 7-Zip ɹ WinMerge Ϊʹ." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "ѡ񵼳ļ" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "ѡļ" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "ѡѴļ." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "ѡѾļ." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "ѡʧ." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "ѡʧ." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4756,473 +4809,493 @@ msgid "" "Do you want to continue?" msgstr "ҪرնԱȴڡ\nǷ" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "ʽ" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "ƥ" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Чʽ" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Ч collation character" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Чַ(character class)" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "ĩβķб" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Ч back reference" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "δԵ [ or [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "δԵ ( or \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "δԵ \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\}Ч" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "ЧķΧβ" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "ڴ治" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Чǰʽ" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "ʽؽ" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "ʽ̫" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "δԵ ) or \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "ŷ" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "ŷ" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "ж" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "ûõ" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows ΢Ӵ" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS ΢DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh ƻϵͳ" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC " -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS " -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS " -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS ϣ" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS ޵ϵ" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS ϣ 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS " -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS " -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS " -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS " -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS ϣ" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS ô" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS " -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS ϣ 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows ̩" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows " -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows " -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows " -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows " -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows (˹)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows ϣ" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows 5 ()" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows ϣ" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows " -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows ޵ϵ" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Խ" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh " -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh ϣ" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh " -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh ŷ" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh " -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "ӽ ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "ӽ ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "ӽ ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "ӽ ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "ӽ ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " ֽ" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "ļ" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Ҳļ" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "ļΪָļ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "ҲļΪָļ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "ıļ/ļеֻ" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "ıҲļ/ļеֻ" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "зתΪWindowsģʽ" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "зתΪUnixģʽ" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "зתΪMacģʽ" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "ڱ༭ģʽͺϲģʽ֮л" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5231,12 +5304,12 @@ msgstr "" "ʾ޸ļ\n" "ļ" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "򿪲ͻļ" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5245,7 +5318,7 @@ msgstr "" "ѡеǰڲͬIJ\n" "ǰڲͬ" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5254,7 +5327,7 @@ msgstr "" "תкŻijͬ\n" "ת (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5263,7 +5336,7 @@ msgstr "" "趨ѡ\n" "ѡ" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5272,37 +5345,37 @@ msgstr "" "ʾ\n" " (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "ǰѡеиƵ岢ÿǰк" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "ˢѡеĿ" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "/ȡǩ" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "תһǩ" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "תһǩ" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "ǩ" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5311,7 +5384,7 @@ msgstr "" "ʾȫͬĿ\n" "ʾȫͬĿ" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5320,7 +5393,7 @@ msgstr "" "ʾвͬĿ\n" "ʾͬĿ" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5329,7 +5402,7 @@ msgstr "" "ʾֻڵĿ\n" "ʾֻĿ" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5338,7 +5411,7 @@ msgstr "" "ʾֻҲڵĿ\n" "ʾֻҲĿ" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5347,7 +5420,7 @@ msgstr "" "ʾļ\n" "ʾļ" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5356,7 +5429,7 @@ msgstr "" "ʾļ\n" "ʾļ" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5365,7 +5438,7 @@ msgstr "" "Ϊͼѡ\n" "ѡͼ" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5374,42 +5447,42 @@ msgstr "" "ͼָΪϵͳ\n" "Ĭ" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "ʾհ׺Ʊַ" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "ʾ/ضԱȴ" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "λôʾļ" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "ʾļжԱȽͳ" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "ѡǰû\n" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "ԲͬɫʾڵIJͬ\nʾڲͬ" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Ҵλ" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5418,7 +5491,7 @@ msgstr "" "ʾк\n" "ʾк" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5427,7 +5500,7 @@ msgstr "" "Զ\n" "Զ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5436,47 +5509,47 @@ msgstr "" "ʾѡҳ\n" "ʾѡҳ" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "ֳߴ" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Сֳߴ" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "ֳߴָĬϴС" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "һͬ\nһͬ(Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "һͬ\nһͬ(Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "һͬ\nһͬ(Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "ǰͬ\nǰͬ(Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "һͬ\nһͬ(Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5485,7 +5558,7 @@ msgstr "" "ѡֵҲļ\n" "Ҳ (Alt + Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5494,7 +5567,7 @@ msgstr "" "ѡֵļ\n" " (Alt + Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5503,7 +5576,7 @@ msgstr "" "ǰͬƵҲಢǰһͬ\n" "ƵҲಢǰ (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5512,7 +5585,7 @@ msgstr "" "ǰͬƵಢǰһͬ\n" "Ƶಢǰ (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5521,7 +5594,7 @@ msgstr "" "вͬҲļ\n" "еҲ" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5530,367 +5603,377 @@ msgstr "" "вͬļ\n" "е" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "ɾѡеĿ" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "ԱѡеĿ(ѡʱԱȵһĿ)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "ѡļжԱʾ" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "һpatchļ" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "ѡ޸Ĺ" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "ɶԱȽɱ" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "ûѡ (Աļʱн)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "ļӦʵĽ (ļֻҪʵչ)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "ѡһ༭ļ" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "ûԤԱȳ (ͨ)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "ƼIJ" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "жв ()" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "л㵽һɼļ\nлһļ" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "رд򿪵Ĵ" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "WinMergeİ\nWinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "ǰ WinMerge 汾Ϣıļ" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "ʾGNU General Public License" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "򿪷ĵ\nĵ" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "򿪷վ\n" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "ûԤԱȳ" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "ܣԤԱ" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH δҵ - .sct űѽ" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<Զ>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "ϵͳĬϳļ" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "ⲿ༭ļ" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "ѡԴļ" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "ʾƶ" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "ʾƶ" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "ֻʾǰƶ" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "ת괦ͬ" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "ת %1 ͬ( %2 )(&O)" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "ת %1 (&O)" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "ļϵͳѡ" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "ʹõļѡ" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Դļ" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "ع" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "ʾС" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "ʾ󹤾" diff --git a/Src/Languages/Croatian.po b/Src/Languages/Croatian.po index 0e2acd77932..ea80917f704 100644 --- a/Src/Languages/Croatian.po +++ b/Src/Languages/Croatian.po @@ -72,7 +72,7 @@ msgstr "Od&re #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Kopiraj" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "&Zalijepi" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "Idi &na redak" @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "&Otvori" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "in&staliranim programom" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "&vanjskim ureivaem" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&s..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Datoteka" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nova usporedba\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Usporedi...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Otvori &konfliktne..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otvori &usporedbu...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Po&hrani usporedbu..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "Zadnje usporedbe" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "I&zlaz" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Ureivanje" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "Pos&tavke..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Izgled" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Izbor &fonta..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Koristi standardni f&ont" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Traka &alata" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Nevidljiva" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Male ikone" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Velike ikone" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Traka &statusa" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Traka &oznaka panela" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Jezik..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Alati" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Pohrani razlike (Patch)..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "Doda&ci" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Runo raspakiravanje" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatsko raspakiravanje" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Ureivanje u arhiveru" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Uitaj dodatke ponovo" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Ispravak" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "Uitaj postavke..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Standardne postavke" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Paneli i &okna" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Zatvori panele" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Zatvori &sve panele" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Drugi panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Okna &vodoravno" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Okna &okomito" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "Okna &kaskadno" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Pomo" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "&Biljeke uz inaicu" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Prevoditelji" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "Po&deenost" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Rad s a&rhivama..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU javna licenca" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&O WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Samo za itanje - l&ijeva" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Samo za itanje - d&esna" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Kodiranje datoteke" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Oznai &sve\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Prikai &identine stavke" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Prikai &razliite stavke" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Prikai l&ijeve unikatne stavke" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Prikai d&esne unikatne stavke" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Prikai &izostavljene stavke" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Prikai &binarne datoteke" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Prikai skri&vene stavke" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Usporedbena &statistika" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Osv&jei\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Osvjei odabir\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "U&sporedo" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Us&poredi\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Slijedea razlika\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Prethodna razlika\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prva razlika\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktivna razlika\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Zadnja razlika\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiraj u &desno\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiraj u &lijevo\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Obrii\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Prilagodba kolona..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Pohrani &izvjetaj..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Pohrani\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "&Lijevu datoteku" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Pohrani" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Pohrani &kao..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "&Desnu datoteku" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Ispis" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Postava &stranice" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "&Pregled ispisa" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Zavri retke prema" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (DRNR)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (NR)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (DR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Usporedni nain" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "De&kodiranje datoteke..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Poniti\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Vrati\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Od&rei\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiraj\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Zalijepi\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Istakni &razliku\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Nai...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Za&mijeni...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Skripte" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< nita >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Dodatno" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiraj s brojevima redaka\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Oznake" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Zamijeni oznake\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Slijedea oznaka\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Prethodna oznaka\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "Ukloni sve oznake" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Idi &na...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "Po&veaj" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Po&veaj\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Smanji\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Izvorna veliina\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Oznaavanje sintakse" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "Za&kljuaj panele" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Skriv&eni znaci i razmaci" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Prikai razli&itost redaka" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Prikai &brojeve redaka" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Prikai &margine" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Pre&lomi retke" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "&Zamijeni panele" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Panel &razlika" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Panel &poloaja" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiraj u de&sno i nastavi\tAlt+Ctrl+desno" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiraj u lije&vo i nastavi\tAlt+Ctrl+lijevo" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Kopiraj sve u des&no" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Kopiraj sve u &lijevo" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Dodaci" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&Usporedba" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Posebna usporedba" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Lijevi do desni" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "L&ijevi do..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Desni do lijevi" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "D&esni do..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Pre&mjesti" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Lijevi do..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Desni do..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Obrii" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&lijevu datoteku" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&desnu datoteku" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Obje" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Sakrij stavke" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&Otvori lijevi" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Otvori &desni" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiraj &stazu" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Lijevo (%1 od %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Obje (%1 od %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Kopiraj &nazive datoteka" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Lijevo... (%1 od %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Desno...(%1 od %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Obje...(%1 od %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Razlike... (%1 od %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Osvjei" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Kopiraj stazu" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopiraj &naziv datoteke" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Dodaci - postavke " -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Nema dodataka" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Automatski dodaci" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Idi &na razliku" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Ne premjetaj blokove" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "Premjetaj &svih blokova" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Premjesti blok &ove razlike" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "O WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Osobni uradak)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Sva prava su zadrana" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge stranica na Web-u" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "U redu" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Suradnici" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Odabir datoteke ili mape" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Lijevi panel:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Odabir..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Desni panel:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "O&dabir..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtar" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Od&abir..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Arhiver:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "Oda&bir..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "Ukljui i &podmape" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Odustajem" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Pomo" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Datoteke ili mape za usporedbu" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Baza podataka:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Usporedba:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Korisnik:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Lozinka" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Povei s odredinom VSS usporedbom" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Primijeni na sve stavke" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Provjera" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Pohrana kao..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Izbor programa:" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Izbor programa:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Staza do cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Ope" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Uvijek kreni od &prve razlike" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Bez uvodnog okna" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zatvori usporedbu tipkom &ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Prethodno provjeri stazu u dijalogu odabira" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Samo &jedna instanca WinMerge-a" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "&Upitaj prije zatvaranja viestrukih usporedbi" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "&Zadri oznake vremena i datuma u usporedbi" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Otvori dijalog &samodovrenja" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Omogui viestruke usporedbe pri" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Usporedbi &mapa" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Usporedbi &datoteka" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge omoguuje skrivanje uobiajenih poruka. Pritisnite 'Poniti' da poruke opet budu vidljive." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Poniti" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Jezik" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Raspoloivi jezici:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Nai" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Pojam:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Poklapanje &cijele rijei" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Osjetljivost na &V/m slova" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Algoritam" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Ne pre&lamaj zavretak datoteke" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Smjer" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Gore" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Dole" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "Trai &slijedei" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Zamijeni" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Zamijeni s:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Bez preloma teksta" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Zamijeni u" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "oznaenom" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "&cijeloj datoteci" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Zamijeni" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Zamijeni &sve" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Racionalno ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Provjeri" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Komentari" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Provjeri ponovo" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtar redaka" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Omogui filtriranje redaka" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Ispravan algoritam (jedan po retku):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Pohrani" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Novi" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Ureivanje" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Ukloni" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Boje" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Razlike:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Oznaena razlika:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Pozadina" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Obrisano" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Zanemarene razlike:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Premjeteno:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Premjetaj oznaenog:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Razliite rijei:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Razlike oznaene rijei:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Predpodeeno" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dijalog" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Premjesti obrisano u ko?" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integracija" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Dodaj u Explorer kontekstni izbornik." -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Omogui &napredni izbornik." -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Uvijek ukljui i &podmape" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Vanjski ureiva:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Naziv mape filtara:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "&Odabir..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Mapa privremenih datoteka" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Mapa s&istemska, privremena" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Ko&risnikova mapa" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "&Odabir..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Pohrana razlika (Patch)" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "&Lijeva dat." -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "&Desna dat." -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Obrni D<->L" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Prikljui postojeoj datoteci" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Pohranu u:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Nain prikaza" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&il" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Dubina:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Razmaci prema" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&Usporedi" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Zanemari &izmjene" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Zanemari &sve" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "&Zanemari prazne retke" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Razlikuj V/m slova" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "&Ukljui naredbeni redak" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Otvori u vanjskom pregledniku." -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Prikai kolone" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Pomakni &gore" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Pomakni &dole" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Izbor arhivera" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Arhiver datoteka:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Prikai sve arhivere bez provjere ekstenzije" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Popis ekstenzija" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Napredak usporedbe mapa" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stani" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Usporedba stavki..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Stavki usporeeno:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Stavki ukupno:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Idi na" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Redak &br:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "datoteku" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "u datoteci" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&redak" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&razliku" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "Idi &na" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Usporedba" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Skriveni znaci i razmaci" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Usporedi" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Zanemari &izmjene" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Zanemari &sve" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Zanemari prazne &retke" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Zanemari V/m &slova" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "&Zanemari razliitost oznaka zavretka retka (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Omogui &razlikovanje premjetenih blokova" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Jednake retke" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Zanemari razlike manje od 3 sekunde" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Usporedi &datoteke prema" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Zastani na prvoj razlici" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtriraj komentare" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Ureivanje" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Istakni sintaksu" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Automatski ponovo pretrai" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Zadri izvorni nain oznaavanja kraja redaka" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulatori" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Veliina tabulatora" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Umetni tabulator" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&Umetni razmak" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Isticanje razliitosti" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Unutar retka" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "Svaki &znak" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&Rije:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtar redaka" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instaliraj..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Novi..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Ureivanje..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Brisanje..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Pohraniti izmijenjenu datoteku?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Datoteka s lijeva" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Pohrani promjene" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Odustajem od izmjena" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Datoteka s desna" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Pohrani promjene" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Odustajem od izmjena" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Zanemari sve" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Kodna stranica" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Standardna kodna stranica" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Odaberite standardnu kodnu stranicu za uitanje ne-Unicode datoteka:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,56 +2029,56 @@ msgstr "" "Utvrdi kodnu stranicu ovih datoteka: .html, .rc, .xml \n" "Treba ponovo pokrenuti program" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Standardna kodna stranica sistema" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Prema korisnikovom suelju WinMerge-a" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Korisnika kodna stranica:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge nee raditi s arhivima" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nema 7-Zip programa (nije instaliran?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Rad s arhivama zahtijeva program 7-Zip 3.11 ili njegovu noviju inaicu instaliranu na raunalu ili njegove komponente za samostalno djelovanje, kopirane u mapi programa." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Potreban je odgovarajui dodatak (Merge7z*.dll) i staza do njega." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "U tablici su navedeni preporuena inaice programa 7-ZIP i dodatka te inaice koje koristite. Molimo, koristite inaice koje imate, dok novije ne budu dostupne." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Inaica" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2076,540 +2087,551 @@ msgstr "" "Potreban dodatak\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Preporuena inaica programa 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "postoji" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Vei 7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip softver je instaliran na raunalu:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nema" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "nedostaje" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponente za samostalno djelovanje:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "zastario" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Staza do dodataka:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "Ne prikazuj &vie ovu poruku.\n(Uvijek je dostupna preko izbornika pomoi.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Preuzimanje dodatka" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Postavke" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Skupina" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Uvoz..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Izvoz..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Kljune rijei:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nazivi funkcija:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Komentari:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Brojevi:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Pojmovi:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Predobraeno:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Korisnik 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Korisnik 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Podebljano" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Izvjetaj usporedbe mapa" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Datoteka izvjetaja:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Odabir..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiraj u meumemoriju" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Zajedniki ili osobni filtar" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Koji tip filtra elite stvoriti?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Zajedniki Filtar (za sve korisnike raunala)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Osobni filtar (samo za trenutnog korisnika)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Rad s arhivima" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "7-Zip dodatak za instalaciju:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Preuzimanje 7-Zip dodatka" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Omogui rad s &arhivima" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Ko&risti vanjski 7-Zip ako je mogue" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "&Koristi 7-Zip program kao unutarnji" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Oitaj tip arhiva iz zaglavlja datoteke" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Usporedba statistike" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Mape:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Datoteke:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Razlika" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Tekst" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binarno:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unikat" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Lijevo:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Desno:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identino" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Ukupno:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Zatvori" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Primjeni na" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Primjeni na)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Odabir kodne stranice za" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Uitavanje datoteke:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Pohrana datoteke:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Ista kodna stranica za obje" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Primjeni" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Odustajem" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Test filtar" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testiranje filtra..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Unos teksta za provjeru" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Naziv mape" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Zatvori" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Koristi odabrane boje" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Korisnike boje" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Skriveni znaci i razmaci:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Pravilan tekst" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Odabir:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Staze" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Samo za itanje" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Samo za itanje" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Otvori..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Pohrani..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Sigurnost" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Pohrani rezervnu datoteku pri:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Pohrani rezervnu datoteku u:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Izvornu mapu datoteke" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Standardnu mapu rezervnih kopija" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Naziv rezervne datoteke" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Dodaj .bak ekstenziju" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "&Dodaj datum i vrijeme" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Potvrdite kopiranje" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Kopirati XXX stavku?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "S lijeva" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "U desno" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Ne" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041a04e2" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x41a, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Spreman" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2618,7 +2640,7 @@ msgstr "" "Stvaranje prazne usporedbe\n" "Nova usporedba (Ctrl+O)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2627,7 +2649,7 @@ msgstr "" "Otvaranje postojee datoteke\n" "Otvori (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2636,7 +2658,7 @@ msgstr "" "Zatvaranje aktivne usporedbe\n" "Zatvori" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2645,7 +2667,7 @@ msgstr "" "Pohrana aktivne datoteke\n" "Pohrani (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2654,7 +2676,7 @@ msgstr "" "Pohrana aktivne datoteke pod novim nazivom\n" "Pohrani kao" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2663,7 +2685,7 @@ msgstr "" "Promjena postavki ispisa\n" "Postava stranice" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2672,7 +2694,7 @@ msgstr "" "Podeavanje postavki pisaa i ispisa\n" "Postavke ispisa" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2681,7 +2703,7 @@ msgstr "" "Ispis aktivnog dokumenta\n" "Ispis" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2690,12 +2712,12 @@ msgstr "" "Prikaz stranice ispisa\n" "Pregled ispisa" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Ponovo prikai sve skrivene stsvke" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2704,32 +2726,32 @@ msgstr "" "Otvaranje usporedbi\n" "Datoteka usporedbe (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nepoznata greka pri otvaranju usporedbe" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nepoznata greka pri pohrani usporedbe" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Usporedba" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Usporedba je uitana." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Usporedba je pohranjena." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2738,7 +2760,7 @@ msgstr "" "Pohrana staze i datoteke usporedbe\n" "Pohrani usporedbu" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2747,7 +2769,7 @@ msgstr "" "Prikaz informacija o programu, br. inaice i autorstva\n" "O" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2756,27 +2778,27 @@ msgstr "" "Zatvaranje programa; Podsjetnik za pohranu rada\n" "Izlaz" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Otvori ovu datoteku" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2785,7 +2807,7 @@ msgstr "" "Aktiviranje slijedeeg panela\n" "Slijedei panel" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2794,7 +2816,7 @@ msgstr "" "Vraanje na prethodni panel\n" "Prethodni panel" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2803,7 +2825,7 @@ msgstr "" "Sortiranje okna kaskadno\n" "Kaskadno" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2812,7 +2834,7 @@ msgstr "" "Postavljanje okna vodoravno, bez prekrivanja\n" "Okna vodoravno" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2821,7 +2843,7 @@ msgstr "" "Postavljanje okna okomito, bez prekrivanja\n" "Okna okomito" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2830,7 +2852,7 @@ msgstr "" "Kopiranje sadraja meumemorije\n" "Kopiraj" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2839,7 +2861,7 @@ msgstr "" "Uklanjanje oznaenog u meumemoriju\n" "Odrei" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2848,7 +2870,7 @@ msgstr "" "Traenje odreenog pojma\n" "Trai" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2857,7 +2879,7 @@ msgstr "" "Umetanje sadraja meumemorije\n" "Zalijepi" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2866,7 +2888,7 @@ msgstr "" "Ponavljanje zadnje radnje\n" "Ponovi" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2875,7 +2897,7 @@ msgstr "" "Zamjena odreenog teksta drugim\n" "Zamijeni" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2884,7 +2906,7 @@ msgstr "" "Oznaavanje cijelog dokumenta\n" "Oznai sve" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2893,7 +2915,7 @@ msgstr "" "Ponitenje zadnje radnje\n" "Poniti (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2902,7 +2924,7 @@ msgstr "" "Povratak prethodnog stanja\n" "Vrati (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2911,7 +2933,7 @@ msgstr "" "Prikaz ili skrivanje trake alata\n" "Traka alata" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2920,7 +2942,7 @@ msgstr "" "Prikaz ili skrivanje trake statusa\n" "Traka statusa" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2929,7 +2951,7 @@ msgstr "" "Prikaz ili skrivanje trake oznaka\n" "Traka oznaka" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2938,57 +2960,57 @@ msgstr "" "Automatska prilagodba veliine panela\n" "Zakljuaj panele" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Promjena veliine okna" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Promjena poloaja okna" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Smanji okno na ikonu" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Poveaj preko cijelog zaslona" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Okno slijedee usporedbe" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Okno prethodne usporedbe" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zatvori aktivno okno i podsjeti na pohranu dokumenta" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Vraanje na uobiajenu veliinu okna" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Popis aktivnih zadataka" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktiviraj ovo okno" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2997,183 +3019,183 @@ msgstr "" "Zatvaranje pregleda ispisa\n" "Zatvori pregled" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge Usporedba datoteka" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Usporedba mapa" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Zadri izvorne znake kraja retka" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Pritisnite bilo koju tipku" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Desni klik na stazu koju trba kopirati" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Razvojni tim:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, fuzzy, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge je program BEZ IKAKVE GARANCIJE. To je besplatan softver koji moete dalje distribuirati pod odreenim okolnostima prema GNU javnoj licenci koju pogledajte u datoteci pomoi." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&U redu" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Ponovi" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Zanemari" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Zanemari &sve" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Da za &sve" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Ne za s&ve" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Nastavi" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Izostavi" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Izostavi &sve" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Ne prikazuj vie ovu poruku." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Ne &pitaj ponovo." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Boja sintakse" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Boja teksta" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Programi" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "S lijeva:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "U lijevo:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "S desna:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "U desno:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "inaica %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Postavke" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Ponovni prikaz svih poruka" -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Promjene su izvrene u aktivnoj datoteci kroz usporedbu. Neka podeavanja su vidljiva tek nakon ponovnog pokretanja usporedbe." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Promjene fonta nije vidljiva u aktivnim vidljivim oknima." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3184,7 +3206,7 @@ msgstr "" "\n" "Molimo koristite vrijednosti 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3195,127 +3217,129 @@ msgstr "" "\n" "Molimo, ponovo pokrenite WinMerge nakon povrata." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programi |*.exe;*.bat;*.cmd|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Sve datoteke (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge datoteke (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "INI datoteke (*.ini)|*.ini|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Tekst datoteke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Potpun sadraj" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Skraeni sadraj" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Datum promjene" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Datum promjene i veliina" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Veliina" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Naziv" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Poloaj" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtri..." -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Izaberite datoteku kao novi filtar" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "FLT datoteke (*.flt)|*.flt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3328,7 +3352,7 @@ msgstr "" "Molimo, kopirajte datoteku %1 u WinMerge/Filters -mapu:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3341,7 +3365,7 @@ msgstr "" "\n" "Provjerite postoji li mapa i njenu dostupnost." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3352,7 +3376,7 @@ msgstr "" "\n" "Molimo, odredite ju u 'Postavke/Sistem'." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3365,12 +3389,12 @@ msgstr "" "\n" "Moda je zatiena - samo za itanje?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Locirajte datoteku filtriranja za instalaciju" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3381,208 +3405,223 @@ msgstr "" "\n" "Ne mogu je pohraniti u mapu filtara." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filtar ve postoji. Natpisati ga?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Algoritam" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Staza do cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Staza do SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati usporedbe mapa" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Usporedba datoteka" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Neimenovan" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Neimenovan" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Tue datoteke" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Moje datoteke" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Pretraivanje datoteka..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Otvaranje odabranog" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopiranje lijevo u desno" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopiranje desno u lijevo" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopiranje sve u lijevo" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopiranje sve u desno" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopiranje datoteka..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Brisanje datoteka..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Premjetanje datoteka..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Stvaranje izvjetaja..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Redak: %s Br: %d/%d Znak: %d/%d kraj: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Redak: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Redak: %s Br: %d/%d Znak: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Usporedo" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Razlika: %1 od %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "Naeno razlika: %1" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "Naeno razlika: 1" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "S" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Stavka %1 od %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Stavke: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Odaberite dvije datoteke ili mape za usporedbu" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Izbor mape" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Izbor dviju datoteka ili mapa za usporedbu." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Lijeva staza je kriva!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Desna staza je kriva!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Obje staze su krive!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Molim izaberite dvije datoteke koje prihvaa arhiver." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne mogu usporediti datoteku i mapu." -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Nema datoteke: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka nije raspakirana: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3595,42 +3634,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Ne mogu podjeliti konfliktnu datoteku." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Datoteka\n%1\nnije konfliktna." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Pohrani kao" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Pohraniti izmjene %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaena smo za itanje. Natpisati zatienu datoteku? (Stisnite 'Ne', za pohranu pod novim nazivom.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Greka pri kontroli mogunosti pohrane na odreditu" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Greka pri stvaranju rezervne datoteke" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3643,7 +3682,7 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3699,7 @@ msgstr "" "\t- Pritisnite 'U redu' za pohranu pod drugim nazivom\n" "\t- ili pritisnite 'Odustajem' za prekid postupka." -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3714,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3729,7 @@ msgstr "" "\n" "Pohraniti nespakiranu verziju kao datoteku?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3744,7 @@ msgstr "" "\n" "Natpisati datoteku?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3714,7 +3753,7 @@ msgstr "" "%1\n" "je oznaena samo za itanje. Natpisati zatienu stavku?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3729,17 +3768,17 @@ msgstr "" "\n" "Ako elite osvjeiti datoteku, zatvorite usporedbu i ponovite." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Pohrani lijevu datoteku kao" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Pohrani desnu datoteku kao" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3750,42 +3789,42 @@ msgstr "" "\n" "Osvjeite dokumente prije nastavka." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Odredite SourceSafe stazu usporedbe, ako elite nastaviti (ie: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Provjera datoteka na VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistem pokazuje greku dok pokuava provjeriti datoteku. Nastavak nemogu..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Greka pri izvrenju sistemske naredbe." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS radna mapa i lokacija aktivne datoteke se ne poklapaju. Nastaviti?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Nema VSS baze" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Greka iz VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3796,7 +3835,7 @@ msgstr "" " Molimo pregledajte podeenost koritenog izgleda. .\n" " Odustati?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3805,170 +3844,169 @@ msgstr "" "Versioning Sistem pokazuje greku dok pokuava provjeriti datoteku.\n" " Molimo pregledajte podeenost koritenog izgleda. " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Nita" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 i vii)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i vii)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Stani na razmaku" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Stani na razmaku ili interpunkciji" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiraj odabranu stavku u imenovanu mapu" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiraj odabranu stavku u korisnikovu mapu" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Obrii odabranu stavku s lijeva" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Obrii odabranu stavku s desna" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Obrii odabranu stavku na obje strane" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Sakrij odabranu(e) stavku(e) (filtar u letu)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Preimenuj odabranu stavku na obje strane" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Desno do lijevo (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Lijevo do desno (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Desno do lijevo (%1 od %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lijevo do desno (%1 od %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Lijevo do... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Desno do... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lijevo do... (%1 od %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desno do... (%1 od %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Lijevo (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Desno (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Oba panela (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Lijevo (%1 od %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Desno (%1 od %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Oba panela (%1 od %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Odaberite odredinu mapu:" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Lijeva strana - odaberite odredinu mapu:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Desna strana - odaberite odredinu mapu:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 datoteka doraeno)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 od %2 datoteka doraeno)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3979,17 +4017,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Kopirati? -" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Kopirati %d stavku:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4008,458 +4046,473 @@ msgstr "" "\n" "Osvjeite usporedbu." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Otvori lijevu datoteku" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Otvori lijevu datoteku u vanjskom editoru" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Otvori lijevu datoteku s..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Otvori desnu datoteku" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Otvori desnu datoteku u vanjskom editoru" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Otvori desnu datoteku s..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Greka pri pokretanju vanjskog editora: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Nepoznat tip datoteke za vanjski editor: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiraj nazive datoteka u meumemoriju" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiraj stazu lijeve strane u meumemoriju" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiraj stazu desne strane u meumemoriju" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiraj staze obiju strana u meumemoriju" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Nepoznat oblik arhiva" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj stavke s lijeva u arhiv" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj stavke s desna u arhiv" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj stavke obiju strana u arhiv" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj stavke razlika u arhiv (obje strane)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Premjetaj oznaene datoteke s lijeva u izabranu mapu" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Premjetaj oznaene datoteke s desna u izabranu mapu" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Naziv datoteke" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Mapa" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Rezultat usporedbe" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Datum lijevo" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Datum sadanji" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Tip" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Veliina lijevo" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Veliina desno" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Veliina desno (skraeno)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Veliina lijevo (skraeno)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Tim lijeve datoteke" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Tim desne datoteke" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Novija datoteka" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Verzija lijeve datoteke" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Rezultat skraeno" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atributi lijevo" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atributi desno" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Zavretak reda lijevo" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Zavretak retka desne datoteke." -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Kodiranje lijevo" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Zanemari razlike" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binarno" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Ne mogu usporediti datoteke" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Odbaena stavka" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Izostavljene datoteke" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Izostavljene mape" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Samo lijevi: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Samo desni: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binarne datoteke su identine" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binarne datoteke su razliite" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Datoteke su razliite" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Samo lijevo" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Samo desno" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Greka" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Proteklo vrijeme: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 stavka oznaena" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 stavki oznaeno" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Naziv datoteke ili mape." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazivi podmapa ako su podmape ukljuene." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Rezultat usporedbe, dui oblik." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Lijeva strana - datum promjene." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Desna strana - datum promjene." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Tip (ekstenzija) datoteke" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Veliina u bajtima, lijeve datoteke." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Veliina u bajtima, desne datoteke." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Skraenice lijeve datoteke" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Skraenice desne datoteke" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Lijeva strana - vrijeme stvaranja." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Desna strana - vrijeme stvaranja." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Koja strana je promijenjena ranije?" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija na lijevoj strani, samo za neke tipove." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija na desnoj strani, samo za neke tipove." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Rezultat usporedbe, krai oblik." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atributi lijeve datoteke" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atributi desne strane" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Nain zavretka retka lijeve datoteke." -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Nain zavretka retka desne datoteke." -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Kodirana lijeva strana" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Kodiranje desne strane" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Broj zanemarenih razlika u datoteci. Zanemarene razlike ne mogu biti spajane u WinMergeu." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Broj razlika u datoteci. Zanemarene razlike nisu ukljuene." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikai zvjezdicu (*) uz binarnu datoteku." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Usporedi %1 s %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Popis odvojen zarezom" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Popis odvojen tabulatorom" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Jednostavni HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Jednostavni HTML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Datoteka izvjetaja ve postoji. Natpisati?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4468,32 +4521,32 @@ msgstr "" "Greka pri stvaranju izvjetaja:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Izvjetaj je uspjeno stvoren." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je otvorena u oba panela." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Datoteke su identine." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Greka pri usporedbi datoteka." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Ne mogu stvoriti privremenu datoteku. Provjerite postavke staze." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4508,32 +4561,32 @@ msgstr "" "\n" "Napomena: elite li uvijek zadrati li razliitost prijelaza u drugi redak, odaberite 'Zanemari razliitost prijelaza u drugi redak..' u kartici usporedbi u oknu dijaloga 'Ureivanje/Postavke." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 "Reci zavravaju na razliit nain (Windows/Unix/Mac) u datoteci '%1'.\n Prema postavkama, promijenit e se kako je odabrano.\n Izmijeniti ovu postavku i zadrati razliit nain zavretaka?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Greka prilikom prediffing datoteke '%1' s dodatkom '%2'. Prediffing se dalje ne izvodi." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Odabrana mapa je pogrena." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne mogu otvoriti binarnu datoteku u ureivau" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 "Mapa postoji samo na jednoj strani i ne moe se otvoriti.\n\nelite li stvoriti mapu:\n%1\nna drugoj strani i otvoriti je?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4544,132 +4597,132 @@ msgstr "" "Prikaz svake datoteke u vlastitoj ks je ljepi, ali dovodi do tekoa prilikom spajanja ili kopiranja.\n" "Preporuamo obje datoteke prikazati u Windows prednamjetenoj kodnoj stranici?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Panja: Datoteke su kodirane razliito, lijeva=%s, a desna=%s, i spajanje moe prouzroiti gubitak informacija." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Grekom pri kodiranju izgubljena je informacija: obje datoteke" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Grekom pri kodiranju izgubljena je informacija: desna datoteka" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Grekom pri kodiranju izgubljena je informacija: lijeva datoteka" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Nema razlike" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Razliiti redak" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamijenjeno %1 pojam (pojmova)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ne mogu nai pojam \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopiraj stazu" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopiraj naziv datoteke" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Poloaj panela" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Panel razlika" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Datoteka razlika je pohranjena." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. stavka ili mapa ne postoji!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. stavka ili mapa ne postoji!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Datoteka razlika ve postoji. Natpisati?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 datoteka odabrano]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Uobiajeno" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Detaljnije" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Zdrueno" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Ne mogu pohraniti u datoteku" -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Dana staza ne odgovara: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Odredite izlaznu datoteku" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne mogu stvoriti datoteku razlika iz binarnih datoteka" -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne mogu stvoriti datoteku razlika mapa." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4680,17 +4733,17 @@ msgstr "" "\n" "Prije stvaranja datoteke razlika, sve datoteke trebaju biti pohranjene." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Mapa ne postoji" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Rezultati usporedbi mapa e biti uklonjeni." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4701,7 +4754,7 @@ msgstr "" "Nema nunih komponenata (7-zip i/ili Merge7z*.dll) .\n" "Pregledajte upute kako omoguiti rad s arhivama." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4710,7 +4763,7 @@ msgstr "" "\n" "Napomena: Integracija 7-Zip je onemoguena u WinMerge postavkama." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4719,37 +4772,37 @@ msgstr "" "\n" "Napomena: Integrirani 7-Zip je ogranien na samostalno djelovanje unutar WinMerge postavki." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Odabir datoteke za izvoz" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Odabir datoteke za uvoz" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Uvoz postavki u datoteku" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Izvoz postavki u datoteku" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Greka pri uitanju postavki" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Greka pri pohrani odabranih postavki." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4760,473 +4813,493 @@ msgstr "" "\n" "Nastaviti?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Greka u algoritmu" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Nema" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Krivi algoritam" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Krivi znak" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Krivi znak naziva klase" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Znak \"\"" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Kriva referenca" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Neodgovarajue [ ili [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Neodgovarajue ( ili \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Neodgovarajue" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Krivi sadraj \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Krivi kraj raspona" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Izvan memorije" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Neoekivan kraj algoritma" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Prerani kraj algoritma" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Dani algoritma je prevelik" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Neodgovarajue ) ili \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Zapadna Europa" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Istona Europa" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Istona Azija" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Srednji Istok" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Nije primjenjivo" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproksimacija ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproksimacija ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproksimacija ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproksimacija ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproksimacija ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "NR" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "DR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "DRNR" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Pohrani lijevu datoteku" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Pohrani desnu datoteku" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Pohrani lijevu datoteku pod nazivom..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Pohrani desnu datoteku pod nazivom..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Izmjena atributa, samo za itanje, lijeve dat./mapa" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Izmjena atributa, samo za itanje, desna dat./mapa" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Pretvori kraj retka na Windows nain" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Pretvori kraj retka na Unix nain" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Pretvori kraj retka na Mac nain" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Naina rada: Ureivanje - Usporedo" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5235,12 +5308,12 @@ msgstr "" "Prikaz i podeavanje mogunosti kodiranja datoteka\n" "Mogunosti kodiranja" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Otvaranje i rjeavanje konfliktnih datoteka" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5249,7 +5322,7 @@ msgstr "" "Isticanje razlike u aktivnom retku\n" "Razlike u aktivnom retku" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5258,7 +5331,7 @@ msgstr "" "Idi na redak razlike\n" "Idi na (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5267,7 +5340,7 @@ msgstr "" "Postavke programa\n" "Postavke " -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5276,37 +5349,37 @@ msgstr "" "Osvjeavanje prikaza\n" "Osvjei (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiraj redak u meumemoriju s brojem retka na poetku" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Osvjei odabranu stavku" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Zamijeni oznake" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Slijedea oznaka" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Prethodna oznaka" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Ukloni sve oznake" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5315,7 +5388,7 @@ msgstr "" "Prikaz jednakih stavki\n" "Identine stavke" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5324,7 +5397,7 @@ msgstr "" "Prikazivanje stavki koje se razlikuju\n" "Prikaz razliitih stavki" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5333,7 +5406,7 @@ msgstr "" "Prikaz jedinih stavki razlika lijeve strane\n" "Lijevi unikati" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5342,7 +5415,7 @@ msgstr "" "Prikaz jedinih stavki raznika desne strane\n" "Desni unikati" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5351,7 +5424,7 @@ msgstr "" "Prikazivanje binarnih datoteka\n" "Prikaz binarnih datoteka" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5360,7 +5433,7 @@ msgstr "" "Prikazivanje zanemarenih stavki\n" "Prikaz zanemarenih stavki" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5369,7 +5442,7 @@ msgstr "" "Odabir fonta\n" "Odabir fonta" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5378,42 +5451,42 @@ msgstr "" "Vraanje na prednamjeteni font za pregledanje\n" "Standardni font" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Skriveni znaci i razmaci" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Zamjeni panele" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel prikazuje poloaj razlike u datoteci" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Prikai okno statistike usporedbe mapa" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Izaberite va jezik suelja\nJezik" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Bojom isticanje razlika u recima\nOboji razliite retke" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Meusobno zamijeni poloaje panela" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5422,7 +5495,7 @@ msgstr "" "Prikaz brojeva redaka\n" "Prikai brojeva redaka" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5431,7 +5504,7 @@ msgstr "" "Omoguavanje prijeloma teksta\n" "Prijelom teksta" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5440,47 +5513,47 @@ msgstr "" "Prikaz odabranih margina za oba panela\n" "Prikaz odabranih margina" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Poveaj veliinu teksta" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Smanji veliinu teksta" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Izvorna veliina teksta" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Prikaz prethodne razlike\nPrethodna razlika (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Prikaz slijedee razlike\nSlijedea razlika (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Prikaz prve razlike\nPrva razlika (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Prikaz aktivne razlike\nAktivna razlika (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Posljednja razlika\nPosljednja razlika (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5489,7 +5562,7 @@ msgstr "" "Kopiranje oznaenog teksta u desnu datoteku\n" "Kopiraj u desno (Alt+desno)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5498,7 +5571,7 @@ msgstr "" "Kopiranje oznaenog teksta u lijevu datoteku\n" "Kopiraj u lijevo (Alt+lijevo)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5507,7 +5580,7 @@ msgstr "" "Kopiraj razliku u desno i idi na slijedeu\n" "Kopiraj u desno i nastavi dalje (Ctrl+Alt+desno)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5516,7 +5589,7 @@ msgstr "" "Kopiraj razliku u lijevo i idi na slijedeu\n" "Kopiraj u lijevo i nastavi dalje (Ctrl+Alt+lijevo)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5525,7 +5598,7 @@ msgstr "" "Kopiranje svih razlika u desno\n" "Sve u desno" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5534,367 +5607,377 @@ msgstr "" "Kopiranje svih razlika u lijevo\n" "Sve u lijevo" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Obrii odabrane stavke iz obje mape." -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Usporedba odabranih stavki (U viestrukom izboru, usporeuje se prva)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selektiranje i razmjetaj mape prema usporedbi kolona" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Stvaranje datoteke razlika" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Odaberi sve filtre za promjene" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Stvaranje izvjetaja iz usporedbe" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Korisnik bira arhiver (ne djeluje na mapama)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Arhiver e se koristiti za obje datoteke (jedna treba samo ekstenziju)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Odaberite arhiver za ovaj arhiv." -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Bez dodataka (uobiajeno)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Preporuljivi dodaci" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Ostali dodaci" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Ponovo uitaj sve dodatke (za znalce)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "Aktiviranje slijedee datoteke - vidljiva\nAktiviraj slijedeu datoteku" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Zatvori sve panele" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "Prkaz WinMerge pomoi\nWinMerge Pomo" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Pohrana WinMerge informacija o inaici i podeenosti u tekst datoteku" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "GNU javna licenca" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Osobni uradak: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Otvori datoteku napomena uz inaicu\nRelease Notes" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "OtvoriWeb lokaciju prevoditelja\nTranslations" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Postavke dodataka" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Bez dodataka" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediff ako je mogue" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH dodatak nije naen! - .sct skripte su onemoguene" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "Nita" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "Automatski" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Otvori datoteku u pridruenom ureivau" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Otvori datoteku u vanjskom ureivau" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Otvori datoteku u odreenom ureivau" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Ne prikazuj premjetene blokove" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Prikai sve premjetene blokove" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Prikai premjetene blokove samo aktivnih razlika" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Idi na razliku pod kursorom" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Idi &na razliku %1 od %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Idi &na redak" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Onemogueno" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Sistem datoteka" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Popis zadnje koritenih" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Prenosni objekt" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resursi" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Sakrij alatnu traku" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Male ikone alatne trake" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Velike ikone alatne trake" diff --git a/Src/Languages/Czech.po b/Src/Languages/Czech.po index 22b5198afb9..38ba310dce4 100644 --- a/Src/Languages/Czech.po +++ b/Src/Languages/Czech.po @@ -72,7 +72,7 @@ msgstr "Vyj&mout" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Koprovat" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "&Vloit" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "P&ejt na..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "&Otevt" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "pidruenou &aplikac" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "externm &editorem" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&zvolit..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Soubor" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nov\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otevt...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otevt pro&jekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Uloit &projekt..." @@ -161,1857 +163,1866 @@ msgid "Recent Projects" msgstr "Naposledy pouit" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Konec" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "pr&avy" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "Monost&i..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Zobrazit" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Vybrat psmo..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Pout vchoz psmo" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Panel &nstroj" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Skrt" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Mal" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Velk" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&Stavov dek" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Panel &zloek" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Jazyk..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Nstroje" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtry..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Opravn soubor..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Pluginy" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Pevdt &run" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Pevdt &automaticky" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Upravit pomoc pevade" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "Znovu &nast" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Okno" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Zavt" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Z&avt ve" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Z&mnit panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Vedle sebe &vodorovn" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Vedle sebe &svisle" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Na sebe" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "Npo&vda" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Obsah a rejstk\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "Poznmky k &vydn" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Peklady" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&Nastaven" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Podpora archivace vypnuta..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "Obecn veejn licence &GNU" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "O &aplikaci WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "L&ev pouze pro ten" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Pr&av pouze pro ten" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "K&dovn soubor" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vybr&at ve\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Ukzat s&hodn poloky" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Ukzat roz&dln poloky" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Ukzat &lev jedinen poloky" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Ukzat p&rav jedinen poloky" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Ukzat p&eskoen poloky" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Ukzat &binrn soubory" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Ukzat s&kryt poloky" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "St&atistika porovnn" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Obnovit\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Obnovit &vybran\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "Slo&uit" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Porov&nat\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Dal rozdl\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Pedchoz rozdl\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pr&vn rozdl\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Ak&tuln rozdl\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Po&sledn rozdl\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Koprovat dop&rava\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Koprovat do&leva\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "Odstran&it\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "Vlastn &sloupce..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "&Protokol porovnn..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Uloit\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Uloit &lev" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Uloit" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Uloit j&ako..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Uloit p&rav" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Tisk..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "V&zhled strnky" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "N&hled..." -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "Pevst konce &dk" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Reim sl&uovn\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "Kdo&vn soubor" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Zpt\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Znov&u\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Vyj&mout\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Koprovat\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Vloit\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vybrat roz&dl v dku\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Najt...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Na&hradit...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "Skrip&ty" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< dn >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "&Rozen" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Koprovat s sly dk\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "Z&loky" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Pepnout &zloku\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Dal zloka\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Pedchoz zloka\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "Zruit &vechny zloky" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "P&ejt na...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Velikost psma" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Z&vtit\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Z&menit\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normln\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Zvraznn syntaxe" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "&Uzamknout panely" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Zobrazit ne&tisknuteln znaky" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Zobrazit rozdly v &dcch" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Zobrazit sla d&k" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Zobrazit &lev okraje" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Zala&movat dky" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Z&amnit panely" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "&Rozdlov panel" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "&Polohov panel" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Koprovat dopr&ava a na dal\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Koprovat dol&eva a na dal\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "&Koprovat ve doprava" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "K&oprovat ve doleva" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&Porovnat" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Lev doprava" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "L&ev do..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "P&rav doleva" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "Pr&av do..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "P&esunout" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Lev do..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "P&rav do..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "Odstran&it" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Lev" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "P&rav" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "O&boje" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Pej&menovat" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Skrt poloky" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Otevt &lev" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Otevt p&rav" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Koprovat &umstn soubor" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Lev (%1 z %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "P&rav (%1 z %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "O&boje (%1 z %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Koprovat &nzev souboru" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Archivovat" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Lev... (%1 z %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "P&rav... (%1 z %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "O&boje... (%1 z %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Ro&zdly... (%1 z %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Obnovit" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "Koprovat cel &umstn" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Koprovat &nzev souboru" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "&Pejt na dek" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Nezobrazovat pesunut bloky" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Vechny pesunut bloky" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Pesunut blok pro ak&tuln rozdl" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "O aplikaci WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Vechna prva vyhrazena." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Navtivte domovskou strnku WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Pispvatel" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Vybrat soubory nebo sloky..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "V&levo:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Prochzet..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "Vp&ravo:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Pr&ochzet..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtr:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "&Vybrat..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "P&evad:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "Vy&brat..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "Vetn pod&sloek" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Storno" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Npovda" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Soubory nebo sloky k porovnn" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Systm sledovn verz" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Systm sledovn verz:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta k programu cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Obecn" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automaticky posunout na pr&vn rozdl" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Nezobrazovat vodn o&brazovku" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zavrat okna klvesou &Esc" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automaticky &ovovat cesty v dialogu Otevt" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Povolit pouze jedno &hlavn okno aplikace" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "Dotzat se na &zaven vce oken" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Z&achovvat pvodn as souboru" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Automatick &dokonovn:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Povolit vce oken pro porovnn" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "s&loek" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "&soubor" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" "Nkter obecn okna se zprvami je mono skrt.\n" "Po stisknut tlatka Vrtit se vechna tato okna opt budou objevovat." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "V&rtit" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Jazyk" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Dostupn jazyky:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Najt" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "C&o hledat:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Pouze &cel slova" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "&Rozliovat mal a velk psmena" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "R&egulrn vraz" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Zastavit na &konci souboru" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Smr" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "Nahor&u" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Dol" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Najt dal" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Nahradit" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "&m nahradit:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "Zastavit na &konci souboru" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Nahrazovat" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "ve v&bru" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "v ce&lm souboru" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "Na&hradit" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Nahradit &ve" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Komente" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtrovn dk" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Povolit filtrovn dk" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulrn vrazy (jeden na dek):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "&Uloit" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "&Nov" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Upr&avit" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "O&dstranit" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Barvy" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Rozdl:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Vybran rozdl:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Pozad" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Chybjc" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Ignorovan rozdl:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Pesunut blok:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Vybran pesunut blok:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Rozdln slovo:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Vybran rozdln slovo:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "&Pvodn" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Syntaxe" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Systm" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Odeslat odstrann soubory do &koe" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integrace" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Pidat do &mstn nabdky v przkumnku" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Povolit &rozenou nabdku" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Vchoz porovnn vetn pod&sloek" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Extern editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "Sloka vlastnch &filtr:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Pr&ochzet..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Sloka &doasnch soubor" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Sys&tmov sloka doasnch soubor" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "&Vlastn sloka:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Prochzet..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Vytvoen opravnho souboru" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Soubor &1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Soubor &2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Z&amnit" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "P&ipojit ke stvajcmu souboru" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "V&sledek:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "Formt" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Me&toda:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "O&bsah:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Przdn msta" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "P&orovnvat" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Ignorovat &zmny" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ignorovat &vechny" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorovat przdn &dky" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Rozliovat &mal a velk psmena" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Vloit p&kazov dek" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Otevt v &externm editoru" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Zobrazit sloupce" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "&Nahoru" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "&Dol" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Zvolit pevad" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "&Pevad soubor:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "&Zobrazit vechny pevade (nekontrolovat podle ppony)" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Seznam ppon:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Popis:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Prbh porovnn sloek" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Zastavit" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Porovnvaj se poloky..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Porovnno:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Celkem:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Pejt" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Pejt &na:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Soubor" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Pejt na co" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&dek" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "Ro&zdl" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Pejt" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Porovnvn" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Przdn msta" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "P&orovnvat" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Ignorovat &zmny" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignorovat &vechny" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorovat przdn &dky" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorovat &mal a velk psmena" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Povolit zjiovn pesunutch &blok" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Za&rovnat podobn dky" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Ignorovat asov rozdly men ne 3 sekundy" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Zpsob porovnn &soubor:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "Zastavit po prvnm &rozdlu" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtrovat kom&ente" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Zvraznit sy&ntaxi" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automaticky &optovn porovnvat" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Zachovat pvodn znaky na &koncch dk" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabeltory" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Velikost:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Vkldat &tabeltory" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Vkldat &mezery" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Obarvit rozdly v dku" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Zobrazit rozdly v &dku" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "Na rovni &znak" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "Na rovni &slov:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtrovn soubor" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Z&kouka" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "&Instalovat..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "&Nov..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "&Upravit..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "O&dstranit..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Uloit zmnn soubory?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Soubor na lev stran" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "Ulo&it zmny" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Zruit zmny" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Soubor na prav stran" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Ul&oit zmny" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Zr&uit zmny" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Zruit &ve" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Kdovn" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Vchoz kdovn" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Zvolte vchoz znakovou strnku, kter se pouije v ppad naten soubor, kter nejsou v kdovn Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2020,56 +2031,56 @@ msgstr "" "&Zjistit informaci o kdovn u tchto soubor: .html, .rc, .xml \n" "(vyaduje optovn sputn programu)" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "&Systmov kdovn" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "&Podle uivatelskho prosted WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "&Vlastn znakov strnka:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - podpora archivace vypnuta" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nelze zjistit verzi programu 7-Zip (nen nainstalovn?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Podpora archivace vyaduje, aby byl ve vaem potai nainstalovn program 7-Zip verze 3.11 nebo novj, anebo aby jeho zkladn sousti pro samostatn operace byly zkoprovny do adrese programu WinMerge." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "V tomto adresi tak mus bt pslun pluginy rozhran (Merge7z*.dll)." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Pouvejte prosm verze programu 7-Zip doporuen ne, dokud nebudou dostupn pluginy rozhran pro pozdj verze." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Verze" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2078,540 +2089,551 @@ msgstr "" "Vyadovan plugin\n" "(knihovna %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Doporuen verze programu 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "ptomn" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Program 7-Zip instalovan ve vaem potai:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nen" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "chyb" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Sousti 7-Zip pro samostatn operace:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "zastaral" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Cesty plugin:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Sthnout pluginy" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Monosti" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategorie" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "&Nast..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "&Uloit..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Klov slova:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nzvy funkc:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Komente:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "sla:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Opertory:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "etzce:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Uivatelsk 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Uivatelsk 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Tun" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Protokol o porovnn sloek" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "&Soubor protokolu:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Pr&ochzet..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "Uloit jako &typ:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Koprovat do schrnky" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Typ filtru" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Jak typ filtru chcete vytvoit?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Spolen filtr (pro vechny uivatele tohoto potae)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Vlastn filtr (pouze pro souasnho uivatele)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Podpora archivace" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Podpora archivace vyaduje nainstalovan pluginy 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Sthnout pluginy 7-Zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Zapnout podporu archivnch soubor" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Pout &samostatn program 7-Zip, pokud je dostupn" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Pout &mstn program 7-Zip z adrese WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "Zjistit &automaticky typ archivu" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Statistika porovnn" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Sloky:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Soubory:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Rozdln" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Textov:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binrn:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Jedinen" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Vlevo:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Vpravo:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Shodn" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Celkem:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Zavt" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Vliv" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(ovlivnno)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Zvolte kdovn pro" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Naten souboru:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Uloen souboru:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "Pout &stejnou znakovou strnku pro oba" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "P&out" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "Storno" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Zkouka filtru" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Zkouka filtru ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Vlote text ke zkouce:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nzev sloky" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Vsledek:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "Z&kusit" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Zavt" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "Po&ut vlastn barvy textu" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Vlastn barvy textu" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Okol textu:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "dn text:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Vbr:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Cesty" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Pouze pro &ten" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Pouze pro t&en" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "&Nast..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "&Uloit..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Zlohovn soubor" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Vytvet zlon soubory pro:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Umstn zlonch soubor:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Pvodn sloka soubor" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Jednotn zlon sloka:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nzev zlonho souboru:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "Pipojit pponu .&bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "Pipojit &asov raztko" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Potvrdit koprovn" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Opravdu chcete zkoprovat XXX poloek?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Zleva" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Doprava" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Ano" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Ne" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040504e2" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x405, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Pipraven" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2620,7 +2642,7 @@ msgstr "" "Vytvo nov dokumenty\n" "Nov dokumenty (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2629,7 +2651,7 @@ msgstr "" "Oteve existujc dokument\n" "Otevt (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2638,7 +2660,7 @@ msgstr "" "Zave aktivn dokument\n" "Zavt" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2647,7 +2669,7 @@ msgstr "" "Ulo aktivn dokument\n" "Uloit (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2656,7 +2678,7 @@ msgstr "" "Ulo aktivn dokument pod novm nzvem\n" "Uloit jako" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2665,7 +2687,7 @@ msgstr "" "Zmn monosti tisku\n" "Vzhled strnky" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2674,7 +2696,7 @@ msgstr "" "Zmn monosti tiskrny\n" "Nastaven tisku" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2683,7 +2705,7 @@ msgstr "" "Vytiskne aktivn dokument\n" "Tisk" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2692,12 +2714,12 @@ msgstr "" "Zobraz cel strnky\n" "Nhled tisku" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Znovu zviditeln vechny skryt poloky" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2706,32 +2728,32 @@ msgstr "" "Oteve projekt ze souboru\n" "Otevt projekt (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznm chyba pi pokusu o oteven souboru projektu" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznm chyba pi pokusu o uloen souboru projektu" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Projekt" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Soubor s projektem byl spn naten." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Soubor s projektem byl spn uloen." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2740,7 +2762,7 @@ msgstr "" "Ulo aktuln cesty a volby do souboru projektu\n" "Uloit projekt" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2749,7 +2771,7 @@ msgstr "" "Zobraz informace o programu, slo verze a copyright\n" "O aplikaci" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2758,27 +2780,27 @@ msgstr "" "Ukon aplikaci; dote se na uloen dokument\n" "Konec" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Oteve tento dokument" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2787,7 +2809,7 @@ msgstr "" "Pepne do dalho panelu v okn\n" "Dal panel" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2796,7 +2818,7 @@ msgstr "" "Pepne do pedchozho panelu v okn\n" "Pedchoz panel" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2805,7 +2827,7 @@ msgstr "" "Uspod okna tak, aby se pekrvala\n" "Na sebe" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2814,7 +2836,7 @@ msgstr "" "Uspod okna vodorovn tak, aby se nepekrvala\n" "Vedle sebe" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2823,7 +2845,7 @@ msgstr "" "Uspod okna svisle tak, aby se nepekrvala\n" "Vedle sebe" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2832,7 +2854,7 @@ msgstr "" "Zkopruje vbr a umst jej do schrnky\n" "Koprovat" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2841,7 +2863,7 @@ msgstr "" "Vyjme vbr a umst jej do schrnky\n" "Vyjmout" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2850,7 +2872,7 @@ msgstr "" "Najde zadan text\n" "Najt" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2859,7 +2881,7 @@ msgstr "" "Vlo obsah schrnky\n" "Vloit" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2868,7 +2890,7 @@ msgstr "" "Opakuje posledn akci\n" "Opakovat" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2877,7 +2899,7 @@ msgstr "" "Nahrad zadan text jinm textem\n" "Nahradit" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2886,7 +2908,7 @@ msgstr "" "Vybere cel dokument\n" "Vybrat ve" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2895,7 +2917,7 @@ msgstr "" "Vrt zpt posledn akci\n" "Zpt (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2904,7 +2926,7 @@ msgstr "" "Znovu provede pedtm vrcenou akci\n" "Znovu (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2913,7 +2935,7 @@ msgstr "" "Zobraz nebo skryje panel nstroj\n" "Panel nstroj" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2922,7 +2944,7 @@ msgstr "" "Zobraz nebo skryje stavov dek\n" "Stavov dek" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2931,62 +2953,62 @@ msgstr "" "Zobraz nebo skryje panel zloek\n" "Panel zloek" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Automaticky zmn velikost panel\n" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Mn velikost okna" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Mn umstn okna" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Zmen okno do ikony" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Zvt okno na maximln velikost" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Pepne do dalho okna" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Pepne do pedchozho okna" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zave aktivn okno a dote se na uloen zmn" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Obnov normln velikost okna" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Vyvolat seznam loh" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktivovat toto okno" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2995,183 +3017,183 @@ msgstr "" "Ukon reim nhledu tisku\n" "Zruit nhled" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Zachovat pvodn znaky na koncch dk" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Stisknte klvesu" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Stisknte prav tlatko myi k monostem zkoprovn cesty nebo nzvu souboru" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Peruit" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Zkusit znovu" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorovat" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "I&gnorovat ve" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Ano" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Ano &vem" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Ne v&em" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "Pok&raovat" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "Pe&skoit" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Pes&koit ve" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "T&uto zprvu ji pt nezobrazovat." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Na t&uto otzku se ji pt nedotazovat." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Zvraznn syntaxe" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Barvy textu" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Kontrola verz" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Zleva:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Doleva:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Zprava:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Doprava:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Verze %1 - esky" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Monosti (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Vechna okna se zprvami budou nyn opt zobrazovna." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "pravy pro aktuln porovnn soubor byly provedeny. K nkterm nastavenm nemus dojt, dokud nebude souasn porovnn soubor znovu provedeno." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Zmna zvolenho psma nebude pouita v dnm aktuln viditelnm okn porovnn." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3182,7 +3204,7 @@ msgstr "" "\n" "Pouijte prosm hodnoty mezi 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3193,127 +3215,129 @@ msgstr "" "\n" "Po zmn nastaven prosm znovu spuste aplikaci WinMerge." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Otevt" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Vechny soubory (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Vechny soubory (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projekty WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Soubory nastaven (*.ini)|*.ini|Vechny soubory (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textov soubory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vechny soubory (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Soubory HTML (*.htm,*.html)|*.htm;*.html|Vechny soubory (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Soubory XML (*.xml)|*.xml|Vechny soubory (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Pln obsah" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Rychl obsah" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Datum zmny" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Datum zmny a velikost" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Velikost" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nzev" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Umstn" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Zvolte nzev souboru pro nov filtr" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry (*.flt)|*.flt|Vechny soubory (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3326,7 +3350,7 @@ msgstr "" "Zkoprujte prosm soubor %1 do sloky s filtry pro aplikaci WinMerge:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3339,7 +3363,7 @@ msgstr "" "\n" "Ujistte se prosm, e sloka existuje a je mon do n zapisovat." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3350,7 +3374,7 @@ msgstr "" "\n" "Zvolte prosm sloku v dialogovm okn Monosti, v kategorii Systm." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3363,12 +3387,12 @@ msgstr "" "\n" "Mon je soubor oznaen pouze pro ten?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Vyhledat soubor s filtrem k instalaci" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3379,208 +3403,223 @@ msgstr "" "\n" "Nov soubor nelze zkoprovat do sloky filtr." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Soubor s filtrem ji existuje. Chcete nahradit stvajc filtr?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Regulrn vraz" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Cesta k programu cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Cesta k programu SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Vsledky porovnn sloek" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Porovnn soubor" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Bez nzvu vlevo" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Bez nzvu vpravo" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Prohledvan soubor..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Otevrn vbru" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Koprovn zleva doprava" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Koprovn zprava doleva" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Koprovn vech doleva" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Koprovn vech doprava" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Koprovn soubor..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Odstrann soubor..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Pesouvn soubor..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Vytven protokolu..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "dek: %s Sloupec: %d/%d Znak: %d/%d Konec dku: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "dek: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "dek: %s Sloupec: %d/%d Znak: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Slouit" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Rozdl %1 z %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "Nalezeno %1 rozdl" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "Nalezen 1 rozdl" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "Pro ten" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Poloka %1 z %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Poloek: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vyberte dv existujc sloky nebo soubory k porovnn" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Vybrat sloku" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dv sloky nebo dva soubory k porovnn" -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Lev cesta je chybn!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Prav cesta je chybn!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Ob cesty jsou chybn!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vyberte dva soubory k zpstupnn volby pevade" -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Nelze porovnat soubor a sloku!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Soubor nebyl nalezen: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Soubor nebyl peveden: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3593,42 +3632,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Uloit jako" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Uloit zmny do %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaen pouze pro ten. Chcete nahradit tento soubor? (Neukldat pod novm nzvem.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Chyba pi kontrole zapisovatelnosti do cle" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Chyba pi zlohovn souboru" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3641,7 +3680,7 @@ msgstr "" "\n" "Chcete pokraovat?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3658,7 +3697,7 @@ msgstr "" "\t- pout jin nzev souboru (stisknte OK)\n" "\t- peruit souasnou operaci (stisknte Storno)" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3673,7 +3712,7 @@ msgstr "" "\n" "Chcete uloit pevedenou verzi do jinho souboru?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3688,7 +3727,7 @@ msgstr "" "\n" "Chcete uloit pevedenou verzi do jinho souboru?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3703,7 +3742,7 @@ msgstr "" "\n" "Pepsat zmnn soubor?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3712,7 +3751,7 @@ msgstr "" "%1\n" "je oznaen pouze pro ten. Chcete nahradit tuto poloku?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3727,17 +3766,17 @@ msgstr "" "\n" "Pokud chcete soubory obnovit, zavete aktuln porovnn a natte soubory znovu." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Uloit lev soubor jako" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Uloit prav soubor jako" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3748,42 +3787,42 @@ msgstr "" "\n" "Ped dalm pokraovnm dokumenty obnovte." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3791,177 +3830,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "dn" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (ni ne 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vy)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Peruit v mezerch" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Peruit v mezerch nebo v interpunkci" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Zkopruje vybran poloky do uveden sloky" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Zkopruje vybran poloky do vlastn sloky" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Odstran vybran poloky vlevo" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Odstran vybran poloky vpravo" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Odstran vybran poloky na obou stranch" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Doasn skryje vybran poloky" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Pejmenuje vybran poloky na obou stranch" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "P&rav doleva (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "&Lev doprava (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "P&rav doleva (%1 z %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "&Lev doprava (%1 z %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "L&ev do... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Pr&av do... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "L&ev do... (%1 z %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Pr&av do... (%1 z %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "&Lev (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "P&rav (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "O&boje (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "&Lev (%1 z %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "P&rav (%1 z %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "O&boje (%1 z %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Zvolte clovou sloku" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Zvolte clovou sloku pro poloky z lev strany:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Zvolte clovou sloku pro poloky z prav strany:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(ovlivnno soubor: %1)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(ovlivnno soubor: %1 z %2)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3972,17 +4010,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Opravdu chcete zkoprovat:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Opravdu chcete zkoprovat %d poloek:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4001,458 +4039,473 @@ msgstr "" "\n" "Obnovte prosm porovnn." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Oteve poloku vlevo" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Oteve soubor vlevo v externm editoru" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Oteve soubor vlevo ve zvolen aplikaci" -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Oteve poloku vpravo" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Oteve soubor vpravo v externm editoru" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Oteve soubor vpravo ve zvolen aplikaci" -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nelze spustit extern editor: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Neznm rozen externho editoru: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Zkopruje nzvy poloek do schrnky" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Zkopruje cesty poloek vlevo do schrnky" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Zkopruje cesty poloek vpravo do schrnky" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Zkopruje cesty poloek na obou stranch do schrnky" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Neznm formt archivu" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Pid poloky z lev strany do archivu" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Pid poloky z prav strany do archivu" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Pid poloky z obou stran do archivu" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Pid rozdln poloky do archivu (z obou stran)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Pesune vybran poloky z lev strany do vlastn sloky" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Pesune vybran poloky z prav strany do vlastn sloky" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nzev souboru" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Sloka" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Vsledek porovnn" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Datum vlevo" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Datum vpravo" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Ppona" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Velikost vlevo" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Velikost vpravo" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Velikost vpravo (krtce)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Velikost vlevo (krtce)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Datum vytvoen vlevo" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Datum vytvoen vpravo" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Novj soubor" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Verze souboru vlevo" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Verze souboru vpravo" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Strun vsledek" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atributy vlevo" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atributy vpravo" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Konce dk vlevo" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Konce dk vpravo" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Kdovn vlevo" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Kdovn vpravo" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Ignor. rozdl" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Rozdl" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binrn" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Soubory nelze porovnat" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Perueno" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Soubor peskoen" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Sloka peskoena" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Pouze vlevo: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Pouze vpravo: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binrn soubory jsou shodn" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binrn soubory jsou rozdln" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Soubory jsou rozdln" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Pouze vlevo" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Pouze vpravo" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynul as: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "Vybrna 1 poloka" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "Vybrno %1 poloek" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nzev souboru nebo sloky" -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nzev podsloky, pokud jsou porovnvny i soubory v podslokch" -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Vsledek porovnn, dlouh popis" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Datum zmny souboru na lev stran" -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Datum zmny souboru na prav stran" -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Ppona souboru" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Velikost souboru na lev stran v bytech" -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Velikost souboru na prav stran v bytech" -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Velikost souboru na lev stran zkrcen" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Velikost souboru na prav stran zkrcen" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Datum vytvoen souboru na lev stran" -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Datum vytvoen souboru na prav stran" -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Uke, na kter stran je novj datum zmny" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verze souboru na lev stran, pouze pro nkter typy soubor" -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verze souboru na prav stran, pouze pro nkter typy soubor" -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Strun vsledek porovnn" -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atributy souboru na lev stran" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atributy souboru na prav stran" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Typ konce dk v souboru na lev stran" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Typ konce dk v souboru na prav stran" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Kdovn souboru na lev stran" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Kdovn souboru na prav stran" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Poet ignorovanch rozdl v souboru. Tyto rozdly nelze slouit." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Poet rozdl v souboru. Neobsahuje ignorovan rozdly." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Uke hvzdiku (*), pokud je soubor binrn" -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Porovnn %1 s %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Seznam oddlen rkami" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Seznam oddlen tabeltory" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Soubor HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Soubor XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Soubor protokolu ji existuje. Chcete ho pepsat?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4461,32 +4514,32 @@ msgstr "" "Chyba pi vytven protokolu:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Protokol byl spn vytvoen." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "V obou panelech je oteven stejn soubor." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Vybran soubory jsou shodn." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Bhem porovnn soubor se vyskytla chyba." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nelze vytvoit doasn soubory. Zkontrolujte nastaven cesty k doasnm souborm." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4501,32 +4554,32 @@ msgstr "" "\n" "Poznmka: Pokud chcete vdy sjednocovat konce dk, nastavte monost 'Ignorovat rozdly v koncch dk' v nastaven Porovnvn v Monostech dostupnch z nabdky pravy." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, 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:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Zvolen sloka je chybn." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Binrn soubor nelze otevt pro pravy." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 "Sloka existuje pouze na jedn stran a nelze ji otevt.\n\nChcete vytvoit odpovdajc sloku na druh stran a otevt ji?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4537,132 +4590,132 @@ msgstr "" "Zobrazen kadho souboru v jeho znakov strnce poskytne lep nhled, ale sluovn nebo koprovn bude nebezpen.\n" "Chcete kdovn u obou soubor upravit na vchoz znakovou strnku Windows (doporueno)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Upozornn: Soubory pouvaj rozdln kdovn, lev=%s a prav=%s, a sluovn me vst ke ztrt informac." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Dolo ke ztrt informac zpsoben chybami kdovn u obou soubor." -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Dolo ke ztrt informac zpsoben chybami kdovn u pravho souboru." -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Dolo ke ztrt informac zpsoben chybami kdovn u levho souboru." -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "dn rozdl" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Rozdl v dku" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahrazeno %1 etzc." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nelze najt etzec \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Zkopruje celou cestu k souboru do schrnky" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Zkopruje nzev souboru do schrnky" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Poloha" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Rozdly" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Opravn soubor byl spn vytvoen." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. poloka nebyla nalezena nebo je to sloka!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. poloka nebyla nalezena nebo je to sloka!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Opravn soubor ji existuje. Chcete ho pepsat?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[vybrno %1 soubor]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Nelze zapisovat do souboru %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Zadan cesta pro vstup nen cesta k souboru: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Zadejte vstupn soubor" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nelze vytvoit opravn soubor z binrnch soubor." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nelze vytvoit opravn soubor ze sloek." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4673,17 +4726,17 @@ msgstr "" "\n" "Vytvoen opravnho souboru vyaduje, aby v souborech nebyly dn neuloen zmny." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Sloka neexistuje." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Aktuln vsledek porovnn sloek bude vymazn." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4695,7 +4748,7 @@ msgstr "" "Nelze nalzt vechny potebn sousti (7-Zip anebo Merge7z*.dll).\n" "Podvejte se do uivatelsk pruky, kde najdete dal informace o podpoe archivace a jak ji zpstupnit." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4704,7 +4757,7 @@ msgstr "" "\n" "Poznmka: Integrace 7-Zip je vypnut v nastaven WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4713,37 +4766,37 @@ msgstr "" "\n" "Poznmka: Integrace 7-Zip je omezen na samostatn operace v nastaven WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Uloit nastaven" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Nast nastaven" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Nastaven bylo nateno ze souboru." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Nastaven bylo uloeno do souboru." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Naten nastaven ze souboru se nezdailo." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Uloen nastaven do souboru se nezdailo." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4754,473 +4807,493 @@ msgstr "" "\n" "Chcete pokraovat?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Chyba v regulrnm vrazu" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Nic neodpovd" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Chybn regulrn vraz" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Chybn porovnvac znak" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Chybn znak v nzvu tdy" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Zptn lomtko na konci" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Chybn zptn odkaz" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Nesprovan [ nebo [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Nesprovan ( nebo \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Nesprovan \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Chybn obsah \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Chybn ukonen rozsahu" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Nedostatek pamti" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Chybn pedchzejc regulrn vraz" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Pedasn ukonen regulrnho vrazu" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Regulrn vraz je pli dlouh" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Nesprovan ) nebo \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Rzn" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " kB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Ulo lev soubor" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Ulo prav soubor" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Ulo lev soubor pod nzvem..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Ulo prav soubor pod nzvem..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Zmn soubor/sloku vlevo do stavu pouze pro ten" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Zmn soubor/sloku vpravo do stavu pouze pro ten" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Pepn mezi reimem prav a reimem sluovn" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5229,12 +5302,12 @@ msgstr "" "Uke a pizpsob vlastnosti kdovn souboru\n" "Vlastnosti kdovn souboru" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5243,7 +5316,7 @@ msgstr "" "Vybere oblast rozdl v aktulnm dku\n" "Rozdl v aktulnm dku" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5252,7 +5325,7 @@ msgstr "" "Pejde na dan dek nebo na dan rozdl\n" "Pejt na (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5261,7 +5334,7 @@ msgstr "" "Umon zmnit nastaven aplikace\n" "Monosti" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5270,37 +5343,37 @@ msgstr "" "Obnov zobrazen\n" "Obnovit (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Zkopruje vybran dky do schrnky a pid jim na zatek jejich sla dk" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Obnov vybran poloky" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Zalo nebo zru zloku" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Pejde na dal zloku" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Pejde na pedchoz zloku" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Zru vechny zloky" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5309,7 +5382,7 @@ msgstr "" "Zobraz poloky, kter se pesn shoduj\n" "Ukzat shodn poloky" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5318,7 +5391,7 @@ msgstr "" "Zobraz poloky, ve kterch jsou rozdly\n" "Ukzat rozdln poloky" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5327,7 +5400,7 @@ msgstr "" "Zobraz poloky, kter existuj pouze na lev stran\n" "Ukzat lev jedinen poloky" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5336,7 +5409,7 @@ msgstr "" "Zobraz poloky, kter existuj pouze na prav stran\n" "Ukzat prav jedinen poloky" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5345,7 +5418,7 @@ msgstr "" "Zobraz binrn soubory\n" "Ukzat binrn soubory" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5354,7 +5427,7 @@ msgstr "" "Zobraz peskoen poloky\n" "Ukzat peskoen poloky" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5363,7 +5436,7 @@ msgstr "" "Vybere psmo pro zobrazen\n" "Vybrat psmo" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5372,42 +5445,42 @@ msgstr "" "Vrt vchoz psmo systmu pro zobrazen\n" "Vchoz psmo" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Uke netisknuteln znaky" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Zobraz nebo skryje rozdlov panel" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Polohov panel ukazuje celkov obraz porovnvanch soubor" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zobraz statistiku porovnn sloek" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamn umstn panel s porovnnm soubor" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5416,7 +5489,7 @@ msgstr "" "Zobraz nebo skryje sla dk\n" "Zobrazit sla dk" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5425,7 +5498,7 @@ msgstr "" "Pepn zalamovn dk\n" "Zalamovat dky" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5434,47 +5507,47 @@ msgstr "" "Zobraz nebo skryje u obou panel lev okraje pro vbr\n" "Okraje pro vbr" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Zvt velikost psma" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Zmen velikost psma" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Vrt psmo na pvodn velikost" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5483,7 +5556,7 @@ msgstr "" "Zkopruje vybran rozdl do souboru vpravo\n" "Koprovat doprava (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5492,7 +5565,7 @@ msgstr "" "Zkopruje vybran rozdl do souboru vlevo\n" "Koprovat doleva (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5501,7 +5574,7 @@ msgstr "" "Zkopruje vybran rozdl do souboru vpravo a pokrauje na dal rozdl\n" "Koprovat doprava a pokraovat (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5510,7 +5583,7 @@ msgstr "" "Zkopruje vybran rozdl do souboru vlevo a pokrauje na dal rozdl\n" "Koprovat doleva a pokraovat (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5519,7 +5592,7 @@ msgstr "" "Zkopruje vechny rozdly do souboru vpravo\n" "Ve doprava" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5528,367 +5601,377 @@ msgstr "" "Zkopruje vechny rozdly do souboru vlevo\n" "Ve doleva" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Odstran vybran poloky z obou sloek" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porovn vybranou poloku (pokud je vybrno vce poloek, porovn prvn)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Zvolit a peskupit sloupce v okn porovnn sloek" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Vytvo opravn soubor" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Vybrat a upravit filtry" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Vytvo protokol o vsledku porovnn sloek" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Uivatel sm vybere pevad (neplat pi porovnn sloek)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Pizpsoben pevad bude pouit pro oba soubory (podle ppony jednoho ze soubor)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Zvol pevad pro pravy tohoto souboru" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Navren pluginy" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Ostatn pluginy" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Uvoln vechny pluginy a znovu je nate (pro vvoje)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Zave vechna oteven okna" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "Oteve npovdu pro aplikaci WinMerge\nNpovda aplikace WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Vytvo textov soubor obsahujc informace o aktuln verzi aplikace WinMerge a o mstn konfiguraci" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Zobraz Obecnou veejnou licenci GNU" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Oteve dokument s poznmkami k aktuln verzi aplikace WinMerge\nPoznmky k vydn" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "Oteve internetovou strnku s informacemi o jazykovch pekladech\nPeklady" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Nastaven plugin" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Program Windows Script Host nebyl nalezen - skripty .sct jsou vypnut" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Oteve soubor v pidruen aplikaci" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Oteve soubor v externm editoru" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Oteve soubor v pslunm programu" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Potla zobrazen pesunutch blok" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Zobraz vechny pesunut bloky" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Zobraz pesunut bloky tkajc se pouze aktulnho vbru" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Pejde na dek nebo rozdl pod ukazatelem" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "&Pejt na rozdl %1 z %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "&Pejt na dek %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Vypnuto" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Systm soubor" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Naposledy pouit" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Skryje panel nstroj" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Zobraz mal panel nstroj" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Zobraz velk panel nstroj" diff --git a/Src/Languages/Danish.po b/Src/Languages/Danish.po index 15d3da77e26..2f9a99f072e 100644 --- a/Src/Languages/Danish.po +++ b/Src/Languages/Danish.po @@ -71,7 +71,7 @@ msgstr "&Klip" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "Ko&pier" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&Indst" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "G &til..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "b&en" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "med det ®istrerede program" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "med en &ekstern editor" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&med..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Filer" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&ben...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "ben pro&jekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Gem &projekt..." @@ -160,2451 +162,2471 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Afslut" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Rediger" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "I&ndstillinger..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Vis" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Vlg &skrifttype..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Brug standard s&krifttype" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "S&prog..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "Vrk&tjer" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Generer en Patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Manuel Udpakning" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Udpakning" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "R&ediger med Udpakker" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Genindls plugins" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Vind&ue" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Luk" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Luk &alle" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Skift panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Kaskade" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Hjlp" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Understttelse for arkivering er afbrudt..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "V&enstre skrivebeskyttet" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "&Hjre skrivebeskyttet" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Fil En&coding" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vlg &alt\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Vis &identiske" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Vis &forskellige" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Vis &venstre unikke" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Vis &hjre unikke" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Vis &oversprungne" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Vis &binre filer" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "V&is skjulte" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Sammen&ligningsstatistikker" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Opdater\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Flet" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Sammen&lign\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nste forskel\tAlt+Ned" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskel\tAlt+Op" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&rste forskel\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuelle forskel\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sidste forskel\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &hjre\tAlt+Hjre" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "Sl&et\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Tilpas sjler..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Generer en &raport..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Gem\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Gem &venstre" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Gem" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Gem &som..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Gem &hjre" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Konverter linjeendelserne til" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Flette modus\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Fortryd\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gendan\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klip\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Indst\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Vlg &linjeforskel\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&g...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstat...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Tom >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avanceret" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenumre\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Bogmrker" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Toggle bogmrke\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nste bogmrke\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Forrige bogmrke\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Slet alle bogmrker" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&G til...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Vis &mellemrum" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "H&orisontalt panel" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "V&ertikalt panel" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopier til h&jre og g til nste\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopier til v&enstre og g til nste\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Kopier alt &til hjre" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Kopier alt til venst&re" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Venstre til hjre" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "V&enstre til..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Hjre til venstre" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "H&jre til..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Flyt" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Venstre til..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Hjre til..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Slet" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Hjre" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&ben venstre" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "&ben hjre" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "K&opier stinavne" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Venstre (%1 af %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Hjre (%1 af %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Begge (%1 af %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Ko&pier filnavne" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Venstre... (%1 af %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Hjre... (%1 af %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Begge... (%1 af %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Forskellene... (%1 af %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Kopier det fulde stinavn" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Prediffer indstillinger" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Ingen prediffer" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "&Automatisk prediffer" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "G til &forskel" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokke" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokke" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttede blokke for &denne forskel" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Alle rettigheder forbeholdes" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besg WinMerge hjemmesiden!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Vlg filer eller mapper..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Gennemse..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Hjre:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "G&ennemse..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "V&lg..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "V&lg..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Afbryd" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper der skal sammenlignes" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Gem som..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Versionsstyringssystem" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyringssystem" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatisk &scroll til frste forskel" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Fjern Splash Screen" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&uk vinduer med ESC tasten" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Verificer automatisk stinavnene i ben dialogen" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Allow only one instance to run" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Nulstil" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Sprog" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Tilgngelige sprog:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Sg" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "F&ind hvad:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Sammenlign &hele ordet" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Sammenlign store/sm &bogstaver" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "Regulrt &udtryk" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Retning" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Op" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Ned" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Find nste" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Erstat" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Ers&tat med:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Begynd ikke forfra efter enden af filen" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Erstat i" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Valgte" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Erstat" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Erstat &alt" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Linjefiltre" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulre udtryk (et pr linje):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Farver" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Forskelle:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Valgte forskelle:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Baggrund" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Ignoreret forskel:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til skraldespanden" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Tilfj til explorer context menu" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver den avancerede menu" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Ekstern editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "G&ennemse..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Byt" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Tilfj til eksisterende fil" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "Res&ultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Sti&l:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Sammenhng:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Mellemrum" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "S&ammenlign" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "&Ignorer ndringer" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ign&orer alle" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Igno&rer blanke linjer" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Sammenlign store/sm& bogstaver" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inkluder &kommandolinjen" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "ben i ekstern e&ditor" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Vis sjler" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Vlg udpakker" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Fil udpakker:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis all udpakkerer, tjek ikke extension" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "G til" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "G& til:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "G til hvad" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Forskel" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&G til" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Mellemrum" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Sammenlign" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorer ndringer" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnorer alle" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorer store/sm &bogstaver" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver detektion af flyttede blokke" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Fil sammenligningsmetode:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Fremhv syntaksen" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &opdatering" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar originale EOL tegn" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tabulator strrelse:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Indst tabulatorer" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Indst &mellemrum" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filfiltre" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Gem ndrede filer?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Fil p venstre side" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Gem ndringer" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Fjern ndringer" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Fil p hjre side" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "G&em ndringer" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "F&jern ndringer" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Samme som WinMerge brugerflade" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Udvalgt codepage :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Forskellige" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Afbryd" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x406, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2613,7 +2635,7 @@ msgstr "" "Opret tomme dokumenter\n" "Nye dokumenter (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2622,7 +2644,7 @@ msgstr "" "ben et eksisterende dokument\n" "ben (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2631,7 +2653,7 @@ msgstr "" "Luk det aktive dokument\n" "Luk" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" "Gem det aktive dokument\n" "Gem (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2649,7 +2671,7 @@ msgstr "" "Gem det aktive dokument med et nyt navn\n" "Gem som" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2658,7 +2680,7 @@ msgstr "" "ndrer p printerens indstillinger\n" "Sideopstning" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" "ndrer printer og printerens indstillinger\n" "Printer setup" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2676,7 +2698,7 @@ msgstr "" "Print det aktive dokument\n" "Print" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2685,51 +2707,51 @@ msgstr "" "Vis de fulde sider\n" "Printer preview" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2738,7 +2760,7 @@ msgstr "" "Vis program information, versionsnummer og ophavsret\n" "Om" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2747,27 +2769,27 @@ msgstr "" "Afslut programmet; sprger om man vil gemme dokumenter\n" "Afslut" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "ben dette dokument" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2776,7 +2798,7 @@ msgstr "" "Skift til det nste vindue\n" "Nste vindue" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2785,7 +2807,7 @@ msgstr "" "Skift til det tidligere vindue\n" "Tidligere vindue" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2794,7 +2816,7 @@ msgstr "" "Arranger vinduerne s de overlapper\n" "Kaskade vinduer" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2803,7 +2825,7 @@ msgstr "" "Arranger vinduerne som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2812,7 +2834,7 @@ msgstr "" "Arranger vinduerne som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2821,7 +2843,7 @@ msgstr "" "Kopier det valgte og st det i udklipsholderen\n" "Kopier" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2830,7 +2852,7 @@ msgstr "" "Klip det valgte ud og st det i udklipsholderen\n" "Klip" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2839,7 +2861,7 @@ msgstr "" "Find den angivne tekst\n" "Find" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2848,7 +2870,7 @@ msgstr "" "Indst udklipsholderens indhold\n" "Indst" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2857,7 +2879,7 @@ msgstr "" "Gentag den sidste handling\n" "Gentag" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2866,7 +2888,7 @@ msgstr "" "Erstat den angivne tekst med en anden tekst\n" "Erstat" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2875,7 +2897,7 @@ msgstr "" "Vlg hele dokumentet\n" "Vlg alt" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2884,7 +2906,7 @@ msgstr "" "Fortryd den sidste handling\n" "Fortryd" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2893,7 +2915,7 @@ msgstr "" "Gendan den tidligere fortrudte handling\n" "Gendan fortrudt" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2902,7 +2924,7 @@ msgstr "" "Vis eller gem vrktjslinjen\n" "Vis vrktjslinjen" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2911,69 +2933,69 @@ msgstr "" "Vis eller gem statuslinjen\n" "Vis statuslinjen" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "ndre vinduesstrrelse" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "ndre vinduesposition" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Minimer vindue til en icon" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Maximer vindue til fuld strrelse" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Skift til det nste dokument vindue" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Skift til det tidligere dokument vindue" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Luk det aktive vindue og sprg efter om dokumenter skal gemmes" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Gendan vindue i normal strrelse" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Liste med aktive vinduer" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktiver dette vindue" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2982,183 +3004,183 @@ msgstr "" "Luk print preview\n" "Afbryd preview" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Bevar originale EOL tegn" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Tryk p en tilfldig tast" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Hjreklik p stien for at kopiere" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Fortryd" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Prv igen" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "I&gnorer alle" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Ja til &alle" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nej til a&lle" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Fortst" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Spring over" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Spring over all&e" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Vis ikke denne &besked igen." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Stil ikke dette sp&rgsml igen." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Indstillinger (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskeder vises nu igen." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Der er lavet ndringer i nogle indstillinger, der kan have indflydelse p allerede bne vinduer. Nogle af disse indstillinger virker muligvis ikke fr vinduerne er genbnet." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Den valgte ndring af skrifttype vil ikke kunne ses i allerede bne vinduer." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3166,7 +3188,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3174,127 +3196,129 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "ben" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "ndringsdato" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Sti" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3303,7 +3327,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3312,7 +3336,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3320,7 +3344,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3329,12 +3353,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3342,208 +3366,223 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Sti til cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Sti til SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultat af sammenligning af mapper" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Ikke navngivet venstre" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Ikke navngivet hjre" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Skanner filer..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "bner valgte" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopierer venstre til hjre" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopierer hjre til venstre" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopierer alt til venstre" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopierer alt til hjre" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopierer filer..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Sletter filer..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Flytter filer..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Flet" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Forskel %1 af %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 forskelle fundet" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 forskel fundet" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vlg to eksisterende mapper eller filer at sammenligne" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Valgt mappe" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Vlg to mapper eller to filer at sammenligne." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Ventre sti er ugyldig!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Hjre sti er ugyldig!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldige!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vlg to filer for at aktivere udvlgelse af udpakker." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne en fil og en mappe!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Fil ikke fundet: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke udpakket: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3556,42 +3595,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Gem som" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Gem ndringer til %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 er markeret som skrivebeskyttet. Vil du ignorerer skrivebeskyttelsen? (Nej for at gemme til et andet filnavn.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Fejl ender tjek af skrivebeskyttelsen p destinationen" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Fejl under backup af filen" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3600,7 +3639,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3611,7 +3650,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3626,7 +3665,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3641,7 +3680,7 @@ msgstr "" "\n" "Vil du gemme den udpakkede version under et andet filnavn?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3656,7 +3695,7 @@ msgstr "" "\n" "Vil du overskrive den ndrede fil?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3665,7 +3704,7 @@ msgstr "" "%1\n" "er markeret som skrivebeskyttet. Vil du overskrive den skrivebeskyttede fil alligevel?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3680,17 +3719,17 @@ msgstr "" "\n" "Hvis du vil opdatere dine filer skal du lukke de nuvrende filer og genindlse dem." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Gem venstre fil som" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Gem hjre fil som" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3698,42 +3737,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du skal angive en SourceSafe projekt sti for at fortstte (ie: $/MitProjekt)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout filer fra VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versionsstyringssystemet returnerede en fejl under forsget p at checke filen ud. Kan ikke fortstte..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Fejl under udfrelse af versionsstyringssystem kommando." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Arbejdsmappen for VSS og mappen for den aktuelle fil er ikke ens. Vil du fortstte?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) fundet!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Fejl fra VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3741,177 +3780,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Slet det valgte element til venstre" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Slet det valgte element til hjre" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Slet de valgte element(er) p begge sider" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Hjre til venstre (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til hjre (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Hjre til venstre (%1 af %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til hjre (%1 af %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Hjre til... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 af %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Hjre til... (%1 af %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Hjre (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 af %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Hjre (%1 af %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 af %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Vlg en destinationsmappe" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3922,17 +3960,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -3944,490 +3982,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "ben venstre fil" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "ben venstre fil i ekstern editor" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "ben venstre fil med ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "ben hjre fil" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "ben hjre fil i ekstern editor" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "ben hjre fil med ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopier filnavn til clipboard" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopier venstre sides mappenavne til clipboard" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopier hjre sides mappenavne til clipboard" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopier begge siders mappenavne til clipboard" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Ukendt arkivformat" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Tilfj elementer fra venstre side til arkiv" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Tilfj elementer fra hjre side til arkiv" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Tilfj elementer fra begge sider til arkiv" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Tilfj elementer der er forskellige til arkiv (fra begge sider)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flyt den valgte fil p venstre side til udvalgt mappe" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flyt den valgte fil p hjre side til udvalgt mappe" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultat af sammenligning" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Hjre dato" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Venstre strrelse" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Hjre strrelse" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Venstre oprettelsesdato" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Hjre oprettelsesdato" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Nyeste fil" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Venstre filversion" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Hjre filversion" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Hjre attributter" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Venstre Encoding" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Hjre Encoding" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binr" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Fil sprunget over" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Mappe sprunget over" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binre filer er identiske" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binre filer er forskellige" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Filer er forskellige" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Kun venstre" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Kun hjre" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tid forlbet: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Filnavn eller mappenavn." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn nr undermapper er inkluderet." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultat af sammenligning, lang form." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Venstre side ndringsdato." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Hjre side ndringsdato." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Filens extension." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstrrelse i bytes." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Hjre filstrrelse i bytes." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Venstre side oprettelsesdato." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Hjre side oprettelsesdato." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Fortller hvilken side har den nyeste ndringsdato." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversion, kun for nogle filtyper." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Hjre side filversion, kun for nogle filtyper." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Kort resultat af sammenligning." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Hjre side attributter." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Venstre side encoding." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Hjre side encoding." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Vis stjerne (*) hvis fil er binr." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Sammenlign %1 med %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Den samme fil er bnet p begge sider." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "De valgte filer er identiske." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Der skete en fejl under sammenligning af filerne." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Midlertidige filer kunne ikke oprettes. Tjek dine indstillinger for midlertidig (temp) mappe." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4437,32 +4490,32 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Der skete en fejl under prediffing af filen '%1' med plugin '%2'. Denne prediffing er ikke brugt mere." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4473,132 +4526,132 @@ msgstr "" "Visning af hver fil i sin egen codepage vil give et bedre visuelt resultat men fletning/kopiering vil vre farligt.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Ingen forskel" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Linje forskel" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(e)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finde strengen \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopier det fulde mappenavn" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopier filnavn" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Patch fil oprettet med succes." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element er ikke fundet eller er en mappe!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element er ikke fundet eller er en mappe!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Denne patch fil eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke lave patch filer fra binre filer." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke lave patch filer fra mapper." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4606,17 +4659,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Nuvrende resultat af sammenligning af mapper vil blive nulstillet." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4627,51 +4680,51 @@ msgstr "" "Alle komponenter (7-zip og/eller Merge7z*.dll) der er ndvendige til arkiv support kan ikke findes.\n" "Se manualen for mere information om arkiv support og hvordan man aktivere det." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4679,492 +4732,512 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Fejl ved regulrt udtryk" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Ingen match" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Ugyldigt regulrt udtryk" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Regulrt udtryk er for stort" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Gem den venstre fil" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Gem den hjre fil" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Gem den venstre fil med navnet..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Gem den hjre fil med navnet..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "ndre venstre fil/mappe status for skrivebeskyttelse" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "ndre hjre fil/mappe status for skrivebeskyttelse" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Skift mellem rediger og flette tilstande" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5173,7 +5246,7 @@ msgstr "" "G til linje eller forskel\n" "G til (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5182,7 +5255,7 @@ msgstr "" "St program indstillinger\n" "Indstillinger" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5191,189 +5264,189 @@ msgstr "" "Opdater display\n" "Opdater (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" "Select View Font" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" "Default Font" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Viser et tegn for mellemrum" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Vis eller gem horisontalt panel" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Vis eller gem vertikalt panel" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5382,7 +5455,7 @@ msgstr "" "Kopier den valgte tekst til den hjre fil\n" "Kopier hjre (Alt Hjre)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5391,7 +5464,7 @@ msgstr "" "Kopier den valgte tekst til den venstre fil\n" "Kopier venstre (Alt Venstre)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5400,7 +5473,7 @@ msgstr "" "Kopier forskel til hjre side og g til nste forskel\n" "Kopier til hjre og g til nste (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5409,7 +5482,7 @@ msgstr "" "Kopier forskel til venstre side og g til nste forskel\n" "Kopier til venstre og g til nste (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5418,7 +5491,7 @@ msgstr "" "Kopier alle forskelle til den hjre fil\n" "Alt til hjre" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5427,367 +5500,377 @@ msgstr "" "Kopier alle forskelle til den venstre fil\n" "Alt til venstre" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vlg og gen-sorter sammenligning af mapper" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Lav en patch-fil" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Vlge og ndrer filtre" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Brugeren vlger udpakkeren (ingen udpakning under sammenligning af mapper)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Udpakkeren bruges p begge filer (kun den ene fil behves en korrekt extension)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Vlg en udpakker til at redigere denne fil" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Anbefalede plugins" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Andre plugins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Fjern alle plugins og genindls dem (for udviklere)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Skriver den nuvrende WinMerge versionsinformation og konfiguration til en tekst fil" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Plugin indstillinger" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediff hvis muligt" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke fundet - .sct scripts afbrudt" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Vis ikke flyttede blokke" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Vis kun flyttede blokke fra den nuvrende forskel" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "G til forskel under cursor" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G& til forskel %1 af %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "G& til linje %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Dutch.po b/Src/Languages/Dutch.po index 901eb8a8a70..0b9e77e3d68 100644 --- a/Src/Languages/Dutch.po +++ b/Src/Languages/Dutch.po @@ -72,7 +72,7 @@ msgstr "&Knippen" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "Ko&piren" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "Pl&akken" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Ga naar..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "met ge®istreerde applicatie" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "met &externe editor" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&met..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Bestand" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Openen...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Afsluiten" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "Be&werken" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Eigenschappen..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "B&eeld" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Kies &Font..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Gebruik standaard F&ont" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&Status Balk" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Taal..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plug-ins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Hand&matig uitpakken" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch uitpakken" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "B&ewerken met uitpakker" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "Plug-ins he&rladen" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Venster" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "Sluiten" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Venster wijzigen\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "&Horizontaal verdelen" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "&Vertikaal verdelen" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Trapsgewijs" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "A&rchiefondersteuning uitgeschakeld..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "I&nfo..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Links all&een lezen" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Re&chts alleen lezen" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Alles selecteren\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Verver&sen\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Volgende verschil\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Vor&ige verschil\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Eerste verschil\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Huidig verschil\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Laatste Verschil\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopieer naar &Rechts\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopieer naar &Links\tAlt+left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Kolommen aanpassen..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "Op&slaan\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "&Links opslaan" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "Op&slaan" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Opslaan &als..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "&Rechts opslaan" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Sa&menvoegmodus\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Ongedaan maken\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "He&rhalen\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Knippen\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&piren\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "Pl&akken\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Z&oeken...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Vervan&gen...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Leeg >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Wit&ruimte tonen" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Location &Pane" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Naar rechts k&opiren en verder gaan\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Naar links ko&piren en verder gaan\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Alles naar rechts kopiren" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Alles naar links kopiren" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "Van &links naar rechts" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "Van l&inks naar..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "Van &rechts naar links" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "Van r&echts naar..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Verplaatsen" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "Van &links naar..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "Van &rechts naar..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "Ver&wijderen" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Links &openen" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Rechts o&penen" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Padnamen ko&piren" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Links (%1 van %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Rechts (%1 van %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Beide (%1 van %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "&Bestandsnamen kopiren" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Comprimeren" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Links... (%1 van %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Rechts... (%1 van %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Beide... (%1 van %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Verschillen... (%1 van %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Volledig pad kopiren" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "&Bestandsnaam kopiren" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Instellingen voorvergelijking verschillen" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Geen voorvergelijking" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Automatische voorvergelijking" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "G&a naar verschil" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "Gee&n verplaatste blokken" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Alle verplaatste blokken" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verplaatste blokken voor huidige vers&chillen" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Alle rechten voorbehouden." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Bezoek deWinMerge HomePage!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Bestanden of mappen selecteren" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Zoeken" -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Zoe&ken" -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Selecteren..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Uitpakker:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Selecteren..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "Ook &in submappen" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Annuleren" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Bestanden of mappen om te vergelijken" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Gebruiker:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Wachtwoord:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Link naar VSS doelproject" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Op alle items toepassen" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Check-out" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Opslaan als..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Versiebeheersysteem" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Versiebeheersysteem:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pad naar cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Algemeen" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Automatisch naar eerste verschil gaan" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Splash Screen uitscha&kelen" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Vensters met ESC sl&uiten" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Paden automatisch controleren in het venster Openen" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Allow only one instance to run" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Herstellen" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Taalkeuze" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Beschikbare talen" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Zoeken" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "Zoeke&n naar:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Alleen hele &woorden" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Hoofdle&ttergevoelig" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "Reguliere &expressies" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Richting" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Omhoog" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "O&mlaag" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Volgende" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Vervangen" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Ver&vangen door:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "Bij einde bestan&d stoppen" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Vervangen in" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Selectie" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "&Hele bestand" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "Ve&rvangen" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "&Alles vervangen" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Check-out" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Opmerkingen" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Regelfilters" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguliere Expressies (n per regel):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Kleuren" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Verschil:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Geselecteerd verschil:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Achtergrond" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Verwijderd" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Genegeerd verschil:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Verplaatst:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Geselecteerd verplaatst verschil:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Standaard" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialoog" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Systeem" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Verwijderde bestanden naar de Prullenbak verplaat&sen" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Toevoegen &aan contextmenu van verkenner" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Geavanceerd me&nu inschakelen" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Externe editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Bl&aderen..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Patch generator" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Bestand&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Bestand&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Wisselen" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "Toevoegen &aan bestaand bestand" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultaat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formaat" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&ijl:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Witr&uimte" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Ver&gelijken" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Wij&zigingen negeren" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Alle&s negeren" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Lege regels o&verslaan" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Hoo&fdlettergevoelig" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inclusief opdrac&htregel" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Openen in e&xterne editor" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Kolommen weergeven" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Uitpakker kiezen" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Bestandsuitpakker:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Alle uitpakkers tonen zonder extensie te controleren" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lijst extensies:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Beschrijving:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stoppen" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ga naar" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "G&a naar:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Bestand" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Ga naar" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Re&gel" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Verschil" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Ga naar" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Vergelijken" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Witruimte" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Vergelijken" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Wijzigingen negeren" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Alles ne&geren" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Lege regels negeren" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "N&iet hoofdlettergevoelig" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Detectie verplaatste blokken i&nschakelen" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Met&hode bestandsvergelijking:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Accentueer syntax" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Automatisch opnieuw scannen" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Be&waar originele regeleindes" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabinstellingen" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tabgrootte:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Tabs &invoegen" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&Spaties invoegen" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Bestandsfilters" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Bewerken..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Gewijzigde bestanden opslaan?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Linker bestand" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "Wijzigingen op&slaan" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "Wijzigingen ne&geren" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Rechter bestand" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Wijzigingen opsl&aan" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Wijzigingen nege&ren" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Tekenset" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,596 +2029,607 @@ msgstr "" "Tekenset detecteren voor deze bestanden: .html, .rc \n" "herstarten sessie noodzakelijk" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Tekenset van systeem" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Volgens WinMerge gebruikersinterface" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Aangepaste tekenset:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Verschillend" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identiek" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "Annuleren" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041304e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x413, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Gereed" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2616,7 +2638,7 @@ msgstr "" "Lege documenten aanmaken\n" "Nieuwe documenten (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2625,7 +2647,7 @@ msgstr "" "Een bestaand document openen.\n" "Openen" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2634,7 +2656,7 @@ msgstr "" "Het actieve document sluiten.\n" "Sluiten" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2643,7 +2665,7 @@ msgstr "" "Actief document opslaan.\n" "Opslaan" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2652,7 +2674,7 @@ msgstr "" "Actief document opslaan met een andere naam.\n" "Opslaan als" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2661,7 +2683,7 @@ msgstr "" "De paginainstellingen wijzigen.\n" "Paginainstellingen" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2670,7 +2692,7 @@ msgstr "" "De printerinstellingen wijzigen.\n" "Printerinstellingen" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2679,7 +2701,7 @@ msgstr "" "Actief document afdrukken.\n" "Afdrukken" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2688,51 +2710,51 @@ msgstr "" "Afdrukvoorbeeld.\n" "Afdruk voorbeeld" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2741,7 +2763,7 @@ msgstr "" "Programma informatie, versie nummer en auteursrechten tonen.\n" "Info" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2750,27 +2772,27 @@ msgstr "" "Applicatie afsluiten, vraagt naar opslaan documenten\n" "Afsluiten" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Dit document openen" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2779,7 +2801,7 @@ msgstr "" "Ga naar het volgende venster deel.\n" "Volgende deel" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2788,7 +2810,7 @@ msgstr "" "Ga naar het vorige venster deel.\n" "Vorige deel" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2797,7 +2819,7 @@ msgstr "" "Alle vensters trapsgewijs rangschikken.\n" "Trapsgewijs" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2806,7 +2828,7 @@ msgstr "" "Alle vensters horizontaal rangschikken.\n" "Horizontaal rangschikken" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2815,7 +2837,7 @@ msgstr "" "Alle vensters verticaal rangschikken.\n" "Verticaal rangschikken" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2824,7 +2846,7 @@ msgstr "" "De selectie naar het klembord kopiren\n" "Kopiren" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2833,7 +2855,7 @@ msgstr "" "De slecetie naar het klembord verplaatsen.\n" "Knippen" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2842,7 +2864,7 @@ msgstr "" "De aangegeven tekst vinden.\n" "Vinden" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2851,7 +2873,7 @@ msgstr "" "Inhoud klembord invoegen\n" "Plakken" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2860,7 +2882,7 @@ msgstr "" "Laatste actie herhalen.\n" "Herhalen" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2869,7 +2891,7 @@ msgstr "" "Gespecificeerde tekst door een andere vervangen.\n" "Vervangen" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2878,7 +2900,7 @@ msgstr "" "Het hele document selecteren.\n" "Alles selecteren" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2887,7 +2909,7 @@ msgstr "" "Laatste actie ongedaan maken.\n" "Ongedaan maken" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2896,7 +2918,7 @@ msgstr "" "Ongedaangemaakte actie opnieuw uitvoeren.\n" "Opnieuw" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2905,7 +2927,7 @@ msgstr "" "De werkbalk tonen of verbergen\n" "Werkbalk" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2914,69 +2936,69 @@ msgstr "" "De statusbalk tonen of verbergen\n" "Statusbalk" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "De grootte van het venster wijzigen" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Het venster verplaatsen" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Venster minimaliseren" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Venster maximaliseren" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Naar volgend documentvenster" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Naar vorig documentvenster" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Het actieve venster sluiten, vraag naar opslaan van documenten." -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Venster terug naar vorige formaat" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Lijst actieve taken" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Dit venster activeren" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2985,183 +3007,183 @@ msgstr "" "Afdrukvoorbeeld sluiten.\n" "Afsluiten voorbeeld" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Originele regeleindes behouden" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Druk op een willekeurige toets" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Klik rechts op het pad om het te kopiren" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Afbreken" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Herhalen" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Negeren" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "&Alles negeren" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Ja op &alles" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nee" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nee op a&lles" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Doorgaan" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Overslaan" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "&Alles overslaan" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Dit bericht niet &meer tonen." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Deze &vraag niet meer stellen." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Versie %1 - Nederlands" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Eigenschappen" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle berichtvensters worden weer weergegeven." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "De huidige bestandsvergelijkingssessie is gewijzigd. Sommige instellingen werken pas als de huidige bestandsvergelijking opnieuw wordt gestart." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "De geselecteerde wijziging van het lettertype wordt niet verwerkt in de openstaande vensters." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3169,7 +3191,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3177,127 +3199,129 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Openen" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Uitvoerbare bestanden|*.exe;*.bat;*.cmd|Alle bestanden (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle bestanden (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Laatst veranderd datum" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Naam" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Lokatie" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3306,7 +3330,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3315,7 +3339,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3323,7 +3347,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3332,12 +3356,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3345,208 +3369,223 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Pad naar cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Pad naar SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultaten mapvergelijking" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Restultaten bestandsvergelijking" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Geen titel links" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Geen titel rechts" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Bestanden aan het scannen..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Bezig met openen van selectie" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Aan het kopiren van links naar rechts" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Aan het kopiren van rechts naar links" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Alles naar links aan het kopiren" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Alles naar rechts aan het kopiren" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Bezig met kopiren van bestanden..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Bezig met verwijderen van bestanden..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Bezig met verplaatsen van bestanden..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Rg: %s Kol: %d/%d Tk: %d/%d EVR: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Regel: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rg: %s Kol: %d/%d Tk: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Samenvoegen" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Verschil %1 van %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 verschillen gevonden" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "En verschil gevonden" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "AL" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selecteer twee bestaande mappen of bestanden om te vergelijken" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Selectie van mappen" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Selecteer twee mappen of bestanden om te vergelijken." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Linker pad is ongeldig!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Rechter pad is ongeldig!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Beide paden zijn ongeldig!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Kies twee bestanden om de uitpakker selectie in te schakelen." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan geen bestand met een map vergelijken!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Bestand niet gevonden: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Bestand niet uitgepakt: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3559,42 +3598,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Opslaan als" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen opslaan in %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 is gemarkeerd als alleen lezen. Wilt u dit alleen-lezen bestand overschrijven? (Niet opslaan onder nieuwe naam.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Fout bij het controleren van de schrijfrechten van het doelbestand" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Fout bij het maken van een veiligheidskopie" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3603,7 +3642,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3618,7 +3657,7 @@ msgstr "" "%2\n" "Wilt u het bestand onder een andere naam opslaan?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3633,7 +3672,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3648,7 +3687,7 @@ msgstr "" "\n" "Wilt u de uitgepakte versie in een ander bestand opslaan?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3663,7 +3702,7 @@ msgstr "" "\n" "Het gewijzigde bestand overschrijven?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3672,7 +3711,7 @@ msgstr "" "%1\n" "is gemarkeerd als alleen-lezen. Wilt u het alleen-lezen item overschrijven?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3687,17 +3726,17 @@ msgstr "" "\n" "Als u de bestanden wilt verversen, sluit dan de huidige bestandsvergelijking en laad de bestanden opnieuw." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Linker bestand opslaan als" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Rechter bestand opslaan als" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3705,42 +3744,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "U moet een SourceSafe project path specificeren voordat u verder kunt (bv: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Bestanden vanuit VSS uitchecken..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe gaf een foutmelding bij de check out van het bestand. Kan niet verder gaan..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Fout bij het uitvoeren van een versiebeheer systeemopdracht." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "De VSS werkmap en de lokatie van het huidige bestand komen niet overeen. Doorgaan?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Geen VSS database(s) gevonden!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Fout uit VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3748,177 +3787,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Geen" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 of lager)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 en hoger)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Geselecteerde item aan de linker kant verwijderen" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Geselecteerde item aan de rechter kant verwijderen" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Geselecteerde item(s) aan beide kanten verwijderen" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Van rechts naar links (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Van links naar rechts (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Van rechts naar links (%1 van %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Van links naar rechts (%1 van %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Van links naar... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Van rechts naar... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Van links naar... (%1 van %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Van rechts naar... (%1 van %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 of %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 of %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Selecteer doelmap" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3930,17 +3968,17 @@ msgstr "" "%1\n" "wilt verwijderen?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -3952,490 +3990,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Linker bestand openen" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Het linker bestand met de externe editor openen" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Linker bestand openen met ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Rechter bestand openen" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Het rechter bestand met de externe editor openen" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Rechter bestand openen met..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Bestandsnamen naar het klembord kopiren" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Padnamen van de linker kant naar het klembord kopiren" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Padnamen van de rechter kant naar het klembord kopiren" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Padnamen van beide kanten naar het klembord kopiren" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Onbekend archiefformaat" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Items van de linker kant aan het archief toevoegen" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Items van de rechter kant aan het archief toevoegen" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Items van beide kanten aan het archief toevoegen" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Items die verschillen (van beide kanten) aan het archief toevoegen" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Geselecteerd bestand van links naar door gebruiker gedefinieerde map verplaatsen" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Geselecteerd bestand van rechts naar door gebruiker gedefinieerde map verplaatsen" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Bestandsnaam" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Map" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Vergelijkings resultaat" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Datum links" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Datum rechts" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Grootte links" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Grootte rechts" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Aanmaaktijd links" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Aanmaaktijd rechts" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Nieuwer bestand" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Bestandsversie links" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Bestandsversie rechts" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Kort resultaat" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Attributen links" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Attributen rechts" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Tekenset links" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Tekenset rechts" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binair" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Kan bestanden niet vergelijken" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Bestand overgeslagen" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Map overgeslagen" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binaire bestanden zijn identiek" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binaire bestanden zijn niet gelijk" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Bestanden zijn niet gelijk" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Alleen links" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Alleen rechts" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Verstreken tijd: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 item geselecteerd" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 items geselecteerd" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Bestandsnaam of mapnaam." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Naam van submap als submappen erbij horen." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultaat van vergelijking, lange vorm." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Wijzigingsdatum linker zijde." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Wijzigingsdatum rechter zijde." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Bestandsextensie." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Bestandsgrootte in bytes voor linker zijde." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Bestandsgrootte in bytes voor rechter zijde." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Aanmaaktijdstip linker zijde." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Aanmaaktijdstip rechter zijde." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Geeft aan welke zijde het recentst gewijzigd is." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bestandsversie linker zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Bestandsversie rechter zijde, alleen voor bepaalde bestandstypes." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Kort vergelijkingsresultaat." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Attributen linker zijde." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Attributen rechter zijde." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Tekenset linker zijde." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Tekenset rechter zijde." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Toont sterretje (*) als het een binair bestand is." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "%1 met %2 vergelijken" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Hetzelfde bestand is in beide vensters geopend." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "De geselecteerde bestanden zijn identiek" -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Fout opgetreden tijdens het vergelijken van de bestanden" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Tijdelijke bestanden konden niet aangemaakt worden. Controleer de instelling voor het pad van tijdelijke bestanden." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4445,32 +4498,32 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, 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:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4478,132 +4531,132 @@ msgid "" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Geen verschil" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Verschil binnen regel" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 tekenreeks(en) vervangen." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan tekenreeks \"%s\" niet vinden" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Volledig pad kopiren" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Bestandsnaam kopiren" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Patch-bestand met succes weggeschreven." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1e item niet gevonden! (is het een map?)" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2de item niet gevonden! (is het een map?)" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Het patch-bestand bestaat al. Wilt u het overschrijven?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 bestanden geselecteerd]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normaal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Verenigd" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Kan niet schrijven naar bestand %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan geen patch-bestand maken uit binaire bestanden." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan geen patch-bestand maken uit mappen." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4611,17 +4664,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Huidige resultaten van mapvergelijking zullen worden gewist." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4629,51 +4682,51 @@ msgid "" "See manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4681,492 +4734,512 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Fout in reguliere expressie" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Geen overkomst" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Ongeldige reguliere expressie" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Ongeldig Invalid collatieteken" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Ongeldige tekenklassenaam" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Backslash aan het eind" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Ongeldige achterwaartse referentie" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Geen overeenkomende [ of [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Geen overeenkomende ( or \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Geen overeenkomende \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Ongeldige inhoud van \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Ongeldig einde van bereik" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Onvoldoende geheugen" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Ongeldige voorafgaande reguliere expressie" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Voortijdig einde van reguliere expressie" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Te grote reguliere expressie" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Geen overeenkomende ) of \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Het linker bestand opslaan" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Het rechter bestand opslaan" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Het linker bestand opslaan met de naam..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Het rechter bestand opslaan met de naam..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "De alleen-lezen status van het linker bestand of map wijzigen" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "De alleen-lezen status van het rechter bestand of map wijzigen" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Wisselen tussen bewerkmodus en samenvoegmodus" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5175,7 +5248,7 @@ msgstr "" "Ga naar regel of verschil\n" "Ga naar (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5184,7 +5257,7 @@ msgstr "" "Programmaopties instellen\n" "Eigenschappen" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5193,79 +5266,79 @@ msgstr "" "Beeld verversen\n" "Verversen (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5274,7 +5347,7 @@ msgstr "" "Het lettertype voor de verschilvensters selecteren\n" "Het verschil-lettertype selecteren" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5283,103 +5356,103 @@ msgstr "" "Terug naar gebruik standaard systeemlettertype voor verschilvensters \n" "Standaard lettertype" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Toont tekens witruimte" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Omschakelen verschilvenster" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Locatievenster toont overzichtsweergave van bestanden" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5388,7 +5461,7 @@ msgstr "" "De geselecteerde tekst naar het rechter bestand kopiren.\n" "Nnaar rechts kopiren (Pijl rechts)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5397,7 +5470,7 @@ msgstr "" "De geselecteerde tekst naar het linker bestand kopiren.\n" "Naar links kopiren (Pijl links)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5406,7 +5479,7 @@ msgstr "" "Het verschil naar rechts kopiren en verder naar het volgende verschil.\n" "Naar rechts kopiren en volgende (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5415,7 +5488,7 @@ msgstr "" "Het verschil naar links kopiren en verder naar het volgende verschil.\n" "Naar links kopiren en volgende (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5424,7 +5497,7 @@ msgstr "" "Alle verschillen naar het rechter bestand kopiren.\n" "Alles naar rechts kopiren" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5433,367 +5506,377 @@ msgstr "" "Kopieer alle verschillen naar het linker bestand. \n" "Alles naar links kopiren" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Kolommen van mapvergelijk selecteren en herordenen" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Een patch-bestand genereren" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Filters selecteren en wijzigen" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "De gebruiker selecteert de uitpakker (niet uitpakken bij het vergelijken van mappen)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "De overgenomen uitpakker wordt gebruikt voor beide bestanden (een bestand hoeft maar de extensie te hebben)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selecteer een uitpakker om dit bestand te wijzigen" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Geen voorvergelijking (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Voorgestelde plug-ins" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Andere plug-ins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Alle plug-ins opnieuw inladen (voor ontwikkelaars)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "De huidige WinMerge versie en configuratie naar een tekstbestand wegschrijven" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Plug-in instellingen" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Geen voorvergelijking" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Voorvergelijking indien mogelijk" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH niet gevonden - .sct scripts uitgeschakeld" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Verplaatste blokken niet weergeven" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Alleen verplaatse blokken van huidige vergelijking weergeven" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ga naar het verschil onder de cursor" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&a naar verschil %1 van %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "G&a naar regel %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/French.po b/Src/Languages/French.po index 6a43761baea..70358dab174 100644 --- a/Src/Languages/French.po +++ b/Src/Languages/French.po @@ -73,7 +73,7 @@ msgstr "&Couper" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "Co&pier" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "Co&ller" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Atteindre..." @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "&Ouvrir" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "avec l'application &dsigne" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "avec l'diteur &externe" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&avec..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Fichier" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nouveau\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Ouvrir...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Ouvrir le fichier en conflit..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Ouvrir un &projet...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Enregistrer un Pro&jet..." @@ -162,1855 +164,1864 @@ msgid "Recent Projects" msgstr "Projets rcents" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Quitter" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Edition" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Prfrences..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Affichage" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Choisir une &police..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "&Utiliser la police par dfaut" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Barre d'ou&tils" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Aucune" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Petite" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Barre d'&tat" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Barre d'&onglet" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Langage..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Outils" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtrer..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Gnrer des retouches..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plugiciels" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Dcompression &manuelle" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Dcompression &automatique" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&diter avec dcompression" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Recharger les plugiciels" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Dboguer" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Charger la configuration..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Initialiser les prfrences" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Fe&ntre" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Fermer" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Fermer &tout" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Chan&ger de volet\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Mosaque &horizontale" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Mosaque &verticale" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Cascade" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "A&ide" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&Rubriques d'aide WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "&Notes de mise jour" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Traductions" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&Configuration" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Support d'archives dsactiv..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&Licence publique gnrale GNU" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&A propos de WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Ct gauc&he lecture seulement" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Ct droi&t lecture seulement" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Encodage de fic&hier" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Slectionner &tout\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Fichiers &identiques" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Fichiers &diffrents" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Fichiers uniquement &gauche" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Fichiers uniquement d&roite" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Fichiers ig&nors" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Fichiers &binaires" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Afficher les lments cachs" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Comparer les &statistiques" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Actualiser\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualiser la &slection\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "Fu&sionner" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparer\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Diffrence &suivante\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diffrence &prcdente\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&remire diffrence\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diffrence &courante\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Dernire diffrence\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copier vers la dr&oite\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copier vers la ga&uche\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "Su&pprimer\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Ajuster les colonnes..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Gnrer un &rapport..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Enregistrer\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Enregistrer &gauche" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Enregistrer" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Enregistrer &sous..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Enregistrer &droite" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Imprimer..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "&Mise en page" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "&Aperu avant impression" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Convertir les fins de ligne" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Mode &Fusion\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "Encodage de fic&hier" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Ann&uler\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rtablir\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Couper\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "Cop&ier\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "Co&ller\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "&Slectionner la distinction\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Rec&hercher...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Re&mplacer...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "Appli&quer un script" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Vide >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "A&vanc" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copier avec des numros de ligne\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "Si&gnets" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Placer/&retirer un signet\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "Signet &suivant\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Signet &prcdent\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Effacer tous les signets" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Atteindre...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zoom a&vant\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zoom a&rrire\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "&Coloration de la syntaxe" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "&Verrouiller les fentres" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Afficher les &espaces" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Afficher la &granularit des lignes" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Afficher la &numrotation des lignes" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Afficher les &marges" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "&Retour la ligne automatique" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "&Intervertir les fentres" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "&Dtail des diffrences" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Barre de locali&sation" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copier vers la droite et A&vancer\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copier vers la gauche et Av&ancer\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Tout cop&ier vers la droite" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Tout copi&er vers la gauche" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Pr-comparer" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Co&mparer" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Comparaison sp&ciale" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "de &gauche vers la droite" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "de g&auche vers..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "de &droite vers la gauche" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "de d&roite vers..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "D&placer" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "de g&auche vers..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "de d&roite vers..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Supprimer" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr " &gauche" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr " &droite" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "des deu&x cts" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Re&nommer" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "D&issimuler l'lment(s)" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Ouvrir &gauche" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Ouvrir &droite" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Copier le c&hemin complet" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "de &gauche (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "de &droite (%1 de %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "des deu&x cts (%1 de %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Copier le nom de &fichier" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "Co&mpresser" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr " &gauche... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr " &droite... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "les deu&x cts... (%1 de %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "les di&ffrences...(%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Actualiser" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "Copier le c&hemin complet" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Copier le nom de &fichier" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Ajustements de pr-comparaison" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "Au&cun" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Au&tomatique" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Atteindre la diffrence courante" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Ne pas afficher les blocs dplacs" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Afficher les blocs dplacs" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Afficher le bloc dplac de la diffrence &courante" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "A propos de WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Compilation personnalise)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Tous droits rservs." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Dcouvrez la page d'accueil de WinMerge !" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Contributeurs" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Slection des fichiers ou des rpertoires..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Gauche:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "P&arcourir..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Droite:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Pa&rcourir..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtre:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "&Choisir..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Dcom&pres." -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "C&hoisir..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Inclure les sous-rpertoires" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Statut:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Ann&uler" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Aide" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Fichiers ou rpertoires comparer :" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "&Database:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "&Projet:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Usa&ger:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "&Mot de passe:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "&Lien vers le projet destination VSS" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "&Appliquer tous les lments" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "E&xtraire" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Enregis. &sous" -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Contrle de version" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Systme utilis:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Chemin vers cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Gnral" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Atteindre automatiquement la premire diffrence" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Sans page de garde" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fermer les fentres avec la &touche ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Vrifier automatiquement les chemins de la fentre-Ouvrir" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Permetre une seule instance en excution" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "&Confirmer la fermeture de plusieurs fentres" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Prserver le timbre horaire lors de comparaison de fichier" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Automatisation bote de dialogue d'ouverture:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Activer plusieurs fentres pour" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "comparaison de Rpert&oires" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "comparaison de &Fichiers" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permet de dissimuler certaines botes de message. Appuyer sur ce bouton pour les rendre visibles nouveau." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "&Initialiser" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Langage" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Langages disponibles :" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Rechercher" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Rechercher:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "&Mot entier seulement" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Respecter la &casse" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "E&xpressions rgulires" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Pas de retour automatique la ligne" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direction" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "Vers le &Haut" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "Vers le &Bas" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Suivant" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Remplacer" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Rem&placer par:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Ne pas absorber la fin de ligne" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Porte " -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "La s&lection" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "Tout le &fichier" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Remplacer" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "&Tout Remplacer" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "&Extraire" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Commentaires" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Inscrire aprs extraction" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtre des lignes" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Activer le fitrage des lignes" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expressions rgulires (une par ligne)" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Enregister" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nouveau" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Editer" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Supprimer" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Couleurs" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Diffrence:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Diffrence slectionne :" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Fond" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Absence" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Texte" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Diffrence ignore:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Dplac:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Slectionn et dplac:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Mot diffrent:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Mot diffrent slectionn:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Dfauts" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialogue" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Systme" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Envoyer les fichiers supprims la corbeille" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Intgration" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Intgrer l'explorateur Windows" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "&Activer le menu avanc" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "In&clure les sous-rpertoires par dfaut" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "E&diteur externe:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Rpertoire de filtre:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Parc&ourir..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Rpertoire des fichiers temporaires" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Rpertoire temporaire du systme" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Rpertoire identifier:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "P&arcourir..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Gnrateur de retouche" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fichier&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fichier&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Intervertir" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "A&jouter au fichier existant" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "R&sultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Contexte:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Caractres d'&espacement" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "C&omparer" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Ignorer les chan&gements" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "&Tout ignorer" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Sensi&ble la casse" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inclure la ligne de co&mmande" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Ouvrir avec l'diteur e&xterne" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Affichage des colonnes" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "&Monter" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "&Descendre" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Slectionner le dcompresseur" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Dcompresseur:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Afficher tous les dcompresseurs, ignorer les extensions" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Extensions:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Description:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Progression de la comparaison" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Arrter" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparaison des lments..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "lments compars:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "lments au total:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Atteindre" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "A&tteindre:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fichier" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Atteindre quoi" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&Ligne" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "Di&ffrence" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Atteindre" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Comparaison" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Caractres d'espacement" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "C&omparer" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Ignorer les chan&gements" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "&Tout ignorer" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer les lignes &vides" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorer la ca&sse" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ignorer les diffrences de &fin de ligne (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "&Activer la dtection des blocs dplacs" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Assortir les &lignes similaires" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "I&gnorer les diffrences de temps de moins de 3 secondes" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Mthode de comparaison:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Arrter la premire diffrence" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtrer les commentaires" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "diteur" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Colorer la syntaxe" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Actualiser automatiquement" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Prserver les caractres de fin de ligne d'origine" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulations" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "Tai&lle des tabulations:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Insrer &tabulation" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Insrer &espace" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Colorer les diffrences de ligne" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "A&fficher les diffrences" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "Prcision au &caractre" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "Prcision au &mot" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtre des fichiers" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Installer..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "&Nouveau..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "&diter..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "&Supprimer..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Enregister les fichiers modifis ?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Fichier du ct gauche" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Enregister les changements" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Ignorer les changements" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Fichier du ct droit" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "E&nregister les changements" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "I&gnorer les changements" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Tout ignorer" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Page de code" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Page de code par dfaut" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Slectionnez la page de code par dfaut qui est assum lors du chargement des fichiers non-Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2020,32 +2031,32 @@ msgstr "" ".html, .rc, .xml \n" "ncessite un redmarrage de session" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Page de code &systme" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Conformment l'&interface usager WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Page de code sti&pule :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Support pour archives dsactiv" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Aucune dtection du logiciel 7-Zip. Est-il install ? " -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2054,12 +2065,12 @@ msgstr "" "Le support pour archives ncessite que 7-Zip 3.11 ou suprieur soit install. \n" "Ou, dfaut ces composants essentiels au mme rpertoire que ce programme." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "De plus l'interface plugiciel approprie (Merge7z*.dll) doit tre prsente." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2068,12 +2079,12 @@ msgstr "" "Veuillez utiliser la version 7-Zip recommande plus bas jusqu' \n" "ce qu'une interface plugiciel plus rcente devienne disponible." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2082,540 +2093,551 @@ msgstr "" "plugiciel requis\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Version recommande de 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "prsente" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Logiciel 7-Zip install sur cet ordinateur:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "absent" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "absent" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Composants solitaires de 7-Zip:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "prim" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugiciel sur le chemin principal:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "Ne plus afficher ce &message.\n(Il peut toujours tre ractiver au menu des prfrences.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Tlchar. plugiciel" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Prfrences" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Catgories" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importer..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exporter..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Mots cls:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nom des Fonctions:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Commentaires:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nombres:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Oprateurs:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Chaines:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Prprocesseur:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Usager 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Usager 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Surbrillance" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Rpertoire du rapport de comparaison" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Fichier du &rapport:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Parc&ourir..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Style:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copier au presse-papiers" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtre partag ou priv" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Quel type de filtre voulez-vous crer ?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtre partag (pour tous les usagers de l'odinateur)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtre priv (pour l'usager actuel seulement)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Support d'archives" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Le support d'archives ncessite l'installation du plugiciel 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Tlcharger le plugiciel 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Activer le support d'archives" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Utiliser le mode autonome de 7-Zip si disponible" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&tiliser les composants locaux de 7-Zip (rpertoire WinMerge)" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Dtecter le type d'archives avec un fichier de signature" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Statistiques de comparaison" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Rpertoires:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Fichiers:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diffrent" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Texte:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binaire:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unique" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Gauche:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Droit:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identique" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Fermer" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Affectations" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Affect)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Slectionner le code de page" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Chargement de fichier:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Enregistrement de fichier:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Utiliser le mme pour les deux" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Appliquer" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "Ann&uler" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Filtre de test" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Tester le filtre ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Saisir le texte tester:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nom de rpertoire" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Tester" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Fermer" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Utiliser les couleurs de texte ajustes" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Couleurs de texte ajustes" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Caractre espace:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Texte rgulier:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Slection:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Chemins" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Lecture seule" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Lecture seule" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Ouvrir..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Enregistrer..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Fichiers d'archive" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Crer les fichiers d'archive sous:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Crer les fichiers d'archive dans:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Rpertoire d'&origine du fichier" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "Rpertoire d'archive &global:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "&Nom du fichier d'archive:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "Apposer une &extension .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "Apposer une estampille &temporelle" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Confirmation de copie" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "tes-vous sr de vouloir copier XXX lments ?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "De la gauche" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Vers la droite" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Oui" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Non" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040c04e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x40c, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Prt" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "MAJ" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2624,7 +2646,7 @@ msgstr "" "Cration de documents vides\n" "Nouveau (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2633,7 +2655,7 @@ msgstr "" "Ouvrir la fentre du choix des slections\n" "Ouvrir (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2642,7 +2664,7 @@ msgstr "" "Ferme la fentre active\n" "Fermer" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2651,7 +2673,7 @@ msgstr "" "Enregistre le fichier actif\n" "Enregistrer (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2660,7 +2682,7 @@ msgstr "" "Enregistre le fichier actif sous un nouveau nom\n" "Enregistrer sous" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2669,7 +2691,7 @@ msgstr "" "Change les options d'impression\n" "Mise en page" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2678,7 +2700,7 @@ msgstr "" "Change les options d'imprimante et d'impression\n" "Configuration de l'impression" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2687,7 +2709,7 @@ msgstr "" "Imprime le document actif\n" "Imprimer" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2696,12 +2718,12 @@ msgstr "" "Affiche les pages entires\n" "Aperu avant impression" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Rendre visible nouveau tous les lments cachs" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2710,32 +2732,32 @@ msgstr "" "Ouvrir un fichier de projet\n" "Fichier de projet (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erreur indtermine lors de l'ouverture du projet" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erreur indtermine lors de l'enregistrement du projet" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Fichiers du projet" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Fichiers du projet correctement chargs." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Fichiers du projet correctement enregistrs." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2744,7 +2766,7 @@ msgstr "" "Enregistrer les chemins et prfrences au projet\n" "Enregistrer les fichiers du projet" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2753,7 +2775,7 @@ msgstr "" "Affiche des informations sur le programme, le numro de version et le copyright\n" "A propos de" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2762,27 +2784,27 @@ msgstr "" "Ferme l'application et propose d'enregistrer les documents\n" "Quitter" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Ouvrir ce document" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2791,7 +2813,7 @@ msgstr "" "Passe au volet suivant\n" "Volet suivant" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2800,7 +2822,7 @@ msgstr "" "Revient au volet prcdent\n" "Volet prcdent" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2809,7 +2831,7 @@ msgstr "" "Rorganise les fentres en cascade\n" "Cascade" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2818,7 +2840,7 @@ msgstr "" "Rorganise les fentres en une mosaque horizontale\n" "Mosaque horizontale" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2827,7 +2849,7 @@ msgstr "" "Rorganise les fentres en une mosaque verticale\n" "Mosaque verticale" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2836,7 +2858,7 @@ msgstr "" "Copie la slection et la place dans le presse-papiers\n" "Copier" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2845,7 +2867,7 @@ msgstr "" "Supprime la slection et la place dans le presse-papiers\n" "Copier" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2854,7 +2876,7 @@ msgstr "" "Recherche le texte spcifi\n" "Rechercher" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2863,7 +2885,7 @@ msgstr "" "Insre le contenu du presse-papiers\n" "Coller" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2872,7 +2894,7 @@ msgstr "" "Rpte la dernire action\n" "Rpter" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2881,7 +2903,7 @@ msgstr "" "Remplace le texte spcifique par un texte diffrent\n" "Remplacer" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2890,7 +2912,7 @@ msgstr "" "Slectionne le document entier\n" "Slectionner tout" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2899,7 +2921,7 @@ msgstr "" "Annule la dernire action\n" "Annuler" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2908,7 +2930,7 @@ msgstr "" "Rtablit l'action prcdemment annule\n" "Rtablir" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2917,7 +2939,7 @@ msgstr "" "Affiche ou masque la barre d'outils\n" "Barre d'outils" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2926,7 +2948,7 @@ msgstr "" "Affiche ou masque la barre d'tat\n" "Barre d'tat" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2935,62 +2957,62 @@ msgstr "" "Affiche ou masque la barre d'onglet\n" "Barre d'onglet" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Redimensionne les fentres automatiquement\nVerrouiller les fentres" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Change la taille de la fentre" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Change la position de la fentre" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Rduit la fentre en icne" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Agrandit la fentre au format de l'cran" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Passe la fentre du document suivant" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Passe la fentre du document prcdent" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Ferme la fentre active et propose l'enregistrement des documents" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Restaure la fentre sa taille d'origine" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Active la liste des tches" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Active cette fentre" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2999,183 +3021,183 @@ msgstr "" "Ferme le mode d'aperu avant impression\n" "Fermer l'aperu" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Conserver les caractres de fin de ligne d'origine" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Appuyer sur une touche" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Clic droit pour copier le chemin" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Dveloppeurs:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge est fourni SANS AUCUNE GARANTIE. C'est un logiciel libre et vous tes invit le redistribuer sous certaines conditions; Voir la licence publique gnrale GNU au menu d'aide pour tous les dtails." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Avorter" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Ressayer" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "&Tout ignorer" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Oui" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Oui pour &tout" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Non" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Non pour t&out" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Continuer" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Sauter" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "To&ut sauter" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Ne plus afficher ce &message." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Ne plus poser cette &question." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Couleurs de la syntaxe" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Couleurs du texte" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Contrle de version" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Vers:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "De la gauche:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Vers la gauche:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "De la droite:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Vers la droite:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Version %1 - Franais" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Prfrences (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Tous les messages seront raffichs." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Certains fichiers de la session courante ont t modifis. Les changements de prfrences seront en vigueur lors de la prochaine comparaison de fichier." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Le changement de police sera en vigueur lors de la prochaine comparaison de fichier." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3186,7 +3208,7 @@ msgstr "" "\n" "Veuillez utiliser ces valeurs 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3197,127 +3219,129 @@ msgstr "" "\n" "Veuillez redmarrer WinMerge aprs l'initialisation." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Ouvrir" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmes|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fichiers de projet WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fichiers d'options (*.ini)|*.ini|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fichiers texte (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fichiers HTML (*.htm,*.html)|*.htm;*.html|Tous les fichiers(*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fichiers XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Contenu complet" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Contenu rapide" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Date de modification" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Date et taille modifie" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Taille" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nom" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Emplacement" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtres" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Description" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Slectionner un nom de fichier pour le nouveau filtre" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtres de fichier (*.flt)|*.flt|Tous les fichiers (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3330,7 +3354,7 @@ msgstr "" "Veuillez copier le fichier %1 dans WinMerge/Rpertoire des filtres:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3343,7 +3367,7 @@ msgstr "" "\n" "Veuillez vous assurer de l'existance du rpertore et qu'il soit inscriptible." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3354,7 +3378,7 @@ msgstr "" "\n" "Veuillez le dfinir sous Prfrences/Systme." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3367,12 +3391,12 @@ msgstr "" "\n" "Cause probable: fichier en lecture seule?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Localiser le fichier de filtre installer" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3383,208 +3407,223 @@ msgstr "" "\n" "Ne peut copier le nouveau fichier de filtre au rpertoire de filtre." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Le fichier de filtre existe dj. craser le filtre existant?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Expression rgulire" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Chemin vers cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Chemin vers SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Rsultats de la comparaison des rpertoires" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Comparaison de fichiers" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Sans titre gauche" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Sans titre droite" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Leur fichier" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Mon fichier" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Balayage des fichiers en cours..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Ouverture en cours..." -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Copie de gauche droite en cours..." -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Copie de droite gauche en cours..." -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Copie de tout vers la gauche en cours..." -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Copie de tout vers la droite en cours..." -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Copie des fichiers en cours..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Suppression des fichiers en cours..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Dplacement des fichiers en cours..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Cration du rapport..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Lg: %s Col: %d/%d Car: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Ligne: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Lg: %s Col: %d/%d Car: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Fusion" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Diffrence %1 de %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 Diffrences trouves" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 Diffrence trouve" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "LS" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "lment %1 de %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "lment: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Comparez deux fichiers ou deux rpertoires !" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Slection de rpertoire" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Slectionner deux rpertoires ou deux fichiers comparer" -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Le chemin de gauche est invalide !" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Le chemin de droite est invalide !" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Les deux chemins sont invalides !" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Choisissez deux fichiers pour activer la slection du dcompresseur." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Ne peut comparer un fichier et un rpertoire !" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Fichier %1 non trouv" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Fichier non dcompress : %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3597,42 +3636,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "L'analyse du fichier en conflit a chou." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Le fichier\n%1\nn'est pas un fichier en conflit." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Enregistrer sous" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements de %1 ?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 est en lecture seule. Voulez-vous outrepasser ? (Choisissez Non pour enregistrer avec un nouveau nom.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Erreur en vrifiant les droits en criture de la destination" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Erreur lors du backup du fichier" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3645,7 +3684,7 @@ msgstr "" "\n" "Continuer quand mme ?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3662,7 +3701,7 @@ msgstr "" "\t-utiliser un nom autre nom de fichier (Ok)\n" "\t-avorter l'opration en cours (Annuler)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3677,7 +3716,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version dcompresse sous un autre nom ?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3692,7 +3731,7 @@ msgstr "" "\n" "Voulez-vous enregistrer la version dcompresse sous un autre nom ?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3707,7 +3746,7 @@ msgstr "" "\n" "Voulez-vous craser le fichier mis jour ?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3716,7 +3755,7 @@ msgstr "" "%1\n" "est en lecture seule. Voulez-vous outrepasser ?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3731,17 +3770,17 @@ msgstr "" "\n" "Pour tenir compte des changements terminez la prsente comparaison et en dbuter une nouvelle." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Enregistrer le fichier de gauche sous" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Enregistrer le fichier de droite sous" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3752,42 +3791,42 @@ msgstr "" "\n" "Actualiser les documents avant de poursuivre." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Vous dever indiquer un chemin d'accs au projet SourceSafe afin de pouvoir continuer (par ex. : $/MonProjet)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Extraire les fichiers de VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Le systme de contrle de version a retourn une erreur en essayant d'extraire le fichier. Ne peut continuer..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Erreur d'excution d'une commande du systme de contrle de version." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Le rpertoire de travail de VSS et l'emplacement du fichier courant ne correspondent pas. Continuer ?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Aucune base de donnes de VSS trouve !" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Erreur de VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3798,7 +3837,7 @@ msgstr "" " Veuillez vrifier la configuration.\n" " Annuler l'operation d'extraction?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3807,170 +3846,169 @@ msgstr "" "Le systme de contrle de version a retourn une erreur en essayant d'extraire le fichier.\n" " Veuillez vrifier la configuration. " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Aucun" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (infrieur 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 et suprieur)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Distinguer sur espacement" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Distinguer sur espacement ou ponctuation" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copier le fichier slectionn vers le rpertoire indentifi" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copier le fichier slectionn vers un rpertoire indentifer" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Supprimer l'lment slectionn gauche" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Supprimer l'lment slectionn droite" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Supprimer l'lment slectionn de chaque ct" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Dissimuler l'lment slectionn (filtre instantan)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Renommer l'lment slectionn de chaque ct" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "De droite gauche (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "De gauche droite (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De droite gauche (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De gauche droite (%1 de %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "De gauche vers... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "De droite vers... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "De gauche vers... (%1 de %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "De droite vers... (%1 de %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " gauche (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr " droite (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Des deux cts (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " gauche (%1 de %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr " droite (%1 de %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Des deux cts (%1 de %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Choisir un rpertoire de destination" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Ct gauche - choisir rpertoire de destination:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Ct droit - choisir rpertoire de destination:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Fichiers modifis)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Fichiers modifis)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3981,17 +4019,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Voulez-vous vraiment copier:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Voulez-vous vraiment copier %d lments:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4010,458 +4048,473 @@ msgstr "" "\n" "Veuillez actualiser la comparaison." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Ouvrir le fichier de gauche" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Ouvrir le fichier de gauche avec l'diteur externe" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Ouvrir le fichier de gauche avec ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Ouvrir le fichier de droite" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Ouvrir le fichier de droite avec l'diteur externe" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Ouvrir le fichier de droite avec ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Lancement de l'diteur externe a chou: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extension inconnue pour l'diteur externe: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copier les fichiers vers le presse-papiers" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copier les chemins de gauche vers le presse-papiers" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copier les chemins de droite vers le presse-papiers" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copier les chemins des deux cts vers le presse-papiers" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Format d'archives inconnu" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Ajouter les lments du ct gauche au fichier d'archives" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Ajouter les lments du ct droit au fichier d'archives" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Ajouter les lments des deux ct au fichier d'archives" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Ajouter les lments distincts des deux ct au fichier d'archives" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Dplacer le fichier slectionn de gauche vers un rpertoire indentifer" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Dplacer le fichier slectionn de droite vers un rpertoire indentifer" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nom du fichier" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Rpertoire" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Rsultat de la comparaison" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Date mod. gauche" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Date mod. droite" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extension" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Taille gauche" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Taille droite" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Taille droite (abrge)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Taille gauche (abrge)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Date cr. gauche" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Date cr. droit" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Plus rcent" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Version gauche" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Version droite" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Rsultat" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Attributs gauches" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Attributs droits" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Fin de ligne gauche" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Fin de ligne droit" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Page de code gauche" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Page de code droite" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Diffrences ignores." -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Diffrences" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binaire" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Impossible de comparer les fichiers" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "lment abandonn" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Fichier ignor" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Rpertoire ignor" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Juste gauche: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Juste droite: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Les fichiers binaires sont identiques" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Les fichiers binaires sont diffrents" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Les fichiers sont diffrents" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Juste gauche" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Juste droite" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Erreur" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Temps coul: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 lment slectionn" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 lments slectionns" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nom de fichier ou de rpertoire." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nom du sous-rpertoire lorsque ceux-ci sont inclus." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultat de la comparison, format tendu." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Date de modification du ct gauche." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Date de modification du ct droit." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Extension du fichier." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Taille du fichier du ct gauche en octets." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Taille du fichier du ct droit en octets." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Taille du fichier du ct gauche abrge." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Taille du fichier du ct droit abrge." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Temps de creation du ct gauche." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Temps de creation du ct droit." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Indique le ct ayant la date de modification la plus rcente." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Version du fichier du ct gauche, certains fichiers seulement." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Version du fichier du ct droit, certains fichiers seulement." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Resultat de la comparison, format abrg." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Attributs du ct gauche." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Attributs du ct droit." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Type de fin de ligne du ct gauche" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Type de fin de ligne du ct droit" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Page de code du ct gauche." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Page de code du ct droit." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nombre total des diffrences. Elles sont ignores par WinMerge et ne peuvent tre fusionnes." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nombre de diffrences l'exclusion de celles ignores." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Indique un astrisque (*) si le fichier est binaire." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Comparer %1 avec %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Liste dlimite par des virgules" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Liste dlimite par des tabulations" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Format HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Format XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Le rapport existe dj. Voulez-vous craser le fichier existant?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4470,32 +4523,32 @@ msgstr "" "Erreur la cration du rapport:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Le rapport a t cr avec succs." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Le mme fichier est ouvert dans les deux volets." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Les fichiers slectionns sont identiques." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Erreur lors de la comparaison des fichiers." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Des fichiers temporaires ne peuvent tre crs. Vrifiez la dfinition du chemin temporaire." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4510,32 +4563,32 @@ msgstr "" "\n" "Notez bien: Si vous voulez toujours considrer une telle galit. Dfinnissez l'option: Ignorer les diffrences de fin de ligne la fentre des Prfrences sous l'onglet Comparaison (accessible avec le menu Edition/Prfrences)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 "Les fins de ligne sont de type diffrent (Windows/Unix/Mac) au fichier '%1'.\n Selon les prfrences en vigueur, elles seront uniformises au type principal.\n Dsirez-vous changer l'option et prserver les diffrences ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Une erreur est survenue pendant la pr-comparaison du fichier '%1' avec le plugiciel '%2'. La pr-comparaison ne sera donc plus utilise." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Le rpertoire slectionn est invalide." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ne peut ouvrir un fichier binaire avec l'diteur." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 "Le rpertoire existe seulement de l'autre ct et ne peut tre ouvert ici.\n\nVoulez-vous crer un rpertoire s'accordant:\n%1\n l'autre ct et ouvrir ces rpertoires" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4546,132 +4599,132 @@ msgstr "" "L'affichage est ainsi meilleurs cependant les copie/fusion seront dangeureuses.\n" "Dsirez-vous traiter les deux fichiers avec la page de code windows par dfaut (recommand)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Attention! Les fichiers utilisent un encodage diffrent: gauche=%s , droit=%s et la fusion peut conduire une perte d'information." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information perdue cause d'erreurs d'encodage: pour les deux fichiers" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Information perdue cause d'erreurs d'encodage: fichier de droite" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Information perdue cause d'erreurs d'encodage: fichier de gauche" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Aucune diffrence" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Ligne diffrente" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 remplacement(s) effectu(s)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Texte non trouv \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copier le chemin complet" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copier le nom du fichier" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Barre de localisation" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Dtail des diffrences" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Fichier de retouche crit avec succs." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. lment non trouv ou il s'agit d'un rpertoire !" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. lment non trouv ou il s'agit d'un rpertoire !" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Le fichier de retouche existe dja. Voulez-vous l'craser ?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 fichiers slectionns]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Contexte" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unifi" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Ne peut crire au fichier %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Le chemin spcifi n'est pas un chemin absolu: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Indiquez un fichier de sortie" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ne peut crer un fichier de retouche depuis un fichier binaire." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne peut crer un fichier de retouche depuis des rpertoires." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4682,17 +4735,17 @@ msgstr "" "\n" "Gnrer une retouche requiert l'tat non modifi des fichiers." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Le rpertoire n'existe pas." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Les rsultats de comparaison du rpertoire courant seront effacs." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4703,7 +4756,7 @@ msgstr "" "Tous les composants requis (7-zip et/ou Merge7z*.dll) pour le support d'archives ne peuvent tre trouvs.\n" "Consulter la documentation au sujet du support d'archives indiquant comment l'activer." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4712,7 +4765,7 @@ msgstr "" "\n" "Note: l'intgration de 7-Zip est dsactive avec les prfrences de WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4721,37 +4774,37 @@ msgstr "" "\n" "Note: l'intgration de 7-Zip est restreinte au mode autonome avec les prfrences de WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Slectionner le fichier pour exportation" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Slectionner le fichier pour importation" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Prfrences importes du fichier." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Prfrences exportes au fichier." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "L'importation (lecture) du fichier des prfrences a chou." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "L'exportation (criture) du fichier des prfrences a chou." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4762,473 +4815,493 @@ msgstr "" "\n" "Voulez-vous continuer ?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Erreur d'expression rgulire" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Pas de concordance" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Expression rgulire invalide" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Comparaison de caractre invalide" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Nom de classe de caractre invalide" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Barre oblique la fin" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Rfrence arrire invalide" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Non concordance de [ ou [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Non concordance de ( ou \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Non concordance de \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contenu invalide de \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Fin de l'intervalle invalide" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Mmoire insuffisante" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Expression rgulire prcdente invalide" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Fin prmature d'expression rgulire" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Expression rgulire trop grande" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Non concordance de ) or \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Europe de l'ouest" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Europe de l'est" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Asie de l'est" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Asie du SE & SO" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Moyen orient" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Non applicable" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillique" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabe" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grec" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltique Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grec 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillique" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turc" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugais" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandais" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hbreu" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Franais (Canada)" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordique" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillique CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grec 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Tha" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japonais" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chinois (Simplifi)" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Coren" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chinois (Traditionnel)" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillique (Slovaque)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grec" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turquie)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hbreu" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabe" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltique Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamien" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romain" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grec" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillique" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europe Centrale" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turc" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Se rapproche de ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Se rapproche de ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Se rapproche de ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Se rapproche de ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Se rapproche de ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Combin" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " O" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KO" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MO" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GO" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TO" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PO" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Enregistrer le fichier de gauche" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Enregistrer le fichier de droite" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Enregistrer le fichier de gauche sous..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Enregistrer le fichier de droite sous..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Restreindre ou permettre l'criture du ct droit" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Restreindre ou permettre l'criture du ct gauche" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Convertir la fin de ligne en mode Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Convertir la fin de ligne en mode Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Convertir la fin de ligne en mode Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Basculer entre les modes d'dition et de fusion" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5237,12 +5310,12 @@ msgstr "" "Voir et ajuster les proprits d'encodage de fichier\n" "Proprits d'encodage de fichier" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Ouvrir et rsoudre le fichier en conflit" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5251,7 +5324,7 @@ msgstr "" "Slectionner la diffrence de la ligne courante\n" "Diffrence de la ligne courante" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5260,7 +5333,7 @@ msgstr "" "Atteindre une ligne ou une diffrence\n" "Atteindre (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5269,7 +5342,7 @@ msgstr "" "Modifier les prfrences du programme\n" "Prfrences" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5278,37 +5351,37 @@ msgstr "" "Actualiser l'affichage\n" "Actualiser (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copier les lignes slectionns vers le presse-papiers en les prcdants d'un numro de ligne" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Actualiser les lments slectionns" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Placer ou retirer un signet" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Atteindre le signet suivant" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Atteindre le signet prcdent" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Effacer tous les signets" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5317,7 +5390,7 @@ msgstr "" "Afficher les lments strictement identiques\n" "Afficher les lments identiques" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5326,7 +5399,7 @@ msgstr "" "Afficher les lments comportants des diffrences\n" "Afficher les lments diffrents" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5335,7 +5408,7 @@ msgstr "" "Afficher les lments existant seulement au ct gauche\n" "Afficher les lments de gauche seulement" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5344,7 +5417,7 @@ msgstr "" "Afficher les lments existant seulement au ct droit\n" "Afficher les lments de droite seulement" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5353,7 +5426,7 @@ msgstr "" "Afficher les lments binaires\n" "Afficher les lments binaires" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5362,7 +5435,7 @@ msgstr "" "Afficher les lments ignors\n" "Afficher les lments ignors" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5371,7 +5444,7 @@ msgstr "" "Slectionner la police utilise pour l'affichage des diffrences\n" "Slection de la Police Diff" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5380,42 +5453,42 @@ msgstr "" "Revenir la police par dfaut pour l'affichage des diffrences\n" "Police par Dfaut" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Afficher ou masquer les espaces" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Afficher ou masquer le dtail des diffrences courantes" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Afficher ou masquer la barre de localisation (vue d'ensemble des fichiers)" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Afficher la bote de dialogue de comparaison des statistiques" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Slectionner le langage de l'interface\nLangage" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Afficher les diffrences des lignes avec diffrentes couleurs\nAfficher diffrences des lignes" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Intervertir la position de deux fentres" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5424,7 +5497,7 @@ msgstr "" "Afficher la numrotation des lignes\n" "Afficher la numrotation des lignes" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5433,7 +5506,7 @@ msgstr "" "Afficher ou masquer le retour la ligne automatique\n" "Retour la ligne automatique" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5442,47 +5515,47 @@ msgstr "" "Afficher les marges des deux fentres\n" "Afficher les marges" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Augmenter la taille du texte" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Diminuer la taille du texte" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Initialiser le zoom du texte la taille par dfaut" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Atteindre la diffrence prcdente\nDiff Prcdente (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Atteindre la diffrence suivante\nDiff Suivante (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Atteindre la premire diffrence\nPremire Diff (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Atteindre la diffrence courante\nDiff Courante (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Atteindre la dernire diffrence\nDernire Diff (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5491,7 +5564,7 @@ msgstr "" "Copier le texte slectionn vers le fichier de droite\n" "Copier Droite (Alt Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5500,7 +5573,7 @@ msgstr "" "Copier le texte slectionn vers le fichier de gauche\n" "Copier Gauche (Alt Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5509,7 +5582,7 @@ msgstr "" "Copier la diffrence vers la droite et Avancer\n" "Copier vers la droite et Avancer (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5518,7 +5591,7 @@ msgstr "" "Copier la diffrence vers la gauche et Avancer\n" "Copier vers la gauche et Avancer (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5527,7 +5600,7 @@ msgstr "" "Copier toutes les diffrences vers le fichier de droite\n" "Copier Tout Droite" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5536,367 +5609,377 @@ msgstr "" "Copier toutes les diffrences vers le fichier de gauche\n" "Copier Tout Gauche" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Dtruire les lments slectionns pour les deux rpertoires" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparer l'lment slectionn (premier lment retenu si slection multiple)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Slectionner et ordonner les colonnes de la fentre de comparaison des rpertoires" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Gnrer un fichier de retouche" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Slectionner et modifier les filtres" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Gnrer un rapport des rsultats de la comparaison" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Choisir le dcompresseur (pas de dcompression lors de la comparaison des rpertoires)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Appliquer automatiquement le dcompresseur appropri (bas sur l'extension d'au moins un des deux fichiers)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Choisir le dcompresseur pour diter ce fichier" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Pas de pr-comparaison (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Plugiciels suggrs" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Plugiciels autres" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Recharger tous les plugiciels (pour les dveloppeurs)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "Active le prochain fichier visible\nActive le prochain fichier" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Fermer toutes les fentres" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "Ouvre la rubrique d'aide de WinMerge\nAide de WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Affiche les informations de version et de configuration de WinMerge avec un fichier de texte" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Afficher la licence publique gnrale GNU" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Compilation personnelle: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Ouvre les notes de mise jour\nNotes de mise jour" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "Ouvre le site web des traductions\nTraductions" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Ajuster les plugiciels" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Pas de pr-comparaison" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Pr-comparer si possible" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH pas trouv - .sct les scripts sont dsactivs" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Ouvrir le fichier avec l'application dsigne" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Ouvrir le fichier avec l'diteur externe" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Ouvrir le fichier avec le programme indiqu" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Ne pas afficher les blocs dplacs" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Afficher tous les blocs dplacs" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Afficher le bloc dplac de la diffrence courante" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Atteindre l'endroit point la barre de localisation" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Atteindre la diffrence %1 de %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Dsactiv" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "A partir du systme de fichier" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "A partir de la liste des fichiers rcents" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Objet portatif" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Cacher la barre d'outils" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Afficher la petite barre d'outils" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Afficher la grande barre d'outils" diff --git a/Src/Languages/German.po b/Src/Languages/German.po index 5441357eff5..67395541e7b 100644 --- a/Src/Languages/German.po +++ b/Src/Languages/German.po @@ -73,7 +73,7 @@ msgstr "Auss&chneiden" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Kopieren" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "E&infgen" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Gehe nach..." @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "&ffnen" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "Mit ®istrierter Anwendung" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "Mit &externem Editor" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&Mit..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Datei" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Neu\tStrg+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&ffnen...\tStrg+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "&Konflikt-Datei ffnen..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Pro&jekt ffnen...\tStrg+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Proje&kt speichern..." @@ -162,1857 +164,1866 @@ msgid "Recent Projects" msgstr "Krzliche Projekte" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Beenden" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Bearbeiten" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Einstellungen..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Ansicht" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Schrift &auswhlen..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Standard-Schrift &verwenden" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Symbolleiste" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Keine" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "K&lein" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Gro" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "S&tatusleiste" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Ta&b-Leiste" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "Spra&che..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Tools" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Patch generieren..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell entpacken" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisch entpacken" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "Mit Entpacker &bearbeiten" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "Plugins &neu laden" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "D&ebug" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Konfiguration laden..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Einstellungen zurcksetzen" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Fenster" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Schlieen" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Alle s&chlieen" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Ausschnitt wechseln\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "&Untereinander" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "&Nebeneinander" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "ber&lappend" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Hilfe" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Hilfe\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "&Versionshinweise" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&bersetzungen" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&Konfiguration" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Archiv-Untersttzung deaktiviert..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&ber WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "L&inks schreibgeschtzt" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "R&echts schreibgeschtzt" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Dateik&odierung" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Alles &markieren\tStrg+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "&Identische Objekte anzeigen" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "&Unterschiedliche Objekte anzeigen" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Eindeutige Objekte &links anzeigen" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Eindeutige Objekte &rechts anzeigen" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "bersprun&gene Objekte anzeigen" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Binr&dateien anzeigen" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Verstec&kte Objekte anzeigen" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "V&ergleichsstatistik" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Aktualisieren\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Ausge&whlte aktualisieren\tStrg+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Merge" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Ver&gleichen\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nchster Unterschied\tAlt+Runter" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Voriger Unterschied\tAlt+Hoch" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Erster Unterschied\tAlt+Pos1" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktueller Unterschied\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Letzter Unterschied\tAlt+Ende" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Nach &rechts kopieren\tAlt+Rechts" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Nach l&inks kopieren\tAlt+Links" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "Ls&chen\tEntf" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Spalten anpassen..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "&Bericht generieren..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Speichern\tStrg+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "&Links speichern" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Speichern" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Speichern &unter..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "&Rechts speichern" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Drucken..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Sei&te einrichten" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Druck&vorschau" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Zeilenenden konvertieren nach" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Merge Modus\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "Dateik&odierung..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Rckgngig\tStrg+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Wiederherstellen\tStrg+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Auss&chneiden\tStrg+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopieren\tStrg+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "E&infgen\tStrg+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zeilen&unterschied markieren\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Suchen...\tStrg+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Erse&tzen...\tStrg+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "Skri&pte" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Leer >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Erweitert" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopieren mit Zeilennummern\tStrg+Umschalt+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Lesezeichen" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Lesezeichen ein/aus\tStrg+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nchstes Lesezeichen\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Vorheriges Lesezeichen\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Alle Lesezeichen lschen" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Gehe nach...\tStrg+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ver&grern\tStrg++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Ver&kleinern\tStrg+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tStrg+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Syntaxhervorhebung" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "Ausschnitte &fixieren" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Leer&zeichen anzeigen" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Zeilenuntersc&hiede anzeigen" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Zeilennu&mmern anzeigen" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "&Rnder anzeigen" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Zeilen &umbrechen" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Ausschnitt v&ertauschen" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "U&nterschiedsleiste" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "P&ositionsleiste" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Nach rechts kopieren und &fortschreiten\tAlt+Strg+Rechts" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Nach links kopieren und f&ortschreiten\tAlt+Strg+Links" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Alles nach rec&hts kopieren" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Alles nach lin&ks kopieren" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Ver&gleichen" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "&Speziell Vergleichen" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Links nach Rechts" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "L&inks nach ..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Rechts nach Links" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "R&echts nach ..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Verschieben" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Links nach..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Rechts nach..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Lschen" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Links" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Rechts" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Beide" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "&Umbenennen" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "Objekte v&erstecken" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&ffne links" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "ff&ne rechts" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiere &Pfade" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Links (%1 von %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Rechts (%1 von %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Beide (%1 von %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Kopiere &Dateinamen" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "P&acken" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Links... (%1 von %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Rechts... (%1 von %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Beide... (%1 von %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Unterschiede... (%1 von %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "Ak&tualisieren" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Kopiere vollstndigen Pfad" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopiere &Dateiname" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "&Prediffer Einstellungen" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Kein Prediffer" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "&Auto Prediffer" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "G&ehe nach Unterschied" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Keine verschobene Blcke" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Alle verschobene Blcke" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Verschobenen Block fr aktuellen &Unterschied" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Info ber WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Alle Rechte vorbehalten." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besuchen Sie die WinMerge Homepage!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Mitwirkende" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Dateien oder Ordner auswhlen..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Links:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Suchen..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Rechts:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "S&uchen..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Auswhlen..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Entpacker:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "Auswhlen..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "Unter&ordner einbeziehen" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Abbrechen" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Hilfe" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Zu vergleichende Dateien oder Ordner" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Datenbank:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Nutzer:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Passwort:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Verbindung zum Ziel-VSS-Projekt" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Auf alle Objekte anwenden" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Auschecken" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Speichern unter..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Versionskontrolle" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Versionskontrollsystem" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pfad zu cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Allgemein" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Anzeige automatisch auf den ersten Unterschied &positionieren" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Startbildschirm &deaktivieren" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fenster mit &ESC schlieen" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "P&fade im ffnen-Dialog automatisch berprfen" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Nur eine Programm-Instanz zulassen" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "&Nachfragen, wenn mehrfache Fenster geschlossen werden" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Datei&zeit beim Dateivergleich bewahren" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "ffnen-Dialog Auto&vervollstndigung:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Aktivieren mehrfacher Vergleichsfenster fr" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&Ordnervergleich" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "D&ateivergleich" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" "WinMerge erlaubt das Verstecken von einigen hufigen Meldungen.\n" "Drcken Sie die Zurcksetzen-Schaltflche um alle Meldungen wieder sichtbar zumachen." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Zurcksetzen" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Sprache" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Verfgbare Sprachen:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Suchen" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Suchen nach:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "&Nur ganze Wrter" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "&Gro-/Kleinschreibung beachten" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Regulre Ausdrcke" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Richtung" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Hoch" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Runter" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Weitersuchen" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Ersetzen" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Erse&tzen durch:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "Nicht am Dateiende um&brechen" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Ersetze in" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Auswahl" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "&ganzer Datei" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "E&rsetzen" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "A&lle ersetzen" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Auschecken" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Kommentare" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Einchecken nach Auschecken" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Zeilenfilter" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Zeilenfilter aktivieren" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulre Ausdrcke (einer pro Zeile):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Speichern" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Neu" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Bearbeiten" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Entfernen" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Farben" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Unterschied:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Selektierter Unterschied:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Hintergrund" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Gelscht" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Ignorierter Unterschied:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Verschoben:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Verschoben (Selektiert):" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Wortunterschied:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Wortunterschied (Selektiert):" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Vorgaben" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "System" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Gelschte Dateien in den &Papierkorb verschieben" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integration" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Zum Explorer-Kontextmen &hinzufgen" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Er&weitertes Men verwenden" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Standardmig &Unterordner einbeziehen" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Externer Editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filterordner:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Su&chen..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Temporrer Dateienordner" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Temporrer Ordner vom S&ystem:" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "&Benutzerdefinierter Ordner:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "S&uchen..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Patch Generator" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Datei &1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Datei &2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Ver&tauschen" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "A&n vorhandene Datei anfgen" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Ergebnis:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&yle:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Leerzeichen" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&Vergleichen" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "nderung &ignorieren" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "&Alle ignorieren" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Leer&zeilen ignorieren" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Gro-/Kleinschreibung beachten" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "&Befehlszeile einfgen" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Im e&xternen Editor ffnen" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Spalten anpassen" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Nach &oben" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Nach &unten" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Entpacker auswhlen" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Datei-Entpacker:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zeigt alle Entpacker, nicht die Erweiterung berprfen." -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Erweiterungsliste:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Beschreibung:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Ordnervergleichsfortschritt" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Vergleiche Objekte..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Objekte verglichen:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Objekte gesamt:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Gehe nach" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&Nach:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Datei" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Ziel" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&Zeile" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Unterschied" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Gehe" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Vergleichen" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Leerzeichen" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Vergleichen" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "nderung &ignorieren" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "&Alle ignorieren" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "&Leerzeilen ignorieren" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "&Gro-/Kleinschreibung ignorieren" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Zeilen&umbruchunterschiede (Windows/Unix/Mac) ignorieren" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Verschobene &Blcke erkennen" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&hnliche Zeilen angleichen" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoriere &Zeitunterschiede kleiner als 3 Sekunden" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Vergleichs&methode:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "Nach dem ersten Unterschied &stoppen" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Kommentare filtern" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Syntax hervorheben" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Automatisches Aktualisieren" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulatoren" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tabulator-Gre:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Tabulatoren &einfgen" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&Leerzeichen einfgen" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Zeilenunterschied-Frbung" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Zeilenunterschied anzeigen" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&Zeichen-Ebene" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&Wort-Ebene:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Dateifilter" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testen" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Installieren..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Neu..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Bearbeiten..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Lschen..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Genderte Dateien speichern?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Linke Datei" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "nderungen &speichern" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "nderungen &verwerfen" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Rechte Datei" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "nderungen s&peichern" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "nderungen ver&werfen" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Alle verwerfen" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Zeichensatz" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Standard-Zeichensatz" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Whlen Sie den Standard-Zeichensatz, der angenommen wird, wenn man Nicht-Unicode Dateien ldt:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2021,33 +2032,33 @@ msgstr "" "Ermitteln des Zeichensatzes fr folgende Dateien: .html, .rc, .xml \n" "Bentigt einen Neustart des Programmes." -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "System-Zeichensatz" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Entsprechend der WinMerge Benutzeroberflche" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Benutzerdefinierter Zeichensatz:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Archiv-Untersttzung deaktiviert" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Die 7-Zip Version konnte nicht ermittelt werden. (Nicht installiert?)" # Removed \n because of lack of space! -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2055,12 +2066,12 @@ msgid "" msgstr "" "Archiv-Untersttzung bentigt eine Installation von 7-Zip 3.11 (oder neuer) auf Ihrem Computer, oder die notwendigen Komponenten mssen fr den Einzelbetrieb ins Programm-Verzeichnis kopiert werden." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Es muss sich auch ein geeignetes Schnittstellen-Plugin (Merge7z*.dll) im Pfad befinden." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2069,12 +2080,12 @@ msgstr "" "Bitte verwenden Sie die unten empfohlene 7-Zip Version, bis Schnittstellen-Plugins\n" "fr neuere Versionen verfgbar sind." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2083,54 +2094,54 @@ msgstr "" "Plugin bentigt\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Empfohlene Version von 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "Vorhanden" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip Installation auf Ihrem Computer:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "Keine" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "Fehlend" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip Einzelbetrieb-Komponenten:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "Veraltet" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins im Pfad:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2139,488 +2150,499 @@ msgstr "" "Diese &Meldung nicht erneut anzeigen.\n" "(Sie knnen diese Meldung jederzeit vom Hilfe-Men aus aufrufen.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Plugin Download" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Einstellungen" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategorien" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importieren..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportieren..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Schlsselwrter:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Funktionsnamen:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Kommentare:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nummern:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatoren:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Zeichenketten:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprozessor:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Benutzer 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Benutzer 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Fett" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Ordnervergleichs-Bericht" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "&Berichtsdatei:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Suchen..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "In die &Zwischenablage kopieren" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Gemeinsamer oder privater Filter" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Welche Art von Filter mchten Sie erzeugen?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Gemeinsamer Filter (fr alle Benutzer auf diesem Computer)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Privater Filter (nur fr den aktuellen Benutzer)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Archiv-Untersttzung" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Die Archiv-Untersttzung erfordert das installierte 7-Zip Plugin:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "7-Zip Plugin herunterladen" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Archiv-Untersttzung aktivieren" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Eigenstndiges 7-Zip verwenden, wenn vorhanden" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "&Lokales 7-Zip vom WinMerge-Ordner verwenden" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Archivtyp aus der Dateisignatur ermitteln" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Vergleichsstatistik" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Ordner:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Dateien:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Unterschiedlich" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binr:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Eindeutig" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Links:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Rechts:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identisch" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Gesamt:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Schlieen" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Betrifft" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Betrifft)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Zeichensatz auswhlen fr" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Datei laden:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Datei &speichern:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Gleichen Zeichensatz fr Beide verwenden" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "An&wenden" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Abbrechen" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Filter testen" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Teste Filter ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Text zum Testen:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Ordnername" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Ergebnis:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Testen" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Schlieen" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Benutzerdefinierte Textfarben verwenden" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Benutzerdefinierte Textfarben" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Leerzeichen:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Normaler Text:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Auswahl:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Pfade" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Schreib&geschtzt" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Schreibg&eschtzt" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "ffnen..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Speichern..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Sicherungsdateien" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Sicherungsdateien erzeugen beim:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Sicherungsdateien erzeugen im:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Ordner der &ursprnglichen Datei" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Globalen Sicherungsordner:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Sicherungsdateiname:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr ".bak-&Erweiterung anhngen" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "&Zeitstempel anhngen" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Kopieren besttigen" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Wollen Sie wirklich XXX Objekte kopieren?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Von links" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Nach rechts" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Nein" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040704e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x407, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Bereit" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "ER" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "FEST" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "RF" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "B" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "MA" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2629,7 +2651,7 @@ msgstr "" "Erzeugt leere Dokumente.\n" "Neue Dokumente (Strg+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2638,7 +2660,7 @@ msgstr "" "ffnet ein bestehendes Dokument.\n" "ffnen (Strg+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2647,7 +2669,7 @@ msgstr "" "Schliet das aktive Dokument.\n" "Schlieen" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2656,7 +2678,7 @@ msgstr "" "Speichert das aktive Dokument.\n" "Speichern (Strg+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2665,7 +2687,7 @@ msgstr "" "Speichert das aktive Dokument unter neuem Namen.\n" "Speichern unter" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2674,7 +2696,7 @@ msgstr "" "ndert die Seiteneinstellungen.\n" "Seite einrichten" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2683,7 +2705,7 @@ msgstr "" "ndert die Druckerkonfiguration.\n" "Drucker einrichten" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2692,7 +2714,7 @@ msgstr "" "Druckt das aktive Dokument.\n" "Drucken" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2701,12 +2723,12 @@ msgstr "" "Zeigt die Druckvorschau an.\n" "Druckvorschau" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Zeigt alle versteckten Objekte wieder an." -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2715,32 +2737,32 @@ msgstr "" "ffnet eine Projektdatei.\n" "Projektdatei (Strg+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu ffnen." -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Unbekannter Fehler beim Versuch die Projektdatei zu speichern." -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Projektdatei" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Projektdatei erfolgreich geladen." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Projektdatei erfolgreich gespeichert." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2749,7 +2771,7 @@ msgstr "" "Speichert die aktuellen Pfade und Einstellungen in eine Projektdatei.\n" "Projektdatei speichern" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2758,7 +2780,7 @@ msgstr "" "Zeigt Programm-Informationen, Versionsnummer und Copyright an.\n" "Info" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2767,27 +2789,27 @@ msgstr "" "Verlt die Anwendung; fragt, ob Dokumente gespeichert werden sollen.\n" "Beenden" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "ffnet dieses Dokument." -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2796,7 +2818,7 @@ msgstr "" "Wechselt zum nchsten Fensterausschnitt.\n" "Nchster Ausschnitt" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2805,7 +2827,7 @@ msgstr "" "Springt zum vorherigen Fensterausschnitt zurck.\n" "Vorheriger Ausschnitt" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2814,7 +2836,7 @@ msgstr "" "Ordnet die Fenster berlappend an.\n" "berlappende Fenster" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2823,7 +2845,7 @@ msgstr "" "Ordnet die Fenster untereinander an.\n" "Fenster untereinander" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2832,7 +2854,7 @@ msgstr "" "Ordnet die Fenster nebeneinander an.\n" "Fenster nebeneinander" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2841,7 +2863,7 @@ msgstr "" "Kopiert die Markierung und bertrgt sie in die Zwischenablage.\n" "Kopieren" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2850,7 +2872,7 @@ msgstr "" "Entfernt die Markierung und bertrgt sie in die Zwischenablage.\n" "Ausschneiden" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2859,7 +2881,7 @@ msgstr "" "Sucht den angegebenen Text.\n" "Suchen" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2868,7 +2890,7 @@ msgstr "" "Fgt den Inhalt der Zwischenablage ein.\n" "Einfgen" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2877,7 +2899,7 @@ msgstr "" "Wiederholt die letzte Aktion.\n" "Wiederholen" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2886,7 +2908,7 @@ msgstr "" "Ersetzt einen bestimmten Text durch einen anderen.\n" "Ersetzen" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2895,7 +2917,7 @@ msgstr "" "Markiert das gesamte Dokument.\n" "Alles markieren" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2904,7 +2926,7 @@ msgstr "" "Macht die letzte Aktion rckgngig.\n" "Rckgngig (Strg+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2913,7 +2935,7 @@ msgstr "" "Wiederholt die vorher rckgngig gemachte Aktion.\n" "Wiederherstellen (Strg+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2922,7 +2944,7 @@ msgstr "" "Blendet die Symbolleiste ein oder aus.\n" "Symbolleiste ein-/ausschalten" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2931,7 +2953,7 @@ msgstr "" "Blendet die Statusleiste ein oder aus.\n" "Statusleiste ein-/ausschalten" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2940,62 +2962,62 @@ msgstr "" "Blendet die Tab-Leiste ein oder aus.\n" "Tab-Leiste ein-/ausschalten" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Ausschnitte automatisch in der Gre anpassen.\nAusschnitte fixieren" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "ndert die Fenstergre." -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "ndert die Position des Fensters." -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Verkleinert das Fenster zu einem Symbol." -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Vergrert das Fenster zu voller Gre." -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Wechselt zum nchsten Dokumentfenster." -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Wechselt zum vorherigen Dokumentfenster." -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Schliet das aktive Fenster und fordert zur Dokumentspeicherung auf." -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Stellt das Fenster in seiner normalen Gre wieder her." -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Aktiviert die Task-Liste." -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktiviert dieses Fenster." -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3004,33 +3026,33 @@ msgstr "" "Beendet die Seitenansicht.\n" "Seitenansicht beenden" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nDateivergleich\n\n\n\nWinMerge.Dateivergleich\nWinMerge Dateivergleich" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nOrdnervergleich\n\n\n\nWinMerge.Ordnervergleich\nWinMerge Ordnervergleich" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Mischen der Zeilenumbruch-Formate erlauben" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Beliebige Taste" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Rechtsklick auf den Pfad zum Kopieren." -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3039,152 +3061,152 @@ msgstr "" "Entwickler:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge kommt mit ABSOLUT KEINER GARANTIE. Es ist freie Software und Sie knnen sie unter bestimmten Bedingungen weiter vertreiben; fr Details sehen Sie sich die GNU General Public License unter dem Hilfe-Men an." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Abbruch" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Wiederholen" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorieren" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "&Alle ignorieren" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Ja zu &allen" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nein" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nein zu a&llen" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Fortsetzen" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "ber&springen" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "&Alle berspringen" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Diese &Meldung nicht erneut anzeigen." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Diese &Frage nicht erneut stellen." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Syntaxfarben" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Textfarben" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Versionskontrolle" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Nach:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Von links:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Nach links:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Von rechts:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Nach rechts:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Version %1 - Deutsch" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Eigenschaften (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle Meldungen werden wieder angezeigt." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Datei(en) dieses Vergleichs wurden gendert. Einige Einstellungen werden erste wirksam, wenn der aktuelle Dateivergleich neu gestartet wurde." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Die nderung der Schriftart wird auf keines der offenen Diff-Fenster angewendet werden." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3195,7 +3217,7 @@ msgstr "" "\n" "Bitte benutzen Sie Werte von 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3206,127 +3228,129 @@ msgstr "" "\n" "Bitte starten Sie WinMerge nach dem Zurcksetzen neu." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "ffnen" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programme|*.exe;*.bat;*.cmd|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle Dateien (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektdatei (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Einstellungsdateien (*.ini)|*.ini|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textdateien (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-Dateien (*.htm,*.html)|*.htm;*.html|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-Dateien (*.xml)|*.xml|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Voller Inhalt" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Schneller Inhalt" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "nderungsdatum" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "nderungsdatum und Gre" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Gre" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Name" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Pfad" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Beschreibung" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Dateinamen fr neuen Filter auswhlen" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Dateifilter (*.flt)|*.flt|Alle Dateien (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3339,7 +3363,7 @@ msgstr "" "Bitte kopieren Sie die Datei %1 in den Filterordner:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3352,7 +3376,7 @@ msgstr "" "\n" "Bitte stellen Sie sicher, dass der Ordner existiert und beschreibbar ist." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3363,7 +3387,7 @@ msgstr "" "\n" "Bitte whlen Sie den Filterordner unter Einstellungen/System aus." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3376,12 +3400,12 @@ msgstr "" "\n" "Ist die Datei mglicherweise schreibgeschtzt?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Zu installierenden Filter auswhlen" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3392,208 +3416,223 @@ msgstr "" "\n" "Die Filterdatei konnte nicht in den Filterordner kopiert werden." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterdatei existiert bereits. Existierenden Filter berschreiben?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Regulrer Ausdruck" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Pfad zu Cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Pfad zu SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Ordnervergleichs-Ergebnisse" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Dateivergleich" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Unbenannt links" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Unbenannt rechts" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Deren Datei" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Meine Datei" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "berprfe Dateien..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "ffne Auswahl" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopiere links nach rechts" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopiere rechts nach links" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopiere alles nach links" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopiere alles nach rechts" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopiere Dateien..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Lsche Dateien..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Verschiebe Dateien..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Erzeugt den Bericht..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ze: %s Sp: %d/%d Zchn: %d/%d Format: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Zeile: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ze: %s Sp: %d/%d Zchn: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Merge" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Unterschied %1 von %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 Unterschiede gefunden" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 Unterschied gefunden" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 von %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Objekte: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Whlen Sie zwei Dateien oder Ordner zum Vergleichen aus" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Ordnerauswahl" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Zwei Ordner oder zwei Dateien zum Vergleichen auswhlen." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Der linke Pfad ist ungltig!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Der rechte Pfad ist ungltig!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Beide Pfade sind ungltig!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zwei Dateien zum Aktivieren der Entpacker-Auswahl auswhlen." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Datei und Ordner knnen nicht verglichen werden!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Datei nicht gefunden: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Datei nicht entpackt: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3606,12 +3645,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Fehler beim Analysieren der Konflikt-Datei." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3622,32 +3661,32 @@ msgstr "" "%1\n" "ist keine Konflikt-Datei." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Speichern unter" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "nderungen in %1 speichern?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 ist als Schreibgeschtzt markiert. Mchten Sie die schreibgeschtzte Datei berschreiben? (Nicht unter neuem Dateinamen speichern.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Fehler beim Prfen des Zielverzeichnisses auf Schreibschutz" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Fehler beim Erstellen einer Sicherheitskopie" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3660,7 +3699,7 @@ msgstr "" "\n" "Trotzdem fortfahren?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3677,7 +3716,7 @@ msgstr "" "\t-einen anderen Dateinamen verwenden? (Ok drcken)\n" "\t-die aktuelle Operation abbrechen? (Abbruch drcken)" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3692,7 +3731,7 @@ msgstr "" "\n" "Mchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3707,7 +3746,7 @@ msgstr "" "\n" "Mchten Sie die ungepackte Version in einer anderen Datei speichern?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3722,7 +3761,7 @@ msgstr "" "\n" "Genderte Datei berschreiben?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3731,7 +3770,7 @@ msgstr "" "%1\n" "ist als schreibgeschtzt markiert. Mchten Sie das schreibgeschtzte Objekt berschreiben?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3746,17 +3785,17 @@ msgstr "" "\n" "Wenn Sie die Dateien aktualisieren wollen, mssen Sie den aktuellen Dateivergleich schlieen und neu aufrufen." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Speichere linke Datei unter" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Speichere rechte Datei unter" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3767,42 +3806,42 @@ msgstr "" "\n" "Aktualisieren Sie die Dokumente, bevor Sie fortfahren." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Sie mssen einen SourceSafe-Projektpfad angeben um fortzufahren (z.B.: $/MeinProjekt)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Dateien auschecken vom VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Das Versionierungssystem meldete einen Fehler beim Versuch die Datei auszuchecken. Der Vorgang kann nicht fortgesetzt werden..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Fehler beim Ausfhren eines Befehles des Versionierungssystems." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Der VSS-Arbeitsordner und die Position der aktuellen Datei stimmen nicht berein. Fortsetzen?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Keine VSS Datenbank(en) gefunden!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Fehler vom VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3813,7 +3852,7 @@ msgstr "" " Bitte berprfen Sie die Konfiguration der verwendeten Ansicht.\n" " Auschecken rckgngig machen?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3822,170 +3861,169 @@ msgstr "" "Das Versionierungssystem meldete einen Fehler beim Versuch das Auschecken der Datei rckgngig zu machen.\n" " Bitte berprfen Sie die Konfiguration der verwendeten Ansicht." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Keines" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (kleiner als 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 und hher)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "An Leerzeichen abbrechen" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "An Leerzeichen oder Interpunktion abbrechen" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiert ausgewhltes Objekt ins angegebene Verzeichnis." -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiert ausgewhltes Objekt in ein beliebiges Verzeichnis." -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Lscht ausgewhltes Objekt auf der linken Seite." -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Lscht ausgewhltes Objekt auf der rechten Seite." -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Lscht ausgewhlte Objekte auf beiden Seiten." -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Versteckt ausgewhlte Objekte (dynamischer Filter)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Nennt ausgewhltes Objekt auf beiden Seiten um." -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Rechts nach Links (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Links nach Rechts (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Rechts nach Links (%1 von %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Links nach Rechts (%1 von %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Links nach... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Rechts nach... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Links nach... (%1 von %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Rechts nach... (%1 von %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Links (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Rechts (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Beide (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Links (%1 von %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Rechts (%1 von %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Beide (%1 von %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Zielordner auswhlen." -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Linke Seite - Zielordner auswhlen:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Rechte Seite - Zielordner auswhlen:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Dateien betroffen)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 von %2 Dateien betroffen)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3997,17 +4035,17 @@ msgstr "" "%1\n" "lschen?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Wollen Sie wirklich kopieren:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Wollen Sie wirklich %d Objekte kopieren:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4026,458 +4064,473 @@ msgstr "" "\n" "Bitte aktualisieren Sie den Vergleich." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "ffne linke Datei" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "ffnet die linke Datei im externen Editor." -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "ffne linke Datei mit..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "ffne rechte Datei" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "ffnet die rechte Datei im externen Editor." -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "ffne rechte Datei mit..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Konnte externen Editor nicht ausfhren: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Unbekannte Erweiterung beim externen Editor: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiere Dateinamen in die Zwischenablage" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiere linken Pfad in die Zwischenablage" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiere rechten Pfad in die Zwischenablage" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiere beide Pfade in die Zwischenablage" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Unbekanntes Archiv Format" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Fgt Objekte von der linken Seite zum Archiv hinzu." -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Fgt Objekte von der rechten Seite zum Archiv hinzu." -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Fgt Objekte von beiden Seiten zum Archiv hinzu." -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Fgt unterschiedliche Objekte zum Archiv hinzu (beide Seiten)." -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Verschiebt die ausgewhlte Datei in ein beliebiges Verzeichnis." -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Verschiebt die ausgewhlte Datei in ein beliebiges Verzeichnis." -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Dateiname" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Ordner" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Vergleichsergebnis" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Linkes Datum" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Rechtes Datum" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Erweiterung" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Linke Gre" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Rechte Gre" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Rechte Gre (Kurz)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Linke Gre (Kurz)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Linkes Erstellungsdatum" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Rechtes Erstellungsdatum" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Neuere Datei" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Linke Dateiversion" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Rechte Dateiversion" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Kurz-Ergebnis" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Linke Attribute" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Rechte Attribute" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Linkes Zeilenende" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Rechtes Zeilenende" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Linke Kodierung" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Rechte Kodierung" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Ignorierte Unter." -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Unterschiede" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binr" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Dateien knnen nicht verglichen werden" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Objekt abgebrochen" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Datei bersprungen" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Ordner bersprungen" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Nur Links: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Nur Rechts: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binrdateien sind identisch" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binrdateien sind unterschiedlich" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Dateien sind unterschiedlich" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Nur Links" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Nur Rechts" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Fehler" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Ausfhrungszeit: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 Objekt ausgewhlt" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 Objekte ausgewhlt" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Dateiname oder Ordnername." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Unterordnername, wenn Unterordner vorhanden sind." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Vergleichsergebnis, langes Format." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Linkes nderungsdatum." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Rechtes nderungsdatum." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Dateierweiterung." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Linke Dateigre in Byte." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Rechte Dateigre in Byte." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Linke Dateigre gekrzt." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Rechte Dateigre gekrzt." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Linkes Erstellungsdatum." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Rechtes Erstellungsdatum." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Zeigt, welche Seite ein neueres nderungsdatum hat." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Linke Dateiversion, nur fr einige Dateitypen." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Rechte Dateiversion, nur fr einige Dateitypen." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Vergleichsergebnis, kurzes Format." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Linke Attribute." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Rechte Attribute." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Linker Zeilenenden-Typ" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Rechter Zeilenenden-Typ" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Linke Zeichensatz-Kodierung." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Rechte Zeichensatz-Kodierung." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Anzahl der ignorierten Unterschiede in der Datei. Diese Unterschiede werden von WinMerge ignoriert und knnen nicht vermischt werden." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Anzahl der Unterschiede in der Datei. Die Zahl enthlt nicht die ignorierten Unterschiede." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zeigt ein Asterisk (*), wenn die Datei binr ist." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Vergleiche %1 mit %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Komma-getrennte Liste" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Tab-getrennte Liste" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Einfaches HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Einfaches XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Der Bericht existiert bereits. berschreiben?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4486,32 +4539,32 @@ msgstr "" "Fehler beim Erzeugen des Berichtes:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Der Bericht wurde erfolgreich geschrieben." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Die gleiche Datei ist in beiden Feldern ausgewhlt." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Die ausgewhlten Dateien sind identisch." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Beim Vergleichen der Dateien ist ein Fehler aufgetreten." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporre Dateien konnten nicht erzeugt werden. berprfen Sie Ihre Einstellungen fr temporre Dateien." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4526,7 +4579,7 @@ msgstr "" "\n" "Hinweis: Wenn Sie immer alle Zeilenumbruch-Formate als Gleichwertig behandeln wollen, aktivieren Sie die Option 'Zeilenumbruchunterschiede ignorieren' unter 'Vergleichen' im Einstellungsdialog (erreichbar unter Bearbeiten/Einstellungen)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4537,22 +4590,22 @@ msgstr "" " Mit den aktuellen Einstellungen werden sie zum Hauptformat vereinheitlicht.\n" " Mchten Sie die Einstellungen ndern und die unterschiedlichen Zeilenumbrche erhalten?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ein Fehler trat beim Prediffing der Datei '%1' mit dem Plugin '%2' auf. Das Prediffing wird daher nicht mehr angewendet." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Der ausgewhlte Ordner ist ungltig." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kann keine Binrdatei im Editor ffnen." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4567,7 +4620,7 @@ msgstr "" "%1\n" "auf der anderen Seite erzeugen und die Ordner ffnen?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4578,132 +4631,132 @@ msgstr "" "Das Anzeigen jeder Datei im eigenen Zeichensatz erlaubt eine bessere Darstellung, aber das Mischen/Kopieren ist gefhrlich.\n" "Wollen Sie beide Dateien behandeln, als wren sie im gleichen Zeichensatz (empfohlen)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Warnung: Die Dateien haben unterschiedliche Kodierungen, links=%s und rechts=%s, und das Vermischen fhrt mglicherweise zu Informationsverlusten." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informationsverlust wegen Kodierungsfehlern: Beide Dateien" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informationsverlust wegen Kodierungsfehlern: Rechte Datei" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informationsverlust wegen Kodierungsfehlern: Linke Datei" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Kein Unterschied" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Zeilen-Unterschied" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 Vorkommen ersetzt." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kann \"%s\" nicht finden" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopiere vollstndigen Pfad" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopiere Dateiname" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Positionsleiste" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Unterschiedsleiste" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Die Patchdatei wurde erfolgreich geschrieben." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. Objekt ist nicht vorhanden oder ist ein Verzeichnis!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Die Patchdatei existiert bereits. berschreiben?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 Dateien ausgewhlt]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unified" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Konnte nicht in die Datei %1 schreiben." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Der angegebene Ausgabepfad ist kein absoluter Pfad: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Geben Sie eine Ausgabedatei an." -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kann keine Patchdatei von Binrdateien erzeugen." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kann keine Patchdatei von Verzeichnissen erzeugen." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4714,17 +4767,17 @@ msgstr "" "\n" "Das Erzeugen eines Patches erfordert, dass es keine ungespeicherten nderungen in den Dateien gibt." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Der Ordner existiert nicht." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Die aktuellen Resultate des Ordnervergleichs werden gelscht." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4735,7 +4788,7 @@ msgstr "" "Alle erforderlichen Komponenten (7-zip und/oder Merge7z*.dll) fr die Archiv-Untersttzung knnen nicht gefunden werden.\n" "Entnehmen Sie dem Handbuch mehr Informationen ber die Archiv-Untersttzung und wie sie aktiviert wird." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4744,7 +4797,7 @@ msgstr "" "\n" "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen deaktiviert." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4753,37 +4806,37 @@ msgstr "" "\n" "Hinweis: Die 7-Zip Integration ist in den WinMerge-Einstellungen auf eigenstndige Arbeitsweise beschrnkt." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Datei zum Exportieren auswhlen" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Datei zum Importieren auswhlen" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Einstellungen aus der Datei importiert." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Einstellungen in die Datei exportiert." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Konnte die Einstellungen nicht aus der Datei importieren." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Konnte die Einstellungen nicht in die Datei exportieren." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4794,473 +4847,493 @@ msgstr "" "\n" "Mchten Sie wirklich fortfahren?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Regulrer Ausdruck Fehler" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Keine bereinstimmung" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Ungltiger regulrer Ausdruck" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Ungltiges Vergleichszeichen" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Ungltiger Zeichenklasse-Name" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Nachfolgender Backslash" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Ungltiger Rckbezug" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Unpassende [ oder [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Unpassende ( oder \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Unpassende \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Ungltiger Inhalt von \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Ungltiges Bereichsende" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Platz im Hauptspeicher reicht nicht aus" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Ungltiger vorhergehender regulrer Ausdruck" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Vorzeitiges Ende des regulren Ausdruckes" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Regulrer Ausdruck zu gro" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Unpassende ) oder \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Westeuropisch" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Osteuropisch" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Ostasiatisch" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SO & SW-Asiatisch" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Mitteleuropisch" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Nicht anwendbar" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Kyrillisch" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Lateinamerikanisch" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabisch" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Griechisch" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltisch" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latein 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Griechisch 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latein 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Kyrillisch" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Trkisch" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugiesisch" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islndisch" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrisch" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Franzsisch (Kanada)" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordisch" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Kyrillisch CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Griechisch 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thailndisch" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanisch" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Vereinfachtes Chinesisch" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Koreanisch" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditionelles Chinesisch" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latein 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Kyrillisch (Slawisch)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latein 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Griechisch" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latein 5 (Trkisch)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrisch" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabisch" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltisch" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamesisch" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Rmisch" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Griechisch" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Kyrillisch" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Mitteleuropisch" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Trkisch" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "hnlich ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "hnlich ISO-8859-2" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "hnlich ISO-8859-2" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "hnlich ISO-8859-2" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "hnlich ISO-8859-2" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Gemischt" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Speichert die linke Datei." -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Speichert die rechte Datei." -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Speichert die linke Datei unter..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Speichert die rechte Datei unter..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "ndert den linken Schreibschutz-Status." +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "ndert den rechten Schreibschutz-Status." +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konvertiert Zeilenumbrche ins Windows-Format." -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konvertiert Zeilenumbrche ins Unix-Format." -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konvertiert Zeilenumbrche ins Macintosh-Format." -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Wechselt zwischen Bearbeitungs- und Merging-Modus." -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5269,12 +5342,12 @@ msgstr "" "Zeigt und passt die Dateikodierungs-Eigenschaften an.\n" "Dateikodierungs-Eigenschaften" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "ffnet und lst eine Konflikt-Datei." -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5283,7 +5356,7 @@ msgstr "" "Markiert den unterschiedlichen Bereich in der aktuellen Zeile.\n" "Unterschied in der aktuellen Zeile" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5292,7 +5365,7 @@ msgstr "" "Geht zur Zeile oder zum Unterschied.\n" "Gehe nach (Strg+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5301,7 +5374,7 @@ msgstr "" "Nimmt Programm-Einstellungen vor.\n" "Einstellungen" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5310,37 +5383,37 @@ msgstr "" "Aktualisiert die Anzeige\n" "Aktualisieren (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiert die ausgewhlten Zeilen in die Zwischenablage und fgt Zeilennummern vor den Zeilenanfang." -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Aktualisiert die ausgewhlten Objekte." -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Lesezeichen setzen oder lschen." -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Zum nchsten Lesezeichen gehen." -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Zum vorherigen Lesezeichen gehen." -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Alle Lesezeichen lschen." -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5349,7 +5422,7 @@ msgstr "" "Objekte anzeigen die exakt gleich sind.\n" "Identische Objekte" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5358,7 +5431,7 @@ msgstr "" "Objekte anzeigen die Unterschiede haben.\n" "Unterschiedliche Objekte anzeigen" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5367,7 +5440,7 @@ msgstr "" "Zeigt eindeutige Objekte auf der linken Seite an.\n" "Eindeutige Objekte links anzeigen" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5376,7 +5449,7 @@ msgstr "" "Zeigt eindeutige Objekte auf der rechten Seite an.\n" "Eindeutige Objekte rechts anzeigen" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5385,7 +5458,7 @@ msgstr "" "Zeigt Binrdateien an.\n" "Binrdateien anzeigen" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5394,7 +5467,7 @@ msgstr "" "Zeigt bersprungene Objekte an.\n" "bersprungene Objekte anzeigen" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5403,7 +5476,7 @@ msgstr "" "Whlt die Schrift fr die Anzeige.\n" "Schrift auswhlen" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5412,27 +5485,27 @@ msgstr "" "Stellt die Schrift fr die Anzeige zurck auf die Standard-Systemschrift.\n" "Standard-Schrift verwenden" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Zeigt Leerzeichen an." -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Blendet die Unterschiedsleiste ein oder aus." -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Die Positionsleiste zeigt gesamte Abbildungen von den Dateien." -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zeigt die Vergleichsstatistik an." -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5441,7 +5514,7 @@ msgstr "" "Whlt die Sprache der Benutzeroberflche.\n" "Sprache" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5450,12 +5523,12 @@ msgstr "" "Zeigt Unterschiede innerhalb der Zeilen mit unterschiedlicher Farbe an.\n" "Zeilenunterschied anzeigen" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Vertauscht die Position der beiden Ausschnitte." -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5464,7 +5537,7 @@ msgstr "" "Zeigt Zeilennummern an.\n" "Zeilennummern anzeigen" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5473,7 +5546,7 @@ msgstr "" "Aktiviert das Umbrechen der Zeilen.\n" "Zeilen umbrechen" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5482,22 +5555,22 @@ msgstr "" "Zeigt Markierungsrnder fr beide Ausschnitte an.\n" "Markierungsrnder anzeigen" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Textgre erhhen." -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Textgre verringern." -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Textzoom auf Standardgre zurcksetzen." -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5506,7 +5579,7 @@ msgstr "" "Bewegt die Anzeige zum vorigen Unterschied.\n" "Vorheriger Unterschied (Alt+Hoch)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5515,7 +5588,7 @@ msgstr "" "Bewegt die Anzeige zum nchsten Unterschied.\n" "Nchster Unterschied (Alt+Runter)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5524,7 +5597,7 @@ msgstr "" "Bewegt die Anzeige zum ersten Unterschied.\n" "Erster Unterschied (Alt+Pos1)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5533,7 +5606,7 @@ msgstr "" "Bewegt die Anzeige zum aktuellen Unterschied.\n" "Aktueller Unterschied (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5542,7 +5615,7 @@ msgstr "" "Bewegt die Anzeige zum letzten Unterschied.\n" "Letzter Unterschied (Alt+Ende)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5551,7 +5624,7 @@ msgstr "" "Kopiert den ausgewhlten Text in die rechte Datei.\n" "Nach rechts kopieren (Alt+Rechts)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5560,7 +5633,7 @@ msgstr "" "Kopiert den ausgewhlten Text in die linke Datei.\n" "Nach links kopieren (Alt+Links)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5569,7 +5642,7 @@ msgstr "" "Kopiere Unterschied nach Rechts und springe zum nchsten Unterschied.\n" "Nach rechts kopieren und fortschreiten (Strg+Alt+Rechts)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5578,7 +5651,7 @@ msgstr "" "Kopiere Unterschied nach Links und springe zum nchsten Unterschied.\n" "Nach links kopieren und fortschreiten (Strg+Alt+Links)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5587,7 +5660,7 @@ msgstr "" "Kopiert alle Unterschiede in die rechte Datei.\n" "Alles nach rechts kopieren" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5596,72 +5669,77 @@ msgstr "" "Kopiert alle Unterschiede in die linke Datei.\n" "Alles nach links kopieren" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Lscht ausgewhlte Objekte von beiden Seiten." -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Vergleicht ausgewhlte Objekte. (Vergleicht das erste Objekt, wenn mehrere Objekte ausgewhlt wurden.)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Auswhlen und wieder ordnen der Spalten vom Ordnervergleich." -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Erzeugt eine Patchdatei." -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Auswhlen und modifizieren von Filtern." -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Erzeugt einen Bericht von den Vergleichsergebnissen." -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Der Benutzer whlt den Entpacker (kein Entpacken beim Ordnervergleich)." -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Der passende Entpacker wird auf beide Dateien angewendet (nur eine Datei bentigt die Erweiterung)." -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Auswhlen eines Entpackers zum Bearbeiten dieser Datei." -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Kein Prediffer (Normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Vorgeschlagene Plugins" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Andere Plugins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Entldt alle Plugins und ldt sie neu (fr Entwickler)." -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5670,12 +5748,12 @@ msgstr "" "Aktiviert die nchste sichtbare Datei\n" "Aktiviere nchste Datei" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Schliet alle geffneten Fenster." -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5684,22 +5762,22 @@ msgstr "" "ffnet die WinMerge Hilfe.\n" "WinMerge Hilfe" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Ausgeben der aktuellen WinMerge Versionsinformationen und Konfiguration in eine Textdatei." -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Zeigt die GNU General Public License an." -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5708,7 +5786,7 @@ msgstr "" "ffnet das Versionshinweisen-Dokument.\n" "Versionshinweise" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5717,262 +5795,267 @@ msgstr "" "ffnet die bersetzungen-Webseite.\n" "bersetzungen" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Plugin Einstellungen" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Kein Prediffer." -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediff ist mglich." -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nicht gefunden - .sct Skripte deaktiviert." -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "ffnet die Datei mit registrierter Anwendung." -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "ffnet die Datei mit externem Editor." -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "ffnet die Datei mit einem bestimmten Programm." -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Keine verschobene Blcke anzeigen." -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Alle verschobene Blcke anzeigen." -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Verschobenen Block nur fr den aktuellen Unterschied anzeigen." -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Geht zum Unterschied unter dem Cursor." -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G&ehe nach Unterschied %1 von %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "G&ehe nach Zeile %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Deaktiviert" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Von Dateisystem" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Von MRU-Liste" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Ressourcen" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Versteckt die Symbolleiste." -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Zeigt kleine Symbolleiste an." -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Zeigt groe Symbolleiste an." diff --git a/Src/Languages/Greek.po b/Src/Languages/Greek.po index 19b720a918c..932647eb015 100644 --- a/Src/Languages/Greek.po +++ b/Src/Languages/Greek.po @@ -71,7 +71,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "&" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr " &" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "& " #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr " &..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr " &...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "& ..." @@ -160,1855 +162,1864 @@ msgid "Recent Projects" msgstr "& " #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr " &..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr " & " #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr " &" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr " &" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr " &" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "& Patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "& " -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "& " -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "& " -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "& " -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "& " -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr " &..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "& " -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr " &" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr " &\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr " &" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr " &" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr " WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr " &" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr " ..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr " &GNU" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "& WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr " & " -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr " & " -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "& " -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr " &\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr " & " -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr " & " -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr " &" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr " &" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr " & " -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr " & " -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr " & " -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr " " -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "& \tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "&\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "& \tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "& \tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "& \tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "& \tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "& \tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr " &\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr " &\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "& ..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr " &..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr " &" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr " &..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr " &" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr " &" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "& " -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "& " -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr " &\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "& ..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "& \tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "& " -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr " & " -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr " &\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "& \tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "& \tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "& " -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "& ...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr " &\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr " &\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "& " -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "& " -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "& " -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "& " -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr " & " -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr " &" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "& " -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "& " -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "& " -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr " &" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr " & \tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr " & \tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr " &" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr " &" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "& " -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "& " -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "& " -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "& ..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "& " -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "& ..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "& ..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "& ..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "&" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "& " -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr " &" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr " &" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr " &" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr " &" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr " &" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr " &" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr " " -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr " " -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr " " -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "& " -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr " " -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "& " -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr " & " -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr " WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "( )" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr " ." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr " WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr " " -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr " &" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr ":" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "&" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr " " -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr " :" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr ":" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr ":" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr ":" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr " VSS " -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr " " -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr " " -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr " ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr " " -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "& :" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "& cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr " & " -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr " & " -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "& ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "& " -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr " WinMerge " -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr " " -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "& " -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr " &" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr " " -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr " &" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr " &" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr " WinMerge . ." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr " :" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "& :" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr " & " -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr " /&" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr " &" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr " & " -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr " &" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "& :" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr " & " -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr " " -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "& " -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr " &" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr " " -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr " " -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr " " -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr " " -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr " & ( ):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr ":" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr " :" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr " " -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr ":" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr " :" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr " :" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr " :" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "& " -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr " & " -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "& " -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr " " -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr " ' " -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr " & :" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr " &:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "&..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr " " -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr " &" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "& :" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "&..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr " Patch" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr " " -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "&:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&. .:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr " &" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr " &" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr " &" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr " " -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr " /&" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr " " -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "& " -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr " " -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr " &" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr " &" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr " " -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr " :" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr " , " -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr " :" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " " -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr " ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr " :" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr " :" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr " " -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr " " -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr " &" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr " &" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr " & " -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr " /& " -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr " & (Win/Unix/Mac) " -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr " & " -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr " " -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr " &3 " -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "& :" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "& " -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr " " -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr " " -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "& " -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "& " -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "& " -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr " &" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "& " -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr " &" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr " " -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr " " -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr " &" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr " &" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr " ;" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr " " -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "& " -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "& " -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr " " -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "& " -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "& " -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "& " -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr " " -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr " Unicode" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2017,32 +2028,32 @@ msgstr "" " : .html, .rc, .xml \n" " " -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr " " -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr " WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr " :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - " -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr " 7-Zip ( ;)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2051,12 +2062,12 @@ msgstr "" " 7-Zip 3.11 , \n" " ." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr " (Merge7z*.dll) ." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2065,12 +2076,12 @@ msgstr "" " 7-Zip \n" " ." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2079,54 +2090,54 @@ msgstr "" " \n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr " 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr " 7-Zip :" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr " ()" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr " 7-Zip :" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr " :" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2135,488 +2146,499 @@ msgstr "" " &.\n" "( .)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr " " -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " " -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr " :" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr " :" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr ":" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr ":" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr ":" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr " :" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr ":" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr " 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr " 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr " " -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr " &" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "&..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "& " -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr " " -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr " ;" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr " ( )" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr " ( )" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr " " -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr " 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr " 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "& " -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr " & 7-Zip " -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr " & 7-Zip WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "& " -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr " " -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr ":" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr ":" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr ":" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr ":" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr ":" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr ":" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr ":" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "()" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr " " -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "& :" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&. :" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr " " -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr " " -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr " ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "& :" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr " &" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr " & " -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr " " -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr " :" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr " :" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr ":" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr " &" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr " &" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "&" -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr " " -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr " :" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr " :" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "& " -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "& :" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr " :" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "& .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr " & " -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr " " -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr " XXX ;" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr " " -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr " " -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr " " -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2625,7 +2647,7 @@ msgstr "" " \n" " (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2634,7 +2656,7 @@ msgstr "" " \n" " (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2643,7 +2665,7 @@ msgstr "" " \n" "" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2652,7 +2674,7 @@ msgstr "" " \n" " (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2661,7 +2683,7 @@ msgstr "" " \n" " " -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2670,7 +2692,7 @@ msgstr "" " \n" " " -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2679,7 +2701,7 @@ msgstr "" " \n" " " -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2688,7 +2710,7 @@ msgstr "" " \n" "" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2697,12 +2719,12 @@ msgstr "" " \n" " " -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr " " -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2711,32 +2733,32 @@ msgstr "" " \n" " (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr " ." -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr " ." -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr " " -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr " ." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr " ." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2745,7 +2767,7 @@ msgstr "" " \n" " " -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2754,7 +2776,7 @@ msgstr "" " , copyright\n" "" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2763,27 +2785,27 @@ msgstr "" " ޷ \n" "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr " " -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2792,7 +2814,7 @@ msgstr "" " \n" " " -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2801,7 +2823,7 @@ msgstr "" " \n" " " -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2810,7 +2832,7 @@ msgstr "" " () \n" " " -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2819,7 +2841,7 @@ msgstr "" " \n" " " -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2828,7 +2850,7 @@ msgstr "" " \n" " " -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2837,7 +2859,7 @@ msgstr "" " \n" "" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2846,7 +2868,7 @@ msgstr "" " \n" "" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2855,7 +2877,7 @@ msgstr "" " \n" "" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2864,7 +2886,7 @@ msgstr "" " \n" "" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2873,7 +2895,7 @@ msgstr "" " \n" "" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2882,7 +2904,7 @@ msgstr "" " \n" "" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2891,7 +2913,7 @@ msgstr "" " \n" " " -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2900,7 +2922,7 @@ msgstr "" " \n" " (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2909,7 +2931,7 @@ msgstr "" " \n" " (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2918,7 +2940,7 @@ msgstr "" " \n" " " -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2927,7 +2949,7 @@ msgstr "" " \n" " " -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2936,7 +2958,7 @@ msgstr "" " \n" " " -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2945,57 +2967,57 @@ msgstr "" " \n" " " -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr " " -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr " " -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr " " -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr " " -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr " " -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr " " -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr " " -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr " " -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr " " -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr " " -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3004,7 +3026,7 @@ msgstr "" " \n" " " -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3023,7 +3045,7 @@ msgstr "" "WinMerge.\n" " WinMerge" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3042,23 +3064,23 @@ msgstr "" "WinMerge.\n" " WinMerge" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr " " -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr " " -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr " " -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3067,152 +3089,152 @@ msgstr "" ":\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr " WinMerge . GNU ." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr " &" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr " &" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr " &" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr " &" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr " &" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr " &." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr " &." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr " " -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr " " -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr " " -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr ":" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr " :" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr " :" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr " :" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr " :" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr " %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr " (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr " ." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr " . ." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr " ." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3223,7 +3245,7 @@ msgstr "" "\n" " 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3234,127 +3256,129 @@ msgstr "" "\n" " WinMerge ." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "|*.exe;*.bat;*.cmd| (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr " (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr " WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " (*.ini)|*.ini| (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr " (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt| (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr " HTML (*.htm,*.html)|*.htm;*.html| (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr " XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr " " -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr " " -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr " " -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr " " -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr " " -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " (*.flt)|*.flt| (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3367,7 +3391,7 @@ msgstr "" " %1 WinMerge/Filters:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3380,7 +3404,7 @@ msgstr "" "\n" " \" \"." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3391,7 +3415,7 @@ msgstr "" "\n" " /." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3404,12 +3428,12 @@ msgstr "" "\n" " \" \";" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr " " -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3420,208 +3444,223 @@ msgstr "" "\n" " ." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr " . ;" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr " " -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "& cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "& SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr " " -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr " " -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr " " -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr " " -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr " " -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr " " -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr " ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr " " -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr " " -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr " " -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr " " -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr " " -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr " ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr " ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr " ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr " ..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr ".: %s .: %d/%d .: %d/%d . .: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr ": %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr ".: %s .: %d/%d .: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr " %1 %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 " -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 " #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr " %1 %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr ": %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr " " -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr " " -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr " ." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr " !" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr " !" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr " !" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " ." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr " !" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr " : %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr " : %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3634,12 +3673,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr " ." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3650,32 +3689,32 @@ msgstr "" "%1\n" " ." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr " " -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr " %1;" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr " %1 \" \". ; ( .)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr " " -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr " " -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3688,7 +3727,7 @@ msgstr "" "\n" " ;" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3705,7 +3744,7 @@ msgstr "" "\t- ( )\n" "\t- ( );" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3720,7 +3759,7 @@ msgstr "" "\n" " ;" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3735,7 +3774,7 @@ msgstr "" "\n" " ;" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3750,7 +3789,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3759,7 +3798,7 @@ msgstr "" " %1\n" " \" \". ;" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3774,17 +3813,17 @@ msgstr "" "\n" " , ." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr " " -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr " " -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3795,42 +3834,42 @@ msgstr "" "\n" " ." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " SourceSafe (. $/)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr " VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr " . ..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr " ." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr " VSS . ;" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr " VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr " VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3841,7 +3880,7 @@ msgstr "" " , .\n" " ;" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3850,170 +3889,169 @@ msgstr "" " .\n" " , .\n" -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe ( 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe ( 5.0 )" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr " " -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr " " -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr " " -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr " " -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr " " -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr " " -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr " (-) (-) " -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr " (-) (-) ( )" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr " " -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr " (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr " (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr " ... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr " ... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr " ... (%1 %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr " ... (%1 %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr " (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr " " -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - :" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr " - :" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 )" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 %2 )" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4024,17 +4062,17 @@ msgstr "" "\n" "%1 ;" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr " :" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " %d :" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4053,458 +4091,473 @@ msgstr "" "\n" " ." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr " " -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr " " -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr " ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr " " -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr " " -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr " ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr " : %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr " : %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr " " -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr " " -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr " " -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr " " -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr " " -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr " " -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr " " -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr " " -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr " ( )" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr " " -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr " " -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr " " -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr " " -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr " " -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr " " -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr " " -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr " " -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr " ()" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr " ()" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr " " -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr " " -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr " " -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr " " -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr " " -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr " " -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr " " -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr " " -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr " " -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr " " -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr " " -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr " " -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr " ." -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr " " -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr " " -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr " " -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr " " -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr " : %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr " : %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr " " -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr " " -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr " " -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr " " -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr " " -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr " : %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 " -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 " -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr " ." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr " ." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr " , " -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr " ." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr " ." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr " ." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr " byte." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr " byte." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr " ." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr " ." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr " ." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr " ." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr " ." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr " ." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr " ." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr " ." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr " " -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr " " -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr " ." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr " ." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " . WinMerge ." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " . ." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " (*) ." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr " %1 %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr " " -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr " " -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr " HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr " XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " . ;" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4513,32 +4566,32 @@ msgstr "" " :\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr " ." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr " ." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr " ." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr " ." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " . ." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4553,7 +4606,7 @@ msgstr "" "\n" ": , \" (Win/Unix/Mac) ...\" ( /)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4564,22 +4617,22 @@ msgstr "" " , .\n" " ;" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr " '%1' '%2'. ." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr " ." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr " ." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4594,7 +4647,7 @@ msgstr "" "%1\n" " ;" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4605,132 +4658,132 @@ msgstr "" " / .\n" " windows ();" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr ": , =%s =%s, ." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " : " -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr " : " -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr " : " -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr " " -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr " " -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr " %1 ." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr " \"%s\" " -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr " " -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr " " -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr " " -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr " " -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr " patch ." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. !" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. !" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " patch . ;" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 ]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr " " -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr " %1 ." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " : %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr " " -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr " patch ." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr " patch ." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4741,17 +4794,17 @@ msgstr "" "\n" " patch ." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr " ." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr " ." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4762,7 +4815,7 @@ msgstr "" " ( 7-zip / Merge7z*.dll) .\n" " ." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4771,7 +4824,7 @@ msgstr "" "\n" ": 7-Zip WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4780,37 +4833,37 @@ msgstr "" "\n" ": 7-Zip WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr " " -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr " " -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr " ." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr " ." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr " ." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr " ." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4821,473 +4874,493 @@ msgstr "" "\n" " ;" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr " " -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr " " -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr " " -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr " (;) " -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr " " -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr " " -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr " " -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr " [ or [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr " ( \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr " \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr " \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr " " -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr " " -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr " " -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr " " -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr " " -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr " ) \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr " " -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr " & " -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr " " -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr " " -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr " IBM EBCDIC" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr " MS-DOS" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr " MS-DOS" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr " MS-DOS" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr " MS-DOS" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr " 1 MS-DOS" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr " 2 MS-DOS" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr " 2 MS-DOS" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr " MS-DOS" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr " MS-DOS" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr " MS-DOS" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr " MS-DOS" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr " MS-DOS" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr " MS-DOS" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr " MS-DOS" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr " CIS 1 MS-DOS" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr " 2 MS-DOS" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr " Windows" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr " Windows" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr " Windows" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr " Windows" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr " Windows" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr " 2 Windows" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr " Windows ()" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr " 1 Windows" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr " Windows" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr " 5 Windows ()" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr " Windows" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr " Windows" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr " Windows" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr " Windows" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr " Macintosh" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr " Macintosh" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr " Macintosh" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr " Macintosh" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr " ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr " ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr " ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr " ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr " ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr " " -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr " " -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr " ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr " ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr " \" \" /" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr " \" \" /" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr " Windows (CRLF)" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr " Unix (LF)" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr " Mac (CR)" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr " " -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5296,12 +5369,12 @@ msgstr "" " \n" " " -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr " " -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5310,7 +5383,7 @@ msgstr "" " \n" " " -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5319,7 +5392,7 @@ msgstr "" " \n" " (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5328,7 +5401,7 @@ msgstr "" " \n" "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5337,37 +5410,37 @@ msgstr "" " \n" " (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr " " -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr " " -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr " " -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr " " -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr " " -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr " " -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5376,7 +5449,7 @@ msgstr "" " \n" " " -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5385,7 +5458,7 @@ msgstr "" " \n" " " -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5394,7 +5467,7 @@ msgstr "" " \n" " " -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5403,7 +5476,7 @@ msgstr "" " \n" " " -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5412,7 +5485,7 @@ msgstr "" " \n" " " -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5421,7 +5494,7 @@ msgstr "" " \n" " " -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5430,7 +5503,7 @@ msgstr "" " \n" " " -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5439,27 +5512,27 @@ msgstr "" " " " " -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr " " -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "/ " -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr " " -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr " " -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5467,7 +5540,7 @@ msgid "" msgstr "" " " -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5476,12 +5549,12 @@ msgstr "" " \n" " " -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr " " -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5490,7 +5563,7 @@ msgstr "" " \n" " " -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5498,7 +5571,7 @@ msgid "" msgstr " \n" " " -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5507,22 +5580,22 @@ msgstr "" " \n" " " -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr " " -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr " " -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr " " -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5531,7 +5604,7 @@ msgstr "" " \n" " (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5540,7 +5613,7 @@ msgstr "" " \n" " (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5549,7 +5622,7 @@ msgstr "" " \n" " (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5558,7 +5631,7 @@ msgstr "" " \n" " (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5567,7 +5640,7 @@ msgstr "" " \n" " (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5576,7 +5649,7 @@ msgstr "" " \n" " (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5585,7 +5658,7 @@ msgstr "" " \n" " (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5594,7 +5667,7 @@ msgstr "" " \n" " (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5603,7 +5676,7 @@ msgstr "" " \n" " (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5612,7 +5685,7 @@ msgstr "" " \n" " " -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5621,72 +5694,77 @@ msgstr "" " \n" " (Ctrl+Alt+Right)" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr " " -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr " ( )" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr " " -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr " patch" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr " " -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr " " -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr " ( )" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ( )" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr " " -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr " ( )" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr " " -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr " " -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr " ( )" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5695,12 +5773,12 @@ msgstr "" " \n" " " -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr " " -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5709,22 +5787,22 @@ msgstr "" " WinMerge\n" " WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr " () WinMerge" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr " GNU" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr " : %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5733,7 +5811,7 @@ msgstr "" " \n" " " -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5742,262 +5820,267 @@ msgstr "" " \n" "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr " " -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr " " -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr " " -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr " Windows (WSH) - .sct " -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr " " -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr " " -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr " " -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr " " -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr " " -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr " " -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr " " -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr " & %1 %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "& %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr " " -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr " " -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr " " -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr " " -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr " " diff --git a/Src/Languages/Hungarian.po b/Src/Languages/Hungarian.po index 2063720dc4c..90a9511e128 100644 --- a/Src/Languages/Hungarian.po +++ b/Src/Languages/Hungarian.po @@ -71,7 +71,7 @@ msgstr "&Kiv #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Msols" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&Beilleszts" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Ugrs..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "Meg&nyits" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "&Trstott programmal" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "&Kls szerkesztvel" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&Egyb programmal..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Fjl" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&j\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "M&egnyits...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Projekt megnyitsa...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -160,1855 +162,1864 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Kilps" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "S&zerkeszts" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Belltsok..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Nzet" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Bettpus..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Alaprtelmezett bettpus hasznlata" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&lapotsor" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Nyelv..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Eszkzk" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Szrk..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Patch generlsa..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Bvtmnyek" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Kzi kicsomagols" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatikus kicsomagols" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Szerkeszts a Kicsomagolval" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Bvtmnyek betltse" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Ablak" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Bezrs" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "&Mindegyik bezrsa" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Panel vltsa\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Elrendezs &vzszintesen" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Elrendezs &fgglegesen" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Feloszts" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Sg" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Ar&chvum tmogats tiltva..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&A Winmerge nvjegye..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Bal oldal csak &olvashat" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Jobb oldal csak o&lvashat" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "M&indent kijell\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "&Rejtett elemek mutatsa" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Frissts\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Olvaszts" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "&sszehasonlts\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Kvetkez eltrs\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Elz eltrs\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "E&ls eltrs\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktulis eltrs\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Utols eltrs\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Msols &Jobbra\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Msols &Balra\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Trls\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Oszlopok testreszabsa..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "&Jelents generlsa..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Ments\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "&Bal oldal mentse" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Ments" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Ment&s ms nven..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "&Jobb oldal mentse" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Olvasztsi md\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Visszavons\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "Mg&is\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Kivgs\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Msols\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Beilleszts\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Keres&s...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Csere...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Szkriptek" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< res >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Halad" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Msols sorszmokkal egytt\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ugrs...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Szkzk mutatsa" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Sorok &eltrsnek mutatsa" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Eltrs &panel" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "&Pozci panel" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Msols J&obbra s ugrs tovbb\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Msols B&alra s ugrs tovbb\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "M&inden Jobbra msolsa" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Mi&nden Balra msolsa" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Elvizsgl" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&sszehasonlts" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Balrl Jobbra" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "B&alrl..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Jobbrl Balra" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "J&obbrl..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&thelyezs" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Balrl..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Jobbrl..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Trls" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Bal oldal" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Jobb oldal" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Mindkett" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "Elemek &rejtse" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&Bal oldal megnyitsa" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "&Jobb oldal megnyitsa" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "&tvonalak msolsa" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Bal oldal (%1 ennyibl: %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Jobb oldal (%1 ennyibl: %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Mindkt oldal (%1 ennyibl: %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "&Fjlnevek msolsa" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Bal oldal... (%1 ennyibl: %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Jobb oldal... (%1 ennyibl: %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Mindkt oldal... (%1 ennyibl: %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Eltrsek... (%1 ennyibl: %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Frissts" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Teljes tvonal msolsa" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "&Fjlnv msolsa" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Elvizsgl Belltsok" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Nincs elvizsglat" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Automatikus elvizsglat" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Ugrs &eltrsre" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Nem mozgatott blokkok" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Minden mozgatott blokk" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "A &jelenlegi Eltrs mozgatott blokkja" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "A WinMerge nvjegye" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Minden jog fenntartva." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Ltogasd meg a WinMerge honlapjt!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "Vissza" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Kzremkdk" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Vlaszd ki a fjlokat vagy knyvtrakat..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Bal:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Tallzs..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Jobb:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "T&allzs..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Szr:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Kivlaszts..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Csomagol:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Kivlaszts..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Alknyvtrakkal egytt" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "llapot:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Mgsem" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Sg" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "sszehasonltand fjlok vagy knyvtrak" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Adatbzis:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Felhasznl:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Jelsz:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Link a cl VSS projekthez" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Alkalmazs minden elemen" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Ellenrzs" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Ments msknt..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Verzi Rendszer" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Verzi Rendszer:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "A &cleartool.exe elrsi tvonala:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "ltalnos" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatikus &ugrs az els eltrsre" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Splash Screen letiltsa" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Ablakok bezrsa az &ESC billentyvel" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatikus tvonalellenrzs a &Megnyits ablakban" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Csak &egy pldny futsnak engedlyezse" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Tbbszrs sszehasonlt ablakok engedlyezse:" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&Mappa sszehasonltskor" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "&Fjl sszehasonltskor" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Visszallt" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Nyelv" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Vlaszthat nyelvek:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Keress" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Szveg:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Csak &teljes szavak mutatsa" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Kis-nagybet &rzkenysg" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Regulris kifejezsek" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Irny" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Fel" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Le" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "Kere&ss" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Csere" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Cs&ere erre:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&lljon meg a fjl vgnl" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "A csere tartomnya" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Kijells" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "Teljes &fjl" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Csere" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "&Mindet" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Ellenriz" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Megjegyzsek" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Sorszrk" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulris kifejezsek (soronknt egy):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Sznek" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Eltrs:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Kijellt Eltrs:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Httr" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Trlt" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Szveg" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Kihagyott Eltrs:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "thelyezett:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Kijellt thelyezett:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Sz eltrs:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Kijellt sz eltrs:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Alaprtkek" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Krds" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Rendszer" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "A trlt fjlok a &Lomtrba kerljenek" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Hozzads az Intz kontext-menjhez" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "&Bvtett men engedlyezse" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Bels szerkeszt:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "T&allzs..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Patch Genertor" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fjl&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fjl&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Megfordts" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Hozzfzs a ltez fjlhoz" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Eredmny:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formtum" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&lus:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Krnyezet:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Szkzk" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&sszehasonlt" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "&Vltozsok kihagysa" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Minden kihagysa" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "res sorok kihagysa" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Kis-nagybet rzkenysg" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "&Parancssor mellkelse" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Megnyits a &Bels Szerkesztvel" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Oszlopok mutatsa" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Kicsomagol kivlasztsa" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Fjl kicsomagol:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Minden kicsomagol mutatsa kiterjesztstl fggetlenl" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Kiterjesztsek listja:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Lers:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Lellts" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ugrs" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "U&grs:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fjl" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Mire ugorjon:" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&Sorra" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Eltrsre" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Ugrs" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "sszehasonlts" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Szkzk" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&sszehasonlts" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Vltoztatsok kihagysa" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "&Minden kihagysa" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "&res sorok kihagysa" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "&Kis-nagybet klnbsgek kihagysa" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Mozgatott &blokk szlels bekapcsolsa" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Fjl sszehasonltsi mdszer:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "Meglls az &els klnbsgnl" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Szerkeszt" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Szintaxis kiemels" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Automatikus jraolvass" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Eredeti jsor-karakterek megrzse" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabultorok" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "Tab. &mrete:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Tabultorok hasznlata" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&Szkzk hasznlata" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Sorok eltrsnek sznezse" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Sorok eltrsnek mutatsa" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "FjlSzrk" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "j..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Szerkeszt..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Trl..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Mdostott fjlok mentse?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Bal oldali fjl" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Vltoztatsok mentse" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "Vltoztatsok &elvetse" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Jobb oldali fjl" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "V<oztatsok mentse" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Vltoztatsok e&lvetse" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Elvet mindent" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Kdlap" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Alaprtelmezett kdlap" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Vlaszd ki az alaprtelmezett kdlapot a nem-Unicode fjlokhoz:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2017,32 +2028,32 @@ msgstr "" "A kdlap informci megkeresse ezekhez a fjlokhoz: .html, .rc, .xml \n" "a munkafolyamat jraindtst ignyli" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Rendszer kdlap" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "A Winmerge felhasznli fellethez igazodva" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Egyedi kdlap:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Archvum tmogats letiltva" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nem ismerhet fel a 7-Zip verzija (nincs teleptve?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2051,12 +2062,12 @@ msgstr "" "Az Archvum tmogats a 7-Zip 3.11-es vagy jabb verzijt ignyli, melynek teleptve kell lennie a helyi gpen, vagy a\n" "szksges komponenseknek megtallhataknak kell lennik a program knyvtrban." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Szksges tovbb egy megfelel felleti bvtmny (Merge7z*.dll) az tvonalban." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2065,12 +2076,12 @@ msgstr "" "Krlek hasznld a 7-Zip lentebb megjellt verzijt, amg a felleti bvtmny jabb\n" "verzija meg nem jelenik." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Verzi" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2079,540 +2090,551 @@ msgstr "" "Szksges bvtmny\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "A 7-Zip javasolt verzija:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "megvan" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "A szmtgpen teleptett 7-Zip szoftver:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nincs" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "hinyzik" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Az nll mkdshez szksges 7-Zip komponensek:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "lejrt" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Elrhet bvtmnyek:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Bvtmny letltse" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opcik" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategrik" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Kulcsszavak:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Fggvny nevek:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Megjegyzsek:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Szmok:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Opertorok:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Sztringek:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Elfeldolgoz:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Felhasznl 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Felhasznl 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Flkvr" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Knyvtr sszehasontsi jelents" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Jelents &fjl:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Tallzs..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stlus:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Megosztott vagy sajt szr" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Milyen tpus szrt szeretnl ltrehozni?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Megosztott szr (a gp minden felhasznljnak)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Sajt szr (csak a jelenlegi felhasznlnak)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Archvum tmogats" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Az archvum tmogatshoz a 7-Zip bvtmny teleptse szksges:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "7-Zip bvtmny letltse" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Archv fjlok tmogatsnak &engedlyezse" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Hasznlja a klnll 7-Zip programot, ha elrhet" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "H&asznlja a helyi 7-Zip programot a WinMerge mappjban" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "Archv fjl tpusnak megllaptsa a fjl &szignatrja alapjn" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Klnbz" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Egyez" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Mgsem" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040E04e2" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x040E, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Ksz" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2621,7 +2643,7 @@ msgstr "" "j dokumentumok ltrehozsa\n" "j dokumentum (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2630,7 +2652,7 @@ msgstr "" "Ltez dokumentum megnyitsa\n" "Megnyits (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2639,7 +2661,7 @@ msgstr "" "Az aktv dokumentum bezrsa\n" "Bezrs" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2648,7 +2670,7 @@ msgstr "" "Az aktv dokumentum mentse\n" "Ments (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2657,7 +2679,7 @@ msgstr "" "Az aktv dokumntum mentse j nven\n" "Ments msknt" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2666,7 +2688,7 @@ msgstr "" "A nyomtatsi belltsok megvltoztatsa\n" "Oldalbellts" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2675,7 +2697,7 @@ msgstr "" "A nyomtat s a nyomtatsi opcik megvltoztatsa\n" "Nyomtatbellts" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2684,7 +2706,7 @@ msgstr "" "Az aktv dokumentum nyomtatsa\n" "Nyomtats" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2693,12 +2715,12 @@ msgstr "" "Az oldalak megjelentse\n" "Nyomtatsi elnzet" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Minden rejtett elem legyen jbl lthat" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2707,39 +2729,39 @@ msgstr "" "Projekt fjl megnyitsa\n" "Projekt fjl (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2748,7 +2770,7 @@ msgstr "" "A programmal kapcsolatos informcik megjelentse\n" "Nvjegy" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2757,27 +2779,27 @@ msgstr "" "A program bezrsa; a nem mentett fjlok elmentsnek lehetsgvel\n" "Kilps" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "A dokumentum megnyitsa" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2786,7 +2808,7 @@ msgstr "" "Vlts a kvetkez ablak paneljra\n" "Kvetkez panel" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2795,7 +2817,7 @@ msgstr "" "Vlts az elz ablak paneljra\n" "Elz panel" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2804,7 +2826,7 @@ msgstr "" "Az Ablakok egymsra helyezse\n" "Ablakok egymsra elhelyezse" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2813,7 +2835,7 @@ msgstr "" "Az ablakok felosztsa egymst nem fed mdon\n" "Ablakok felosztsa" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2822,7 +2844,7 @@ msgstr "" "Az ablakok felosztsa egymst nem fed mdon\n" "Ablakok felosztsa" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2831,7 +2853,7 @@ msgstr "" "A kijells msolsa a vglapra\n" "Msols" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2840,7 +2862,7 @@ msgstr "" "A kijells kivgsa a vglapra\n" "Kivgs" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2849,7 +2871,7 @@ msgstr "" "A megadott szveg keresse\n" "Keress" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2858,7 +2880,7 @@ msgstr "" "A vglap tartalmnak beillesztse\n" "Beilleszts" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2867,7 +2889,7 @@ msgstr "" "Az utols mvelet megismtlse\n" "Ismt" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2876,7 +2898,7 @@ msgstr "" "A megadott szveg cserje a kvnt j szveggel\n" "Csere" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2885,7 +2907,7 @@ msgstr "" "A teljes dokumentum kijellse\n" "Kijell mindent" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2894,7 +2916,7 @@ msgstr "" "Az utols mvelet visszavonsa\n" "Visszavons (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2903,7 +2925,7 @@ msgstr "" "Az utoljra visszavont mvelet megismtlse\n" "Mgis (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2912,7 +2934,7 @@ msgstr "" "Megmutatja vagy elrejti az Eszkztrat\n" "Eszkztr" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2921,69 +2943,69 @@ msgstr "" "Megmutatja vagy elrejti az llapotsort\n" "llapotsor" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Az ablak mretnek vltoztatsa" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Az ablak pozcijnak vltoztatsa" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Az ablak ikonllapotra kicsinytse" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Az ablak teljes mretv ttele" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Vlts a kvetkez dokumentum ablakra" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Vlts az elz dokumentum ablakra" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Az aktv ablak bezrsa a vltoztatsok mentsnek lehetsgvel" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Az ablak vissazlltsa az eredeti mretre" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "A Feladat Lista aktivlsa" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Ennek az ablaknak az aktivlsa" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2992,183 +3014,183 @@ msgstr "" "A Nyomtatsi elnzet bezrsa\n" "Nyomtatsi elnzet bezrsa" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Az eredeti jsor-karakterek megrzse" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Nyomj egy billentyt" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Kattints a jobb egrgombbal az tvonalra annak msolshoz" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Rendben" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Lellt" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Ismt" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Kihagy" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Kihagy M&indent" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Igen" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Igen &mindenre" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nem" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nem m&indenre" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Folytats" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Kihagy" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Kihagy &mindent" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "&Ne jelenjen meg tbbet ez az zenet." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "&Ne jelenjen meg tbbet ez a krds." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Szintaxis sznek" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Verzi Kontroll" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Verzi %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opcik (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Minden zenet ezentl jra megjelenik." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "A megnyitott sszehasonltsi folyamat alatt vltoztatsok trtntek. Egyes vltoztatsok akkor lpnek letbe, amikor az ppen folyamatban lv sszehasonlts befejezdik." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A belltott j bettpus nem lesz rvnyes minden egyes ablak felirataira." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3176,7 +3198,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3184,127 +3206,129 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Megnyits" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programok|*.exe;*.bat;*.cmd|Minden fjl (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Minden fjl (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projekt Fjlok (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Teljes tartalmak" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "tfutott tartalmak" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Mdostsi dtum" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nv" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Hely" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Szrk" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Lers" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Vlassz fjlnevet az j szrhz" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fjl szrk (*.flt)|*.flt|Minden fjl (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3313,7 +3337,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3322,7 +3346,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3330,7 +3354,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3339,12 +3363,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3352,208 +3376,223 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "A &cleartool.exe elrsi tja:" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "Az &SS.EXE elrsi tvonala:" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Knyvtr sszehasonltsi eredmnyek" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Fjl sszehasonlts" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Nvtelen bal oldal" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Nvtelen jobb oldal" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Fjlok vizsglata..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Kijells megnyitsa" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Msols balrl jobbra" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Msols balrl jobbra" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Msols mindent balra" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Msols mindent jobbra" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Fjlok msolsa..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Fjlok trlse..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Fjlok thelyezse..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Jelents ksztse..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Sor: %s Oszlop: %d/%d Kar: %d/%d jsor: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Sor: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Sor: %s Oszlop: %d/%d Kar: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Olvaszts" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Ennyi klnsg: %1 ennyibl: %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 klnbsget talltam" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 klnbsget talltam" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "%1 elem ennyibl: %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "%1 elem" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vlassz ki kt sszehasonltand fjlt vagy knyvtrat" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Knytr kivlaszts" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Vlassz ki kt sszehasonltand fjlt vagy knyvtrat." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "A bal oldali elrsi t rvnytelen!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "A jobb oldali elrsi t rvnytelen!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Mindkt elrsi t rvnytelen!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vlassz ki kt fjlt a kicsomagol kijellshez." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Nem lehet fjlt knyvtrral sszehasonltani!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Ez a fjl nem tallhat: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "A fjl nincs kicsomagolva: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3566,42 +3605,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Ments msknt" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Mentsem a vltoztatsokat %1 nven?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "Ez a fjl: %1 csak olvashat. Szeretnd ezt megvltoztatni? (Kattints a Nem gombra a fjl j nven val mentshez.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Hiba a cl rhatsgnak ellenrzsekor" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Hiba a fjl biztonsgi msolatnak ksztsekor" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3614,7 +3653,7 @@ msgstr "" "\n" "Folytatni akarod?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3631,7 +3670,7 @@ msgstr "" "\t-msik fjlnv vlasztsa (Ok)\n" "\t-a jelenlegi folyamat megszaktsa (Mgsem)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3646,7 +3685,7 @@ msgstr "" "\n" "Szeretnd menteni a kicsomagolt vltozatot egy msik fjlba?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3661,7 +3700,7 @@ msgstr "" "\n" "Szeretnd menteni a kicsomagolt vltozatot egy msik fjlba?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3676,7 +3715,7 @@ msgstr "" "\n" "Fellrjuk a megvltoztatott fjlt?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3685,7 +3724,7 @@ msgstr "" "%1\n" "csak olvashat. Szeretnd ezt megvltoztatni?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3700,17 +3739,17 @@ msgstr "" "\n" "Ha szeretnd frissteni a fjl tartalmt, zrd be a jelenlegi munkt s nyisd meg a fjlokat jra." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Bal oldali fjl mentse ms nven" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Jobb oldali fjl mentse ms nven" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3721,42 +3760,42 @@ msgstr "" "\n" "Frisstsd a dokumentumokat, mieltt folytatnd." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Meg kell adnod a SourceSafe projekt elrsi tvonalt a folytatshoz (pl.: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Fjlok ellenrzse VSS-bl..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "A Verzi Rendszer hibt adott vissza a fjl ellenrzse kzben. Nem lehet folytatni..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Hiba a Verzi Rendszer futtatsa kzben." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "A VSS Munka Knyvtr s a jelenlegi fjl tvonala nem egyezik. Folytassuk?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Nem tallhat VSS adatbzis!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Hiba a VSS-bl:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3764,177 +3803,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (rgebbi mint 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 vagy jabb)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Meglls szkzknl" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Meglls szkzknl vagy rsjeleknl" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Kijellt bal oldali elem trlse" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Kijellt jobb oldali elem trlse" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Kijellt elem(ek) trlse mindkt oldalon" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Kijellt elem(ek) rejtse (gyors szrs)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Jobbrl balra (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Balrl jobbra (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Jobbrl balra (%1 of %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Balrl jobbra (%1 of %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Balrl... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Jobbrl... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Balrl... (%1 of %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Jobbrl... (%1 of %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Bal (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Jobb (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Mindkett (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Bal (%1 ennyibl: %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Jobb (%1 ennyibl: %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Mindkett (%1 ennyibl: %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Vlassz clknyvtrat" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Bal oldal - vlassz ticl mappt:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Jobb oldal - vlassz ticl mappt:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3945,17 +3983,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -3967,458 +4005,473 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Bal oldali fjl megnyitsa" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Bal oldali fjl megnyitsa a bels szerkesztvel" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Bal oldali fjl megnyitsa a(z) ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Jobb oldali fjl megnyitsa" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Jobb oldali fjl megnyitsa a bels szerkesztvel" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Jobb oldali fjl megnyitsa a(z) ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Fjlnevek msolsa a vglapra" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Bal oldali fjlok tvonalainak msolsa a vglapra" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Jobb oldali fjlok tvonalainak msolsa a vglapra" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Mindkt oldali fjlok tvonalainak msolsa a vglapra" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Ismeretlen archvum formtum" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Bal oldali fjlok hozzadsa az archvumhoz" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Jobb oldali fjlok hozzadsa az archvumhoz" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Mindkt oldali fjlok hozzadsa az archvumhoz" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Klnbz elemek hozzadsa az archvumhoz (mindkt oldalrl)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "A kijellt bal oldali fjlok thelyezse tetszleges knyvtrba" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "A kijellt jobb oldali fjlok thelyezse tetszleges knyvtrba" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Fjlnv" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Knyvtr" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "sszehasonltsi eredmnyek" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Bal oldali dtum" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Jobb oldali dtum" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Kiterjeszts" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Bal oldali mret" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Jobb oldali mret" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Bal oldali ltrehozsi id" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Jobb oldali ltrehozsi id" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "jabb fjl" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Bal oldali fjl verzi" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Jobb oldali fjl verzi" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Rvid eredmnyek" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Bal oldali attribtumok" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Jobb oldali attribtumok" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Bal oldali kdols" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Jobb oldali kdols" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binris" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Nem lehett sszehasonltani a fjlokat" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "A fjl kihagyva" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "A knyvtr kihagyva" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "A binris fjlok megegyezek" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "A binris fjlok klnbzek" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "A fjlok klnbzek" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Csak bal oldal" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Csak jobb oldal" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Eltelt id: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 elem kivlasztva" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elem kivlasztva" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "fjlnv vagy knyvtrnv." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Alknyvtr neve ha az alknyvtrak is ki vannak vlasztva." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "sszehasonltsi eredmny bvebb formban." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Bal oldali mdostsi dtum." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Jobb oldali mdostsi dtum." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Fjlok kiterjesztse." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Bal oldali fjl mrete bjtokban." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Jobb oldali fjl mrete bjtokban." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Bal oldal ltrehozsi ideje." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Jobb oldal ltrehozsi ideje." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Megmutatja, melyik oldalnak jabb a ltrehozsi dtuma." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Bal oldali fjl verzija, csak bizonyos fjloknl." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Jobb oldali fjl verzija, csak bizonyos fjloknl." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Rvid sszehasonltsi eredmnyek." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Bal oldali attribtumok." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Jobb oldali attribtumok." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Bal oldali kdols." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Jobb oldali kdols." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "(*) lthat, ha a fjl binris." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "%1 sszehasonltsa ezzel: %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Vesszvel elvlasztott lista" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Tabullt lista" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Egyszer HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "A jelents fjl mr ltezik. Szeretnd fellrni a ltez fjlt?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4427,32 +4480,32 @@ msgstr "" "Hiba a jelents ksztse kzben:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "A jelents sikeresen elkszlt." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Ugyanaz a fjl van megnyitva mindkt panelen." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "A kijellt fjlok ugyanazok." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Hiba trtnt a fjlok sszehasonltsakor." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nem lehetett ltrehozni az ideiglenes fjlokat. Ellenrizd az ideiglenes knyvtr belltsait." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4467,32 +4520,32 @@ msgstr "" "\n" "Megjegyzs: Amennyiben minden esetben ezt az opcit szeretnd hasznlni, kapcsold be a 'Sortrsi eltrsek kihagysa' opcit az sszehasonlts menpontban (a Szerkeszts/Opcik menpont alatt tallod meg)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Hiba trtnt ennek a fjlnak az elvizsglata kzben: '%1' ebben a bvtmnyben: '%2'. Az elvizsglat ezutn nem fog mkdni." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4503,132 +4556,132 @@ msgstr "" "A klnbz kdlapokkal trtn kijelzs knnyebben ttekinthet de az olvaszts/trls kockzatos lehet.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Nincs eltrs" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Sor eltrs" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Cserlve lett %1 sztring." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nem tallhat ez: \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Teljes elrsi t msolsa" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Fjlnv msolsa" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "A Patch fjl sikeresen elkszlt." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "Az 1. elem nem tallhat vagy az egy knyvtr!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "A 2. elem nem tallhat vagy az egy knyvtr!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "A patch fjl mr ltezik. Szeretnd fellrni azt?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 kijellt fjl]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Norml" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Krnyezeti" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Egysgestett" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Nem lehetett ebbe a fjlba rni: %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A megadott kimeneti tvonal nem abszolt elrsi t: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Adj meg egy kimeneti fjlt" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nem lehet patch fjlt ltrehozni binris fjlokbl." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nem lehet patch fjlt ltrehozni knyvtrakbl." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4639,17 +4692,17 @@ msgstr "" "\n" "A patch ltrehozshoz elengedhetetlen, hogy ne legyenek el nem mentett vltoztatsok a fjlokban." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "A mappa nem ltezik." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "A jelenlegi knyvtr sszehasonltsi eredmnyek trldnek." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4660,51 +4713,51 @@ msgstr "" "Az ehhez szksges sszetevk (7-zip s/vagy Merge7z*.dll) nem tallhatak.\n" "Olvasd el a kziknyv archvum tmogatsrl szl rszt." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4712,492 +4765,512 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Regulris kifejezs hiba" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Nincs tallat" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "rvnytelen regulris kifejezs" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "rvnytelen egyeztet karakter" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "rvnytelen karakter osztly nv" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Felesleges backslash karakter" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "rvnytelen visszautals" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Lezratlan [ vagy [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Lezratlan ( vagy \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Lezratlan \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "rvnytelen tartalm \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "rvnytelen tartomny" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Nincs elg memria" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "rvnytelen megelz regulris kifejezs" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Korn lezrt regulris kifejezs" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Tl nagy regulris kifejezs" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Lezratlan ) vagy \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Nem alkalmazhat" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Bal oldali fjl mentse" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Jobb oldali fjl mentse" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Bal oldali fjl mentse mint ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Jobb oldali fjl mentse mint ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Bal oldali fjl/knyvtr csak olvashat llapotnak vltoztatsa" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Jobb oldali fjl/knyvtr csak olvashat llapotnak vltoztatsa" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Vlts olvaszt s szerkeszt md kztt" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5206,7 +5279,7 @@ msgstr "" "Ugrs sorra vagy eltrsre\n" "Ugrs (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5215,7 +5288,7 @@ msgstr "" "A program belltsa\n" "Belltsok" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5224,79 +5297,79 @@ msgstr "" "Kijez frisstse\n" "Frissts (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "A kijellt sorok vglapra msolsa a sorok elejhez a sorszmokat hozzfzve" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5305,7 +5378,7 @@ msgstr "" "Vlaszd ki a kvnt bettpust\n" "Nzet bettpusnak vlasztsa" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5314,103 +5387,103 @@ msgstr "" "Visszatrs az eredeti rendszer-bettpushoz megjelentshez\n" "Alaprt. bettpus" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Szkz karakterek mutatsa" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Eltrs panel mutatsa/rejtse" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "A Pozci panel vizulis kpet ad az sszehasonltott fjlokrl" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5419,7 +5492,7 @@ msgstr "" "A kijellt szveg msolsa a jobb oldali fjlba\n" "Msols jobbra (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5428,7 +5501,7 @@ msgstr "" "A kijellt szveg msolsa a bal oldali fjlba\n" "Msols balra (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5437,7 +5510,7 @@ msgstr "" "Az eltrs msolsa jobbra s ugrs tovbb\n" "Msols jobbra s Ugrs (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5446,7 +5519,7 @@ msgstr "" "Az eltrs msolsa balra s ugrs tovbb\n" "Msols balra s Ugrs (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5455,7 +5528,7 @@ msgstr "" "Az sszes eltrs msolsa jobbra\n" "Mind jobbra" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5464,367 +5537,377 @@ msgstr "" "Az sszes eltrs msolsa jobbra\n" "Mind balra" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "A kijellt elemek trlse mindkt knyvtrbl" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Kijellt elem sszehasonltsa (elszr az els, ha tbb elem is ki van jellve)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Knyvtr sszehasonltsi oszlopok kijellse s jrarendezse" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Patch-file generlsa" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Szrk kijellse s mdostsa" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Jelents ksztse az sszehasonltsi eredmnyekbl" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "A felhasznl adja meg a kicsomagolt (nincs kicsomagols knyvtrak sszehasonltsakor)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "A vlasztott kicsomagol lesz hasznlva mindkt fjlnl (az egyik fjlnak csak a kiterjesztse lnyeges)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Vlassz kicsomagolt a fjl szerkesztshez" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Nincs elvizsglat (normlis)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Javasolt bvtmnyek" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Egyb bvtmnyek" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Az sszes bvtmny betltse jra (fejlesztknek)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Minden megnyitott ablak bezrsa" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "A jelenlegi WinMerge verziszmnak s egyb adatainak fjlba mentse" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Bvtmny belltsok" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Nincs elvizsglat" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Elvizsglat ha lehetsges" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "A WSH nem tallhat - Az .sct szkriptek le lesznek tiltva" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "A fjl megnyitsa a trstott alkalmazssal" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "A fjl megnyitsa a kls szerkesztvel" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "A fjl megnyitsa a kivlasztott programmal" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Ne mutassa a mozgatott blokkokat" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mutassa a kijellt blokkokat a jelenlegi eltrstl kezdve" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ugrs a kurzor alatt eltrsre" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "&Ugrs a(z) %1. szm eltrsre ennyibl: %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "&Ugrs a(z) %1. sorra" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Italian.po b/Src/Languages/Italian.po index 9d517106145..c706b67e682 100644 --- a/Src/Languages/Italian.po +++ b/Src/Languages/Italian.po @@ -72,7 +72,7 @@ msgstr "&Taglia" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "C&opia" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "I&ncolla" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Vai a..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "&Apri" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "con l'applicazione ®istrata" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "con l'editor &esterno" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&con..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&File" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nuovo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Apri...\tCtrl+A" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Apr&i file conflittuale..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Apri pro&getto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Sal&va progetto..." @@ -161,1899 +163,1908 @@ msgid "Recent Projects" msgstr "Progetti recenti" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Esci" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Modifica" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "Op&zioni" #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Visualizza" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "&Carattere..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "&Utilizza carattere predefinito" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Barra degli s&trumenti" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Nessuna" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Piccola" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&Barra di stato" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "&Barra delle schede" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Lingua..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Strumenti" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Crea patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plugin" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Scompattazione &manuale" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Scompattazione &automatica" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "Modi&fica con lo scompattatore" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Ricarica plugin" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Debug" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Carica configurazione..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Reimposta opzioni" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Fi&nestra" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Chiudi" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Chiudi &tutto" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Cambia &pannello\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Affianca &orizzontalmente" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Affianca &verticalmente" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Sovrapponi" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&?" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "Guida &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "Note di r&ilascio" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "C&onfigurazione" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Supporto per gli archivi inattivo..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "Infor&mazioni su WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Fil&e di sinistra di Sola lettura" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "F&ile di destra di Sola lettura" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Codifica dei file" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Se&leziona tutto\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Mostra elementi &identici" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Mostra elementi di&fferenti" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostra elementi unici di &sinistra" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostra elementi unici di &destra" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Mostra elementi sa<ati" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Mostra i file &binari" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "M&ostra elementi nascosti" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Statistic&he del confronto" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "A&ggiorna\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Aggio&rna selezionati\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Unisci" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&nfronta\tInvio" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Differenza successiva\tAlt+Su" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Di&fferenza precedente\tAlt+Gi" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Prima differen&za\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Differenza &corrente\tAlt+Invio" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Ultima differenza\tAlt+Fine" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "C&opia a destra\tAlt+Destra" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Co&pia a sinistra\tAlt+Sinistra" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Elimina\tCanc" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Personalizza colonne..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Genera &rapporto..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salva\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Sa&lva sinistro" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Salva" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "S&alva con nome..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Salva dest&ro" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "Stam&pa..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Impos&ta pagina..." -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Anteprima &di stampa" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Converti caratteri di fine linea a" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modalit 'Unione'\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "Codifica &file..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Annulla\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Ripristina\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Taglia\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "C&opia\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "I&ncolla\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleziona &differenze nella riga\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Tro&va...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Sostit&uisci...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Script" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Vuoto >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avanzat&e" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copia con numeri di linea\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "Segnali&bri" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Imposta segnalibro\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "Segnalibro successi&vo\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Segnalibro precedente\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Cancella tutti i segnalibri" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Va&i a...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Ingrandisci\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Rid&uci\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normale\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Evidenziazione sintassi" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "B&locca pannelli" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Visualizza spazi bianchi" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Visualizza &differenze nelle linee" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Mostra i &numeri delle righe" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Visualizza &margini" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "A capo a&utomatico" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Sc&ambia pannelli" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "&Pannello delle differenze" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Pannello della loca&zione" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copia a des&tra e avanza\tAlt+Ctrl+Destra" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copia &a sinistra e avanza\tAlt+Ctrl+Sinistra" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Cop&ia tutto a destra" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "C&opia tutto a sinistra" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&Confronta" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Co&nfronto speciale" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "Da &Sinistra a Destra" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "Si&nistra in..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "Da &Destra a Sinistra" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "Destra &in..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Sposta" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "Si&nistra in..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "Destra &in..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Elimina" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Sinistra" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Destra" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Entrambi" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "&Rinomina" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Nascondi elementi" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Apri &file di sinistra" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "A&pri file di destra" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&ia percorsi" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Sinistra (%1 su %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Destra (%1 su %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Entrambi (%1 su %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Copia nomi dei fi&le" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zippa" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Sinistra... (%1 su %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Destra... (%1 su %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Entrambi... (%1 su %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Di&fferenze... (%1 su %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "A&ggiorna" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "Copia &percorso completo" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Copia nome del &file" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Impostazioni Prediffer" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&No prediffer" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Prediffer &automatico" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Vai alla &differenza" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Nessun blocco spostato" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Tutti i blocchi spostati" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocchi spostati per la differenza &corrente" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Informazioni su WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Build Privata)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Tutti i diritti riservati." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visita la pagina web di WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Hanno contribuito" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Seleziona i file o le cartelle" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Sinistra:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "S&foglia..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Destra:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Sf&oglia..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "S&eleziona..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Scompa&ttatore:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "Sele&ziona..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Includi sottocartelle" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Stato:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Annulla" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Aiuto" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "File o cartelle da confrontare" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Database:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Progetto:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Utente:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Password:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Collegamento al progetto VSS di destinazione" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Applica a tutte le voci" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Estrai" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Salva con nome..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Sistema per il versioning" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "Sistema per il &versioning" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Percorso di cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Generale" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "&Visualizza automaticamente la prima differenza" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Disattiva la schermata iniziale" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "C&hiudi finestra con ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifica &automaticamente i percorsi nella finestra Apri" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Permetti l'esecuzione di un'unica istanza del programma" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "Domanda alla c&hiusura di pi finestre" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "&Preserva orario del file durante il confronto" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Completamento automatico nella scelta dei file:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Attiva finestra di confronto multiplo per" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Confron&to di cartelle" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Confronto di &file" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ti permette di nascondere alcuni messaggi comuni. Premi il pulsante Ripristina per rendere di nuovo visibili tutti i messaggi." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Ripristina" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Lingua" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Lingue disponibili:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Trova" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "Tro&va:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Solo &parole intere" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "&Maiuscolo/Minuscolo" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Espressione regolare" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "&Fermati alla fine del file" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direzione" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Su" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Gi" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Trova succ." -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Sostituisci" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Sostituisci &con:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Fermati alla fine del file" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Sostituisci in" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "Sele&zione" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "T&utto il file" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Sostituisci" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Sost&ituisci tutto" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Estrai" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Commenti" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Reinserisci dopo l'estrazione" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtri di linee" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Attiva i filtri di linee" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Espressioni regolari (una per riga):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Salva" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nuovo" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Modifica" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Rimuovi" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Colori" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Differenza:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Differenza selezionata:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Sfondo" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Eliminata" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Testo" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Differenza ignorata:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Spostata:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Spostata selezionata:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Differenza di parole:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Diff. parole selezionata:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Predefinito" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Finestra di dialogo" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Posiziona i file eliminati nel cestino" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integrazione" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Aggiungi al menu contestuale di Explorer" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Atti&va menu avanzato" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Imposta come predefinita l'inclusione di sottocartelle" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Editor esterno:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "Cartella dei &filtri:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "&Sfoglia..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Cartella file temporanei" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Cartella temporanea di s&istema" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Cartella &utente:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Sf&oglia..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Creatore di patch" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "File&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "File&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Scambia" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Appendi a un file esistente" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "Ris&ultato:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Sti&le:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Contesto:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Spa&zi bianchi" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Conf&ronta" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Ignora ca&mbiamenti" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&nora tutto" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignora lin&ee vuote" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Maiuscolo/Minuscolo" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Includi &linea di comando" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Apri in un e&ditor esterno" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Scelta delle colonne" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Sposta in &alto" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Sposta in &basso" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Seleziona scompattatore" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Scompattatore di file:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visualizza tutti gli scompattatori, non verificare l'estensione" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lista delle estensioni:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descrizione:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Progresso del confronto tra cartelle" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Confronto in corso..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Elementi confrontati:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Totale elementi:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Vai a" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Va&i a:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "File" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Vai a ..." -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nea" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "Di&fferenza" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Vai" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Confronto" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Spazi bianchi" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Confronta" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignora cambiamenti" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnora tutto" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ign&ora le linee vuote" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ig&nora le differenze tra maiuscole e minuscole" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "I&gnora differenze nei fine riga (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Attiva il rilevamento di blocc&hi spostati" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Metti in corrispondenza linee simili" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignora differenze di tempo inferiori a 3 secondi" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Metodo di confronto file:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Fermati dopo la prima differenza" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtra i commenti" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Evidenzia sintassi" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Riscansiona &automaticamente" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Conserva i caratteri originali di fine riga" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulazioni" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Dimensioni:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Inserisci tabulazioni" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "In&serisci spazi" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Colorazione delle differenze di linea" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Mostra differenze di linea" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "Livello &caratteri" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "Livello &parole:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtri di file" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Prova" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Installa..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Nuovo..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Modifica..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Elimina..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Salvare i file modificati?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "File sul lato sinistro" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Salva le modifiche" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "S&carta le modifiche" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "File sul lato destro" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S&alva le modifiche" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Sca&rta le modifiche" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Scarta tutto" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Codice di pagina" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Codice di pagina predefinito" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Scegli il codice di pagina predefinito assegnato al caricamento di file non-Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "Rileva le informazione sul codice di pagina per i file .html, .rc, .xml - necessario riavvio della sessione" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Codice di pagina del sistema" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "In accordo con l'interfaccia di WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Codice personalizzato:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Supporto per gli archivi inattivo" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Impossibile rilevare la versione di 7-Zip (forse non installato?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Il supporto per gli archivi all'interno dell'applicazione richiede l'installazione di 7-Zip 3.11 o superiore, o che le sue componenti essenziali siano copiate nella cartella del programma." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Ci deve essere un plugin appropriato (Merge7z*.dll) in questo percorso." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2062,12 +2073,12 @@ msgstr "" "Utilizza per favore la versione di 7-Zip raccomandata qui sotto fino alla disponbilit di\n" "nuove versioni." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Versione" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2076,54 +2087,54 @@ msgstr "" "Plugin richiesto\n" "(build dll %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versione raccomandata di 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "presente" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip installato sul tuo computer:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nessuno" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "mancante" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componenti 7-Zip per operazioni standalone:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "non aggiornato" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugin trovati nel percorso:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2132,488 +2143,499 @@ msgstr "" "Non visualizzare nuovamente questo &messaggio.\n" "(Potete sempre richiamare questo messaggio dal menu Guida)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Scarica plugin" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opzioni" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Categorie" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importa..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Esporta..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Parole chiave:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nomi funzioni:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Commenti:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Numeri:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Stringhe:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocessore:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Utente 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Utente 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Grassetto" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Rapporto sul confronto tra cartelle" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "&File di rapporto:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Sfoglia..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stile:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copia negli appunti" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtro privato o condiviso" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Che genere di filtro desideri creare?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro condiviso (per tutti gli utenti su questa macchina)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privato (solo per l'utente corrente)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Supporto per gli archivi" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Il supporto per gli archivi richiede l'installazione del plugin per 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Scarica il plugin per 7-Zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Attiva il supporto per i file di archivio" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Utilizza installazione standard di 7-Zip se disponibile" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "U&tilizza 7-Zip posizionato nella cartella di WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Rileva il tipo di archivio dalla firma del file" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Statistiche del confronto" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Cartelle:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "File:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diversi" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Testo:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binari:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unici" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Sinistra:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Destra:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identici" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Totale:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Chiudi" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Coinvolge" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Coinvolge)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Scegli codice di pagina per" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "Caricamento &file:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Salvataggio file:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Usa lo stesso codice di pagina per entrambi" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Applica" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "Annu&lla" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Prova del filtro" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Filtro in prova ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Inserisci testo di prova:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nome cartella" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Risultato:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Prova" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Chiudi" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Utilizza colori personalizzati per il testo" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Colori personalizzati per il testo" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Spazi bianchi:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Testo normale:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Selezione:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Percorsi" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Sola &lettura" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Sola lett&ura" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Apri..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Salva..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "File di backup" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Crea copie dei file per:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Crea le copie dei file in:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Cartella &originaria del file" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "Cartella &globale di backup:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nome della copia:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Aggiungi l'estensione .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "Aggiungi il ×tamp" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Conferma la copia" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Sei sicuro di voler copiare XXX elementi?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Da sinistra" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "A destra" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "S" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "No" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041004e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x410, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EST" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "MA" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "BS" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "SSC" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REG" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2622,7 +2644,7 @@ msgstr "" "Crea due nuovi documenti vuoti\n" "Nuovi documenti (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2631,7 +2653,7 @@ msgstr "" "Apre un documento esistente\n" "Apri" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" "Chiude il documento attivo\n" "Chiudi" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2649,7 +2671,7 @@ msgstr "" "Salva il documento attivo\n" "Salva" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2658,7 +2680,7 @@ msgstr "" "Salva il documento attivo con un nuovo nome\n" "Salva con nome" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" "Modifica le impostazioni di stampa\n" "Imposta pagina" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2676,7 +2698,7 @@ msgstr "" "Modifica le impostazioni relative alla stampante e alla stampa\n" "Imposta stampante" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2685,7 +2707,7 @@ msgstr "" "Stampa il documento attivo\n" "Stampa" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2694,12 +2716,12 @@ msgstr "" "Visualizza le pagine per intero\n" "Anteprima di stampa" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Rende nuovamente visibili tutti gli oggetti nascosti" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2708,32 +2730,32 @@ msgstr "" "Apre un file di progetto\n" "File di progetto (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Errore sconosciuto provando a aprire il file di progetto" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Errore sconosciuto provando a salvare il file di progetto" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "File di progetto" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "File di progetto caricato con successo." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "File di progetto salvato con successo." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2742,7 +2764,7 @@ msgstr "" "Salva i percorsi correnti e le opzioni in un file di progetto\n" "Salva il file di progetto" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2751,7 +2773,7 @@ msgstr "" "Visualizza le informazioni sul programma, il numero di versione e le informazioni di copyright\n" "Informazioni su" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2760,27 +2782,27 @@ msgstr "" "Esce dall'applicazione e chiede di salvare i documenti\n" "Esci" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Apre questo documento" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" "Passa al riquadro della finestra successivo\n" "Riquadro successivo" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2798,7 +2820,7 @@ msgstr "" "Ritorna al riquadro della finestra precedente\n" "Riquadro precedente" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2807,7 +2829,7 @@ msgstr "" "Dispone le finestre sovrapponendole\n" "Sovrapponi finestre" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2816,7 +2838,7 @@ msgstr "" "Dispone le finestre in orizzontale senza sovrapporle\n" "Affianca finestre in orizzontale" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2825,7 +2847,7 @@ msgstr "" "Dispone le finestre in verticale senza sovrapporle\n" "Affianca finestre in verticale" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" "Copia la selezione e la pone negli Appunti\n" "Copia" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2843,7 +2865,7 @@ msgstr "" "Taglia la selezione e la pone negli Appunti\n" "Taglia" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2852,7 +2874,7 @@ msgstr "" "Trova il testo specificato\n" "Trova" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2861,7 +2883,7 @@ msgstr "" "Inserisce il contenuto degli Appunti\n" "Incolla" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2870,7 +2892,7 @@ msgstr "" "Ripete l'ultima azione\n" "Ripeti" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2879,7 +2901,7 @@ msgstr "" "Sostituisce il testo specificato con un testo differente\n" "Sostituisci" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2888,7 +2910,7 @@ msgstr "" "Seleziona l'intero documento\n" "Seleziona tutto" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2897,7 +2919,7 @@ msgstr "" "Annulla l'ultima azione\n" "Annulla" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2906,7 +2928,7 @@ msgstr "" "Ripristina l'azione precedentemente annullata\n" "Ripristina" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2915,7 +2937,7 @@ msgstr "" "Mostra o nasconde la barra degli strumenti\n" "Mostra/nascondi barra degli strumenti" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2924,7 +2946,7 @@ msgstr "" "Mostra o nasconde la barra di stato\n" "Mostra/nascondi barra di stato" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2933,7 +2955,7 @@ msgstr "" "Mostra o nasconde la barra delle schede\n" "Mostra/nascondi barra delle schede" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2942,57 +2964,57 @@ msgstr "" "Ridimensiona automaticamente i pannelli\n" "Blocca pannelli" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Modifica le dimensioni della finestra" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Modifica la posizione della finestra" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Riduce la finestra ad icona" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Allarga la finestra a tutto schermo" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Passa alla finestra successiva del documento " -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Passa alla finestra precedente del documento" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Chiude la finestra attiva e chiede di salvare i documenti" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Ripristina la finestra alle dimensioni normali" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Attiva l'elenco dei task" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Attiva questa finestra" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3001,7 +3023,7 @@ msgstr "" "Chiude la modalit anteprima di stampa\n" "Annulla anteprima" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3020,7 +3042,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3032,23 +3054,23 @@ msgid "" "WinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Conserva caratteri di fine linea originali" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Premi qualsiasi pulsante" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Clicca con il tasto destro sul percorso per copiare" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3057,152 +3079,152 @@ msgstr "" "Sviluppatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge viene fornito ASSOLUTAMENTE PRIVO DI GARANZIA. Questo uin software gratuito e ne apprezzata la ridistribuzione a determinate condizioni; per dettagli, vedere la GNU General Public License nel menu Guida." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Termina" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Riprova" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignora" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignora t&utto" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&S" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "S a &tutto" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "No a t&utto" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Continua" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Salta" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "S&alta tutto" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Non visualizzare questo &messaggio di nuovo." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Non farmi pi &questa domanda." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Colori della sintassi" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Colori del testo" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Controllo versioni" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Da sinistra:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "A sinistra:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Da destra:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "A destra:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Versione %1 - Italiano" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opzioni (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Tutti i messaggi di avviso vengono ora visualizzati nuovamente." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Sono state effettuate modifiche ai file dell'attuale sessione di confronto. Alcune impostazioni potrebbero non venire applicate fino al riavvio del confronto corrente tra file." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Il carattere selezionato non sar utilizzato nelle finestre di visualizzazione delle differenze attualmente attive." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3213,7 +3235,7 @@ msgstr "" "\n" "Utilizza per favore un valore compreso tra 1 e %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3224,127 +3246,129 @@ msgstr "" "\n" "Riavvia per favore WinMerge al termine di questa operazione." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Apri" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmi|*.exe;*.bat;*.cmd|Tutti i file (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Tutti i file (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "File di progetto di WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "File delle opzioni (*.ini)|*.ini|Tutti i file (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "File di testo (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Tutti i file (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "File HTML (*.htm,*.html)|*.htm;*.html|Tutti i file (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "File XML (*.xml)|*.xml|Tutti i file (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Contenuti completi" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Contenuti rapidi" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Data ultima modifica" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Data ultima modifica e dimens." -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Dimensioni" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Percorso" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Descrizione" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Inserisci il nome del file per il nuovo filtro" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtri di file (*.flt)|*.flt|Tutti i file (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3357,7 +3381,7 @@ msgstr "" "Copia per favore il file %1 nella cartella WinMerge/Filters :\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3370,7 +3394,7 @@ msgstr "" "\n" "Assicurati che questa cartella esista e si abbiano i permessi di scrittura." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3381,7 +3405,7 @@ msgstr "" "\n" "Scegli per favore una cartella per i filtri in Opzioni->Sistema." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3394,12 +3418,12 @@ msgstr "" "\n" "Il file potrebbe essere di sola lettura." -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Scegli il file con il filtro da installare" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3410,208 +3434,223 @@ msgstr "" "\n" "Impossibile copiare il nuovo file nella cartella dei filtri." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Il file del filtro esiste gi. Desideri sovrascrivere il file esistente?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Espressione regolare" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Percorso di cleartool.exe:" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Percorso di SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Risultati del confronto tra cartelle" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Confronto tra file" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "File di sinistra senza titolo" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "File di destra senza titolo" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Loro file" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Miei file" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Scansione file in corso..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Apertura selezione" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Copia da sinistra a destra in corso" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Copia da destra a sinistra in corso" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Copia completa a sinistra in corso" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Copia completa a destra in corso" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Copia dei file in corso..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Eliminazione dei file in corso..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Spostamento dei file in corso..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Creazione del rapporto in corso..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Car: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linea: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Car: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Unione" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Differenza %1 su %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 differenze trovate" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 differenza trovata" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Elemento %1 su %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Elementi: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleziona due cartelle o file esistenti da confrontare" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Selezione cartella" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleziona due cartelle o due file da confrontare." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Il percorso di sinistra non valido!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Il percorso di destra non valido!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Entrambi i percorsi non sono validi!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleziona due file per attivare la selezione dello scompattatore." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossibile confrontare file e cartelle!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "File non trovato: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "File non scompattato: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3624,12 +3663,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3640,32 +3679,32 @@ msgstr "" "%1\n" "non un file di conflitto." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Salva con nome" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Vuoi salvare le modifiche in %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 marcato come di sola lettura. Desideri non tenere conto di questa impostazione? (Premi No per salvare con un nuovo nome.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Errore nel controllo sui permessi di scrittura della destinazione" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Errore durante il salvataggio di una copia di backup del file" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3678,7 +3717,7 @@ msgstr "" "\n" "Continuare comunque?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3695,7 +3734,7 @@ msgstr "" "\t-utilizzare un nome diverso per il file (Premi OK)\n" "\t-annullare l'operazione corrente (Premi Annulla)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3710,7 +3749,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3725,7 +3764,7 @@ msgstr "" "\n" "Desideri salvare la versione non compattata in un altro file?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3740,7 +3779,7 @@ msgstr "" "\n" "Sovrascrivere il file modificato?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3749,7 +3788,7 @@ msgstr "" "%1\n" " marcato come di sola lettura. Desideri non tenere conto della voce di Sola lettura?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3764,17 +3803,17 @@ msgstr "" "\n" "Se vuoi aggiornare i file chiudi l'attuale sessione di confronto e ricarica i file." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Salva il file di sinistra con nome" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Salva il file di destra con nome" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3785,42 +3824,42 @@ msgstr "" "\n" "Aggiorna i documenti prima di continuare." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "E' necessario specificare il percorso di un progetto SourceSafe per continuare (Es.: $/MioProgetto)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Estrazione dei file da VSS in corso..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe ha generato un errore tentando di estrarre il file. Impossibile continuare..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Errore nell'esecuzione di un comando del sistema di versioning." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La cartella di lavoro di VSS e la posizione del file corrente non coincidono. Continuare?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Nessun database di VSS trovato!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Errore di VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3831,7 +3870,7 @@ msgstr "" " Controlla per favore la configurazione della vista utilizzata.\n" " Annullare l'operazione di estrazione?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3840,170 +3879,169 @@ msgstr "" "Il sistema di versioning ha restituito un errore tentando di annullare l'estrazione del file.\n" " Controlla per favore la configurazione della vista utilizzata." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Nessuno" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (precedente a 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superiore)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Interrompi agli spazi bianchi" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Interrompi agli spazi bianchi o punteggiatura" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copia elemento selezionato in una cartella specifica" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copia elemento selezionato in una cartella personalizzata" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Elimina la voce selezionata sulla sinistra" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Elimina la voce selezionata sulla destra" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Elimina gli elementi selezionati in entrambi i lati" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Nascondi gli elementi selezionati (filtro al volo)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Rinomina gli elementi selezionati su entrambi i lati" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Da Destra a Sinistra (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Da Sinistra a Destra (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da Destra a Sinistra (%1 su %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da Sinistra a Destra (%1 su %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Sinistra in... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Destra in... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Sinistra in... (%1 su %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Destra in... (%1 su %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Sinistra (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Destra (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Entrambi (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Sinistra (%1 su %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Destra (%1 su %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Entrambi (%1 su %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Scegli cartella di destinazione" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Lato sinistro - scegli cartella di destinazione:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Lato destro - scegli cartella di destinazione:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 file coinvolti)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 file su %2 coinvolti)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4014,17 +4052,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Sei sicuro di voler copiare:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Sei sicuro di voler copiare %d elementi:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4043,458 +4081,473 @@ msgstr "" "\n" "Aggiorna per favore il confronto." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Apre il file di sinistra" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Apre il file di sinistra con l'editor esterno" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Apre il file di sinistra con..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Apre il file di destra" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Apre il file di destra con l'editor esterno" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Apre il file di destra con..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Impossibile lanciare l'editor esterno: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Estensione sconosciuta per l'editor esterno: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copia i nomi dei file negli appunti" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copia i percorsi del lato sinistro negli appunti" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copia i percorsi del lato destro negli appunti" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copia i percorsi di entrambi i lati negli appunti" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Formato dell'archivio sconosciuto" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Aggiunge elementi del lato sinistro a un archivio" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Aggiunge elementi del lato destro a un archivio" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Aggiunge elementi di entrambi i lati a un archivio" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Aggiunge gli elementi diversi a un archivio (entrambi i lati)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Sposta il file selezionato sulla sinistra in una cartella personalizzata" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Sposta il file selezionato sulla destra in una cartella personalizzata" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nome del file" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Cartella" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Risultato del confronto" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Data file di sinistra" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Data file di destra" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Estensione" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Dimensioni file di sinistra" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Dimensioni file di destra" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Dim. file destra (breve)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Data creazione file sinistra" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Data creazione file destra" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "File pi recente" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Versione file sinistra" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Versione file destra" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Risultato breve" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Attributi sinistra" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Attributi destra" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "EOL di sinistra" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "EOL di destra" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Codifica di sinistra" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Codifica di destra" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Diff. ignorate" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Differenze" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Impossibile confrontare i file" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Elemento annullato" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "File saltato" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Cartella saltata" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Solo sinistra: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Solo destra: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "I file binari sono identici" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "I file non di testo contengono delle differenze" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "I file contengono delle differenze" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Solo a sinistra" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Solo a destra" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Errore" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo trascorso: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 elemento selezionato" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elementi selezionati" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nome del file o della cartella." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome della sottocartella quando le sottocartelle sono incluse." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Risultato del confronto nella forma completa." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Data ultima modifica del file di sinistra." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Data ultima modifica del file di destra." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Estensione del file." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Dimensioni del file di sinistra in byte." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Dimensioni del file di destra in byte." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Dimensioni abbreviate del file di sinistra." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Dimensioni abbreviate del file di destra." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Data e ora di creazione del file di sinistra." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Data e ora di creazione del file di destra." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Mostra quale file ha la data dell'ultima modifica pi recente." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versione del file di sinistra, solo per alcuni tipi di file." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versione del file di destra, solo per alcuni tipi di file." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Risultato del confronto nella forma breve." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Attributi del file di sinistra." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Attributi del file di destra." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Tipo di fine linea nel file di sinistra" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Tipo di fine linea nel file di destra" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Codifica del file di sinistra." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Codifica del file di destra." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Numero di differenze ignorate nel file. Queste differenze sono ignorate da WinMerge e non possono venire unite." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Numero di differenze nel file. Questo numero non include le differenze ignorate." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Mostra un asterisco (*) se il file binario." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Confronto di %1 con %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Lista separata da virgole" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Lista separata da Tab" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML semplice" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "XML semplice" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Il file di rapporto esiste gi. Vuoi sovrascrivere il file esistente?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4503,32 +4556,32 @@ msgstr "" "Errore nella creazione del rapporto:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Il rapporto stato creato con successo." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Lo stesso file aperto in entrambi i pannelli." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "I file selezionati sono identici." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Si verificato un errore durante il confronto dei file." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Impossibile creare file temporanei. Controlla le impostazioni del percorso per i file temporanei." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4543,7 +4596,7 @@ msgstr "" "\n" "Nota: Se vuoi sempre trattare tutti i tipi di carriage return come equivalenti, imposta l'opzione 'Ignora le differenze di carriage return' nella linguetta Confronto delle Opzioni (raggiungibile dal menu Modifica->Opzioni)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4554,22 +4607,22 @@ msgstr "" "Con le opzioni correnti, saranno unificati al tipo principale.\n" "Vuoi cambiare le opzioni e conservare il differente fine riga ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "C' stato un errore nel prediffing del file '%1' con il plugin '%2'. Il prediffing non verr pi applicato." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "La cartella selezionata non valida." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossibile aprire il file binario nell'editor." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4584,7 +4637,7 @@ msgstr "" "%1\n" "dall'altro lato ed aprirle entrambe?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4595,132 +4648,132 @@ msgstr "" "La visualizzazione di ciascun file con il proprio codice di pagina fornir una migliore visualizzazione ma l'unione/copia sar pericolosa.\n" "Desideri trattare entrambi i file come se avessero il codice di pagina predefinito di Windows (raccomandato)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Attenzione: i file usano codifiche differenti, sinistra=%s e destra=%s, e l'unione pu causare una perdita di informazioni." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informazioni perse a causa di errori nella codifica: entrambi i file" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informazioni perse a causa di errori nella codifica: file di destra" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informazioni perse a causa di errori nella codifica: file di sinistra" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Nessuna differenza" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Differenza della linea" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "%1 stringhe sostituite." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Impossibile trovare la stringa '%s'" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copia percorso completo" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copia nome del file" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Pannello della locazione" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Pannello delle differenze" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "File di patch scritto con successo." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "Prima voce non trovata o una cartella!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "Seconda voce non trovata o una cartella!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Il file di patch esiste gi. Desideri sovrascriverlo?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 file selezionati]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normale" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Contesto" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unificato" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Impossibile scrivere nel file %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Il percorso di output specificato non un percorso assoluto: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Specifica un file di output" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossibile creare un file di patch da file binari." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossibile creare un file di patch da cartelle." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4731,17 +4784,17 @@ msgstr "" "\n" "La creazione di una patch richiede che non ci siano cambiamenti non salvati nei file." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "La cartella non esiste." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Gli attuali risultati del confronto tra cartelle verranno cancellati." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4752,7 +4805,7 @@ msgstr "" "Nessuno dei componenti necessari (7-zip e/o Merge7z*.dll) per il supporto sono stati trovati.\n" "Guarda il manuale per ulteriori informazioni sugli archivi e come attivare il supporto per essi." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4761,7 +4814,7 @@ msgstr "" "\n" "Nota: l'integrazione con 7-Zip stata disattivata nelle opzioni di WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4770,37 +4823,37 @@ msgstr "" "\n" "Note: l'integrazione con 7-Zip limitata a una installazione indipendente nelle opzioni di WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Scegli file per l'esportazione" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Scegli file per l'importazione" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Opzioni importate dal file." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Opzioni esportate nel file." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Impossibile importare le opzioni dal file." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Impossibile esportare le opzioni nel file." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4811,473 +4864,493 @@ msgstr "" "\n" "Sei sicuro di voler proseguire?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Errore nell'espressione regolare" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Nessuna corrispondenza" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Espressione regolare non valida" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Carattere di collazione non valido" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Carattere del nome della classe non valido" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Backslash che seguono" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Referenza inversa non valida" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Parentesi [ o [^ isolata" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Parentesi ( o \\( isolata" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Parentesi \\{ isolata" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contenuto di \\{\\} non valido" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Conclusione del range non valida" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Out of memory" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Espressione regolare precedente non valida" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Conclusione prematura dell'espressione regolare" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Espressione regolare troppo grande" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Parentesi ) o \\) isolata" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Europa occidentale" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Europa orientale" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Asia orientale" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Asia sud orientale e sud occidentale" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Medio oriente" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Non applicabile" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirillico" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latino USA" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabo" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greco" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltico" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latino 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greco 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latino 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirillico" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portoghese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandese" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Ebraico" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canada francofono" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordico" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirillico CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greco 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thailandese" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Giapponese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Cinese semplificato" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Cinese tradizionale" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latino 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirillico (Slavo)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latino 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greco" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latino 5 (Turco)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Ebraico" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabo" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltico" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Latino" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greco" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirillico" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh Europa centrale" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Islandese" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approssima a ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approssima a ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approssima a ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approssima a ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approssima a ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Mescolato" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Salva il file di sinistra" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Salva il file di destra" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Salva il file di sinistra con nome..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Salva il file di destra con nome..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Cambia lo stato di Sola lettura del file/cartella di sinistra" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Cambia lo stato di Sola lettura del file/cartella di destra" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Converte EOL nella modalit Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Converte EOL nella modalit Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Converte EOL nella modalit Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Passa dalla modalit di editing a quella di 'Unione', in cui l'integrazione delle differenze pi rapida" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5286,12 +5359,12 @@ msgstr "" "Visualizza e regola le propriet della codifica dei file\n" "Propriet della codifica dei file" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5300,7 +5373,7 @@ msgstr "" "Seleziona l'area della differenza nella linea corrente\n" "Differenza nella linea corrente" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5309,7 +5382,7 @@ msgstr "" "Vai a una linea o una differenza\n" "Vai a (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5318,7 +5391,7 @@ msgstr "" "Imposta le opzioni del programma\n" "Opzioni" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5327,37 +5400,37 @@ msgstr "" "Aggiorna la visualizzazione\n" "Aggiorna (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copia le linee selezionate negli Appunti aggiungendo i numeri di linea all'inizio" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Aggiorna gli elementi selezionati" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Imposta un segnalibro" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Va al segnalibro successivo" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Va al segnalibro precedente" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Cancella tutti i segnalibri" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5366,7 +5439,7 @@ msgstr "" "Mostra gli elementi che sono completamente identici\n" "Mostra elementi identici" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5375,7 +5448,7 @@ msgstr "" "Mostra gli elementi che hanno delle differenze\n" "Mostra elementi differenti" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5384,7 +5457,7 @@ msgstr "" "Mostra gli elementi che esistono solo sul lato sinistro\n" "Mostra elementi unici a sinistra" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5393,7 +5466,7 @@ msgstr "" "Mostra gli elementi che esistono solo sul lato destro\n" "Mostra elementi unici a destra" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5402,7 +5475,7 @@ msgstr "" "Mostra i file binari\n" "Mostra i file binari" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5411,7 +5484,7 @@ msgstr "" "Mostra gli elementi saltati\n" "Mostra gli elementi saltati" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5420,7 +5493,7 @@ msgstr "" "Seleziona il carattere per la visualizzazione\n" "Seleziona carattere visualizzazione" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5429,27 +5502,27 @@ msgstr "" "Ripristina il carattere predefinito del sistema per la visualizzazione\n" "Carattere predefinito" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Mostra gli spazi bianchi" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Mostra il pannello delle differenze" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Il pannello della locazione mostra un'immagine complessiva dei file" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra la finestra con le statistiche del confronto tra cartelle" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5458,7 +5531,7 @@ msgstr "" "Scegli la lingua dell'interfaccia per l'utente corrente\n" "Lingua" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5467,12 +5540,12 @@ msgstr "" "Mostra le differenze fra le righe con colori differenti\n" "Mostra differenze fra righe" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Scambia le posizioni dei due pannelli" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5481,7 +5554,7 @@ msgstr "" "Mostra i numeri delle righe\n" "Mostra numeri delle righe" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5490,7 +5563,7 @@ msgstr "" "Vai a capo automaticamente\n" "Va a capo automaticamente (word wrap)" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5499,22 +5572,22 @@ msgstr "" "Mostra i margini di selezione per entrambi i pannelli\n" "Mostra margini di selezione" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Aumenta la dimensione del testo" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Riduci la dimensione del testo" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Ripristina la dimensione predefinita del testo" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5523,7 +5596,7 @@ msgstr "" "Scorri alla differenza precedente\n" "Differenza precedente (Alt+Su)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5532,7 +5605,7 @@ msgstr "" "Scorri alla differenza successiva\n" "Differenza successiva(Alt+Gi)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5541,7 +5614,7 @@ msgstr "" "Scorri alla prima differenza\n" "Prima differenza (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5550,7 +5623,7 @@ msgstr "" "Passa alla differenza corrente\n" "Differenza corrente (Alt+Invio)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5559,7 +5632,7 @@ msgstr "" "Scorri all'ultima differenza\n" "Ultima differenza (Alt+Fine)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5568,7 +5641,7 @@ msgstr "" "Copia il testo selezionato dal file di sinistra a quello di destra\n" "Copia a destra (Freccia destra)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5577,7 +5650,7 @@ msgstr "" "Copia il testo selezionato dal file di destra a quello di sinistra\n" "Copia a sinistra (Freccia sinistra)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5586,7 +5659,7 @@ msgstr "" "Copia la differenza a destra e avanza alla prossima\n" "Copia a destra e avanza (Ctrl+Alt+Destra)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5595,7 +5668,7 @@ msgstr "" "Copia la differenza a sinistra e avanza alla prossima\n" "Copia a sinistra e avanza (Ctrl+Alt+Sinistra)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5604,7 +5677,7 @@ msgstr "" "Copia tutte le differenze dal file di sinistra a quello di destra\n" "Tutto a destra" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5613,72 +5686,77 @@ msgstr "" "Copia tutte le differenze dal file di destra a quello di sinistra\n" "Tutto a sinistra" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Elimina gli elementi selezionati da entrambe le cartelle" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Confronta l'elemento selezionato (confronta il primo elemento se ne sono stati selezionati pi di uno)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleziona e riordina le colonne da visualizzare nei confronti tra cartelle" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Crea un file di patch" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Seleziona e modifica i filtri" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Genera un rapporta con i risultati del confronto" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "L'utente seleziona lo scompattore (nessuna scompattazione nel confronto tra cartelle)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Lo scompattatore adatto applicato a entrambi i file ( sufficiente che uno dei file abbia l'estensione)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleziona uno scomapattatore per modificare questo file" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "No prediffer (normale)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Plugin suggeriti" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Altri plugin" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Scarica tutti i plugin e ricaricali (per sviluppatori)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5687,12 +5765,12 @@ msgstr "" "Attiva il prossimo file visibile\n" "Attiva prossimo file" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Chiude tutte le finestre aperte" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5701,22 +5779,22 @@ msgstr "" "Apri la Guida di WinMerge\n" "Guida WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Invia le informazioni sulla versione e la configurazione corrente di WinMerge a un file di testo" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Mostra la GNU General Public License" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Build privata: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5725,7 +5803,7 @@ msgstr "" "Apri il documento delle note di rilascio\n" "Note di rilascio" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5734,262 +5812,267 @@ msgstr "" "Apri il sito per le traduzioni\n" "Traduzioni" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Impostazioni plugin" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "No prediffer" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediff se possibile" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH non trovato - script .sct disattivati" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Apri il file con l'applicazione registrata per esso" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Apri il file con l'editor esterno" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Apri il file con un programma specifico" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Non visualizzare i blocchi spostati" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Mostra tutti i blocchi spostati" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Visualizza i blocchi spostati solo dalla differenza corrente" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Vai alla differenza all'altezza del cursore" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Vai alla &differenza %1 su %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Vai alla &linea %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Disattivato" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Dal file system" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Dalla lista dei file recenti" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Oggetto portabile" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Risorse" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Nascondi la barra degli strumenti" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Mostra barra degli strumenti piccola" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Mostra barra degli strumenti grande" diff --git a/Src/Languages/Japanese.po b/Src/Languages/Japanese.po index 6b0418f7a52..456ce2de0f5 100644 --- a/Src/Languages/Japanese.po +++ b/Src/Languages/Japanese.po @@ -71,7 +71,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "Rs[(&C)" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "\t(&P)" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "ړ(&G)..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "J(&E)" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "o^ꂽAvP[V(&R)" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "OGfB^(&E)" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "vȎI(&W)..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "t@C(&F)" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "VK쐬(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "J(&O)...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "RtNgt@CJ(&E)..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "vWFNgJ(&J)...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "vWFNgۑ(&V)..." @@ -160,1855 +162,1864 @@ msgid "Recent Projects" msgstr "ŋߎgpvWFNg" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "I(&X)" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "ҏW(&E)" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "ݒ(&O)..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "\(&V)" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "tHgI(&F)..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "ftHgtHggp(&O)" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "c[o[(&T)" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "Ȃ(&N)" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "(&S)" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "(&B)" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Xe[^Xo[(&S)" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "^uo[(&B)" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "(&L)..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "c[(&T)" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "tB^(&F)..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "pb`̐(&G)..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "vOC(&P)" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "蓮WJ" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "WJ" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "WJvOCŊJ" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "vOC̍ēǍ(&R)" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "fobO(&D)" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "RtBOt@CǍ(&L)..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "ݒ̃Zbg(&R)" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "EBhE(&W)" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "‚(&O)\tCtrl+W" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Sĕ‚(&S)" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "yCύX(&P)\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "㉺ɕׂĕ\(&H)" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Eɕׂĕ\(&V)" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "d˂ĕ\(&C)" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "wv(&H)" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge wv\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "[Xm[g(&E)" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "|(&T)" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "ݒ(&O)" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "A[JCuT|[gł(&R)..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "WinMergeɂ‚(&A)..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "ǂݎp(&E)" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Eǂݎp(&I)" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "t@CGR[fBO(&E)" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "ׂđI(&A)\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "ꍀڂ̕\(&I)" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "ٍڂ̕\(&D)" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "݂̂ɑ݂鍀ڂ̕\(&E)" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Ê݂ɑ݂鍀ڂ̕\(&G)" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "XLbvꂽڂ̕\(&K)" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "oCit@C̕\(&H)" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "\̍ڂ\(&E)" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "rv(&R)" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "ŐV̏ɍXV(S)\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "IڂŐVɍXV(&R)\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "}[W(&M)" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "r(&M)\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "̍(&N)\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "O̍(&P)\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "ŏ̍(&F)\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "݂̍(&C)\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Ō̍(&L)\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "EɃRs[(&R)\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "ɃRs[(&E)\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "폜(&D)\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "̐ݒ(&C)..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "|[g̐(&R)..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "ۑ(&S)\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "̃t@Cۑ(&L)" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "ۑ(&S)" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Otĕۑ(&A)..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Ẽt@Cۑ(&R)" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "(&P)..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "y[Wݒ(&T)" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "vr[(&W)" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "sR[h̕ϊ(&C)" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "}[W[h(&M)\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "t@CGR[fBO(&F)..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "ɖ߂(&U)\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "蒼(&R)\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "؂(&T)\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "Rs[(&C)\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "\t(&P)\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "s̍قI(&D)\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "(&F)...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "u(&E)...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "XNvg(&S)" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Ȃ >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "xȑ" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "sԍtŃRs[(&C)\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "ubN}[N(&B)" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ubN}[N̍쐬E폜(&T)\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "̃ubN}[Nֈړ(&N)\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "ÕubN}[Nֈړ(&P)\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "SẴubN}[NNA(&C)" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "ړ(&G)...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "g(&Z)" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "tHgTCYg\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "tHgTCYk\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "tHgTCYɖ߂(&N)\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "V^bNXnCCg" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "yCbN(&L)" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "󔒂\(&V)" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "s̍ق\(&W)" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "sԍ\(&N)" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "}[W\(&M)" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "sE[ŐܕԂ(&R)" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "yČ(&A)" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "DiffyC(&P)" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "P[VyC(&C)" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "ɃRs[Ďɐi(&T)\tAlt+Ctrl+Left" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "EɃRs[Ďɐi(&O)\tAlt+Ctrl+Right" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "SĂEɃRs[(&A)" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "SĂɃRs[(&Y)" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "rOvOC(&P)" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "r(&A)" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Ȕr(&M)" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "XML(&X)" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "E(&L)" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "QƐ(&E)..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "E獶(&R)" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "EQƐ(&I)..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "ړ(&M)" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "QƐ(&L)..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "EQƐ(&R)..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "폜(&D)" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "(&L)" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "E(&R)" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "(&B)" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "O̕ύX(&N)" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "ڂ\(&H)" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "J(&O)" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "EJ(&P)" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "pXRs[(&Y)" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "(&L) (%1 / %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "E(&R) (%1 / %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "(&B) (%1 / %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "t@CRs[(&F)" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "k(&Z)" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "(&L)... (%1 / %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "E(&R)... (%1 / %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "(&B)... (%1 / %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "(&D)... (%1 / %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "IڂŐVXV(&R)" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "tpXRs[(&C)" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "t@CRs[(&F)" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "rOvOCݒ" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "gpȂ(&N)" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "قֈړ(&O)" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "ړubN\Ȃ(&N)" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "SړubN\(&A)" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "ݍق̈ړubN̂ݕ\(&C)" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "WinMergeɂ‚" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Private Build)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "All rights reserved." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMergẽz[y[Wɍs!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "v" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "t@C܂̓tH_̑I..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "(&L):" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "Q(&B)..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "E(&R):" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Q(&W)..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "tB^(&F):" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "I..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "WJvOC(&U):" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "I(&S)..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "TutH_܂(&I)" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Xe[^X:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "LZ" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "wv" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "rt@C܂̓tH_" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "f[^x[X:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "vWFNg:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "[U[:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "pX[h:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "ΏVSSvWFNgƃN" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "SĂ̍ڂɓKp" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "`FbNAEg" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Otĕۑ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "o[WǗVXe" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "o[WVXe(&V):" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exeւ̃pX(&P):" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Iɍŏ̍قɃXN[(&S)" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "XvbVʂ\(&D)" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESCL[ŃEChE‚(&O)" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "J_CAOŎIɃpX" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "̃CX^XNȂ(&O)" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "̃EChE‚Ƃɐq˂(&K)" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "t@Cr̃t@Cۂ(&P)" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "J_CAÕI[gRv[g(&O):" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "̔rEChEL" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "tH_r(&F)" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "t@Cr(&E)" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge ́A‚̋ʃbZ[W{bNX\ɂł܂B SẴbZ[W{bNXĂѕ\ɂ́AZbg{^ĂB" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Zbg" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "gp”\Ȍ:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "(&N)" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "PPʂŒT(&W)" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "啶Əʂ(&C)" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "K\(&E)" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Ō܂Ōニ[vȂ(&O)" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "(&U)" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "(&D)" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "(&F)" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "u" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "u̕(&P):" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "t@C̏I[Ő܂ԂȂ(&D)" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "u" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "I͈(&S)" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "t@CS(&O)" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "uĎ(&R)" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "ׂĒu(&A)" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "`FbNAEg" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Rg" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "`FbNAEg`FbNC" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "stB^" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "stB^Lɂ" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "K\ (s):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "ۑ(&S)" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "VK(&N)" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "ҏW(&E)" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "폜(&R)" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "F" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "ق:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Iꂽ:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "wi" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "폜" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "eLXg" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "ꂽ:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "ړubN:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "IꂽړubN:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "P̍:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "IꂽP̍:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "ftHg" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "_CAO" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "VXe" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "폜ꂽt@CݔɈړ(&P)" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "VF" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "GNXv[[̃ReLXgj[ɒlj(&A)" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "gj[Lɂ(&N)" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "uTutH_܂ށvftHgƂ(&C)" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "OGfB^(&E):" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "tB^tH_(&F):" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Q(&R)" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "e|t@CtH_" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "VXẽe|tH_(&Y)" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "JX^tH_(&U):" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Q(&O)..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "pb`" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "t@C&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "t@C&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "(&S)" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "̃t@Cɒlj(&A)" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "(&R):" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "o͌`(&F)" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "X^C(&Y):" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "ReLXg(&C):" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "(&H)" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "r(&P)" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "ύX𖳎(&G)" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "ׂĖ(&N)" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "󔒍s𖳎(&E)" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "啶Əʂ(&T)" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "R}hs܂߂(&D)" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "OGfB^ŊJ(&X)" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "\" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "(&U)" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "(&D)" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "WJvOC̑I" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "t@CWJvOC:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "ׂĂ̓WJvOC\Agq`FbN܂B(&A)" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "gqꗗ:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " tH_ris" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "~" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "ڂrĂ܂..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "r:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Sڐ:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "ړ" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "ԍ(&O):" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "t@C" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "ړ" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "s(&I)" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "(&D)" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "ړ(&G)" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "r" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "r(&C)" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "ύX𖳎(&I)" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "ׂĖ(&G)" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "s𖳎(&K)" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "啶ƏʂȂ(&C)" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "s̈Ⴂ𖳎(&R) (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "ړubNoLɂ(&N)" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "ގs}b`(&M)" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3bȉ̎ԍ𖳎" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "t@Cr@(&F):" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "ŏ̍قŔrI(&T)" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Rg̍ق𖳎" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "GfB^" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "V^bNXnCCg(&H)" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "IɍăXL(&A)" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "EOLۑ(&P)" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "^u" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "^u(&T):" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "^u}(&I)" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Xy[X}(&S)" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "sق̐Ft" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "sق\" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "P(&C)" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "PP(&W):" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "t@CtB^" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "eXg..." -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "CXg[..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "VK..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "ҏW..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "폜..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "ύXꂽt@Cۑ܂?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "t@C" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "ύXۑ(&S)" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "ύXj(&D)" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Et@C" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "ύXۑ(&A)" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "ύXj(&C)" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "ׂĔj" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "R[hy[W" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "ftHgR[hy[W" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Unicodet@Cǂݍ񂾂Ƃ̃ftHgR[hy[Ww肵ĉ:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2017,32 +2028,32 @@ msgstr "" ".html, .rc, .xml t@C̃R[hy[Wo\n" "ZbV̍ċNKvł" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "VXeR[hy[W" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "݂WinMerge[U[C^[tF[Xɏ]" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "JX^R[hy[W:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - A[JCuT|[g" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "7-Zip̃o[Woł܂B(CXg[ĂȂ?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2051,24 +2062,24 @@ msgstr "" "A[JCuT|[gLɂɂ 7-Zip ̃o[W 3.11 ȍ~CXg[邩A\n" "X^hÂ߂ɕKvȃR|[lgvOtH_ɃRs[ĂB" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "܂AK؂ȃC^[tF[XvOC (Merge7z*.dll) PATHɑ݂ĂȂ΂Ȃ܂B" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "ŐṼo[W̃C^[tF[XvOCp”\ɂȂ܂ŁAȉ̐7-Zip ̃o[WgpĂB" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "o[W" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2077,54 +2088,54 @@ msgstr "" "KvȃvOC\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "7-Zip ̐o[W:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "CXg[Ă 7-Zip:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "Ȃ" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "missing" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "ޱݑɕKv 7-Zip ߰:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "PATH̃vOC:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2133,488 +2144,499 @@ msgstr "" "ēx̃bZ[W\Ȃ(&M)B\n" "(wvj[炱̃bZ[W\ł܂B)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "׸޲޳۰" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "IvV" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " JeS" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "C|[g..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "GNX|[g..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "L[[h:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "֐:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Rg:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "l:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Iy[^:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr ":" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "vvZbT:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "[U[1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "[U[2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "tH_r|[g" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "|[gt@C(&F):" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Q..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "X^C(&S):" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "Nbv{[hɃRs[(&C)" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "L/vCx[gtB^" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "ǂ̃^CṽtB^쐬܂?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "LtB^ (̃}V̑SẴ[U[ɗL)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "vCx[gtB^ (݂̃[U[̂)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "A[JCuT|[g" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "A[JCuT|[g@\̎gpɂ́A7-Zip vOC̃CXg[Kvł:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "7-zip vOC _E[h" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "A[JCut@CT|[gLɂ(&E)" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "p”\ł΁AX^hA7-Zipgp(&U)" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "WinMergetH_̃[J7-Zipgp(&S)" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "t@C̃VOl`A[JCu̎ނo(&D)" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "rv" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "tH_:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "t@C:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "eLXg:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "oCi:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Е̂" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr ":" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "E:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "v:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "‚" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "p" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Affects)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "R[hy[W̑I" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "t@CǍ(&F):" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "t@Cۑ(&S)" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "ɓR[hy[Wgp" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "Kp(&A)" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "LZ(&C)" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "tB^̃eXg" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "eXgtB^..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "eXgeLXg̓(&E):" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "tH_(&F)" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "eXg(&T)" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "‚(&C)" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "JX^eLXgJ[gp(&U)" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "JX^eLXgJ[" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr ":" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "WeLXg:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "I:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "pX" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "ǂݎp(&E)" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "ǂݎp(&A)" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "J..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "ۑ..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "obNAbvt@C" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "쐬obNAbv:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "obNAbvt@C쐬:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "t@C̃tH_(&O)" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "obNAbvtH_(&G):" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "obNAbvt@C:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr ".bak gqlj" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "^CX^vlj(&P)" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Rs[̊mF" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "{ɍ XXX Rs[܂?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "E" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "͂" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041103a4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x411, 932" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "fB" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "㏑" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "L^" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2623,7 +2645,7 @@ msgstr "" "VhLg𐶐܂\n" "VKhLg (Ctrl-N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2632,7 +2654,7 @@ msgstr "" "̃hLgJ܂\n" "J (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2641,7 +2663,7 @@ msgstr "" "ƒ̃hLg‚܂\n" "‚" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2650,7 +2672,7 @@ msgstr "" "ƒ̃hLgۑ܂\n" "ۑ (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2659,7 +2681,7 @@ msgstr "" "ƒ̃hLgVO‚ĕۑ܂\n" "Otĕۑ" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2668,7 +2690,7 @@ msgstr "" "IvVύX܂\n" "y[W CAEg̐ݒ" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2677,7 +2699,7 @@ msgstr "" "v^/IvV̕ύX\n" "ݒ" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2686,7 +2708,7 @@ msgstr "" "ƒ̃hLg܂\n" "" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2695,12 +2717,12 @@ msgstr "" "C[W\܂\n" "vr[" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "\ɂڂ\܂" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2709,32 +2731,32 @@ msgstr "" "vWFNgJ܂\n" "vWFNgJ (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "m̃G[:vWFNgt@CJ܂" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "m̃G[:vWFNgt@Cۑł܂" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "vWFNgt@C" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "vWFNgt@CǍ܂܂" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "vWFNgt@Cۑ܂" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2743,7 +2765,7 @@ msgstr "" "݂̃pXƃIvVݒvWFNgt@Cɕۑ܂\n" "vWFNgt@C̕ۑ" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2752,7 +2774,7 @@ msgstr "" "vȌAo[WĒ쌠\܂\n" "o[W" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2761,27 +2783,27 @@ msgstr "" "AvP[VIAt@C̕ۑw܂\n" "I" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "w̃t@CJ" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2790,7 +2812,7 @@ msgstr "" "̃EBhEyCɐ؂ւ܂\n" "̃yC" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2799,7 +2821,7 @@ msgstr "" "ÕEBhEyCɐ؂ւ܂\n" "ÕyC" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2808,7 +2830,7 @@ msgstr "" "EBhEd˂ĕ\܂\n" "d˂ĕ\" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2817,7 +2839,7 @@ msgstr "" "EBhE㉺ɕׂĕ\܂\n" "㉺ɕׂĕ\" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2826,7 +2848,7 @@ msgstr "" "EBhEEɕׂĕ\܂\n" "Eɕׂĕ\" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2835,7 +2857,7 @@ msgstr "" "I͈͂Nbv{[hɃRs[܂\n" "Rs[" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2844,7 +2866,7 @@ msgstr "" "I͈͂؂āANbv{[hɃRs[܂\n" "؂" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2853,7 +2875,7 @@ msgstr "" "w肵܂\n" "" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2862,7 +2884,7 @@ msgstr "" "Nbv{[h̓e}܂\n" "\t" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2871,7 +2893,7 @@ msgstr "" "OɍsJԂ\n" "JԂ" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2880,7 +2902,7 @@ msgstr "" "w肳ꂽAق̕ɒu܂\n" "u" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2889,7 +2911,7 @@ msgstr "" "hLgŜI܂\n" "ׂđI" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2898,7 +2920,7 @@ msgstr "" "OɍsȂ܂\n" "ɖ߂ (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2907,7 +2929,7 @@ msgstr "" "OɍsJԂ\n" "JԂ (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2916,7 +2938,7 @@ msgstr "" "c[o[̕\/\؂ւ܂\n" "c[o[\̃gO" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2925,7 +2947,7 @@ msgstr "" "Xe[^Xo[̕\/\؂ւ܂\n" "Xe[^Xo[\̃gO" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2934,7 +2956,7 @@ msgstr "" "^uo[̕\/\؂ւ܂\n" "^uo[\̃gO" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2943,57 +2965,57 @@ msgstr "" "IɃyCTCY܂\n" "yC̃bN" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "EBhẼTCYύX" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "EBhËʒuύX" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "EBhEŏ" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "EBhEő剻" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "̃EBhEɐ؂ւ" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "ÕEBhEɐ؂ւ" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "ƒ̃EBhE‚AύXt@C̕ۑw" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "EBhEʏ̃TCYɖ߂" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "AvP[V̐؂ւ" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "w̃EBhE\" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3002,7 +3024,7 @@ msgstr "" "vr[[hI܂\n" "vr[̃LZ" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3021,7 +3043,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge File Compare" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3040,23 +3062,23 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Folder Compare" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "EOLێ܂" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "L[Ă" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "ENbNŃpXRs[" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3065,152 +3087,152 @@ msgstr "" "Developers:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "~(&A)" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "Ďs(&R)" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "(&I)" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "SĖ(&A)" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "͂(&Y)" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "SĂ͂(&A)" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "(&N)" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "SĂ(&L)" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "s(&C)" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "XLbv(&S)" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "ׂăXLbv(&A)" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Ăт̃bZ[W\Ȃ(&M)" -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Ăт̎Ȃ(&Q)" -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "V^bNXJ[" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "eLXgJ[" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "o[WǗ" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "To:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr ":" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr ":" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "E:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "E:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Version %1 - Japanese" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "IvV (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "ׂẴbZ[W{bNXAĂѕ\܂B" -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "݊JĂt@C͕ύXĂ܂B‚̐ݒ́Ã݂t@CrȂ܂ŔfȂ܂B" -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "IꂽtHg͌ݕ\Ă鍷كEChEɂ͓Kp܂B" -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3221,7 +3243,7 @@ msgstr "" "\n" "1%1܂ł̒lw肵ĂB" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3232,127 +3254,129 @@ msgstr "" "\n" "ZbgWinMergeċNĂB" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "J" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "vO|*.exe;*.bat;*.cmd|ׂẴt@C(*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "ׂẴt@C (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge vWFNgt@C (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "ݒt@C (*.ini)|*.ini|ׂẴt@C(*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "eLXgt@C (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML t@C (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML t@C (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "tRec" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "NCbNRec" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "XV" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "XVƃTCY" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "TCY" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "ꏊ" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "tB^" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "VtB^̃t@Cw肵Ă" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "t@CtB^ (*.flt)|*.flt|All Files (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3365,7 +3389,7 @@ msgstr "" "t@C %1 ȉ WinMerge/Filters tH_ɃRs[Ă:\n" "%2" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3377,7 +3401,7 @@ msgstr "" "\n" "tH_݂̑܂͏݉”\ł邩mFĂB" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3388,7 +3412,7 @@ msgstr "" "\n" "[IvV/VXe]ŃtB^tH_w肵ĂB" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3400,12 +3424,12 @@ msgstr "" "\n" "̃t@C͓ǂݎpł͂܂?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "CXg[tB^t@C̈ʒu" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3416,208 +3440,223 @@ msgstr "" "\n" "VtB^t@CtB^tH_ɃRs[ł܂łB" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "tB^t@C͊ɑ݂܂B݂Ăt@C㏑܂?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "K\" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "cleartool.exeւ̃pX(&P) :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "SS.EXEւ̃pX(&P) :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "tH_r" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "t@Cr" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "E" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Theirs File" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Mine File" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "t@CXLĂ܂..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Iꂽt@CJĂ܂" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "EɃRs[Ă܂" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "E獶ɃRs[Ă܂" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "SĂɃRs[Ă܂" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "SĂEɃRs[Ă܂" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "t@CRs[Ă܂..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "t@C폜Ă܂..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "t@CړĂ܂..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "|[g𐶐Ă܂..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "s: %s : %d/%d : %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "s: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "s: %s : %d/%d : %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "}[W" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr " %1/%2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1‚̍ق‚܂" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1‚̍ق‚܂" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr " %1/%2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr ": %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "݂tH_܂́At@CIĂ" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Folder Selection" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "2‚̃tH_܂́A2‚̃t@CIĂB" -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "̃pX͕sȃpXł!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "ẼpX͕sȃpXł!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "̃pX͕sȃpXł!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "WJvOCILɂɂ̓t@C‘IĂB" -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "t@CƃtH_͔rł܂!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "t@C‚܂: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "t@CWJĂ܂: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3630,12 +3669,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "RtNgt@C̉͂Ɏs܂B" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3646,34 +3685,34 @@ msgstr "" "%1\n" "̓RtNgt@Cł͂܂B" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Otĕۑ" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "" "t@C %1 ̓e͕ύXĂ܂B\n" "ύXۑ܂?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1͓ǂݎpt@CłB ǂݎpt@C㏑܂? (Vt@Cł͕ۑ܂B)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "t@C݉ƒ`FbNG[" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "t@CobNAbvG[" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3686,7 +3725,7 @@ msgstr "" "obNAbvł܂B\n" "đ܂?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3702,7 +3741,7 @@ msgstr "" "ʖŕۑꍇOkA\n" "~ꍇ́ALZĂ" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3717,7 +3756,7 @@ msgstr "" "\n" "WJꂽ̂ʃt@Cɕۑ܂?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3732,7 +3771,7 @@ msgstr "" "\n" "WJꂽ̂ʃt@Cɕۑ܂?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3744,7 +3783,7 @@ msgstr "" "%1\n" "̃t@C WinMerge ȊÕAvP[VŏCĂ܂BCꂽt@Cɏ㏑܂?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3753,7 +3792,7 @@ msgstr "" "%1\n" "́AǂݎpłB ǂݎp̍ڂ㏑܂?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3768,17 +3807,17 @@ msgstr "" "\n" "t@CXVꍇ́At@CJĂB" -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Otč̃t@Cۑ" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "OtĉẼt@Cۑ" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3789,42 +3828,42 @@ msgstr "" "\n" "sOɃhLgF5L[ōŐVɂĂB" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "s邽߂ɂ́ASourceSafevWFNgpXw肵ĂB (: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "VSSt@C`FbNAEgĂ܂..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "t@C̃`FbNAEgŃG[܂B pł܂..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "o[WVXeR}h̎sG[B" -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSSƃtH_ƌ݂̃t@Cʒu͈vĂ܂Bs܂?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "VSS̃f[^x[X݂‚܂!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "VSS̃G[:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3835,7 +3874,7 @@ msgstr "" " gpĂr[̐ݒmFĂB\n" " `FbNAEgLZ܂?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3844,170 +3883,169 @@ msgstr "" "o[WǗVXéAt@C̃`FbNAEgLZɃG[Ԃ܂B\n" " gpĂr[̐ݒmFĂB " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Ȃ" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 )" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ȏ)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "󔒂ŋ؂" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "󔒂Ǔ_ŋ؂" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "IꂽڂwtH_ɃRs[܂" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "IꂽڂIꂽtH_ɃRs[܂" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "̑Iꂽڂ폜܂" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "ȆIꂽڂ폜܂" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "̑Iꂽڂ폜܂" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Iꂽڂ\ɂ܂(IUtC tB^)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "̑Iꂽڂ̖OύX܂" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "E獶 (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "E (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "E (%1 / %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "E (%1 / %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "E... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "... (%1/%2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "E... (%1/%2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "E (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "E (%1 / %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "ΏۃtH_IĂ" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - Rs[/ړtH_̎w:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "E - Rs[/ړtH_̎w:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ‚̃t@Cɍp)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1/%2 ‚̃t@Cɍp)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4019,17 +4057,17 @@ msgstr "" "%1\n" "폜܂?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "{ɃRs[܂?:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "{%dڂRs[܂?:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4048,458 +4086,473 @@ msgstr "" "\n" "ēxrĂB" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "̃t@CJ܂" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "OGfB^ō̃t@CJ܂" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "̃t@CIAvP[VŊJ܂..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Ẽt@CJ܂" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "OGfB^ʼnẼt@CJ܂" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Ẽt@CIAvP[VŊJ܂..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "OGfB^̎sɎs܂: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "OGfB^̊gqm̊gqł: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Nbv{[hɃt@CRs[܂" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "̃pXNbv{[hɃRs[܂" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "ẼpXNbv{[hɃRs[܂" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "̃pXNbv{[hɃRs[܂" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "m̃A[JCu`ł" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "A[JCuɍ̍ڂlj܂" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "A[JCuɉE̍ڂlj܂" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "A[JCuɗ̍ڂlj܂" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "A[JCuɍق̂闼̍ڂlj܂" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "̑Iꂽt@Cw肵tH_Ɉړ܂" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "ȆIꂽt@Cw肵tH_Ɉړ܂" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "t@C" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "tH_" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "r" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "t" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Et" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "gq" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "TCY" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "ETCY" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "ETCY (Zk)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "TCY (Zk)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "쐬" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "E쐬" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Vt@C" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "t@Co[W" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Et@Co[W" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "ȈՌʕ\" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "E" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "EOL" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "EEOL" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "GR[fBO" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "EGR[fBO" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "ꂽِ" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "ِ" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "oCi" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "t@Crł܂" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "fꂽ" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "XLbvꂽt@C" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "XLbvꂽtH_" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "̂: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Ê: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "oCit@C͓ł" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "oCit@C͈قȂĂ܂" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "t@C͈قȂĂ܂" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "̂" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Ê" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "G[" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "oߎ: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1‚̍ڂI" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1‚̍ڂI" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "t@C܂́AtH_" -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "TutH_܂܂ꂽƂ̃TutH_" -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "`̔rʕ\" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "̍XVt" -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "E̍XVt" -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "t@Cgq" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "t@C̃oCg" -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Et@C̃oCg" -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "t@C̃oCg(Zk`)" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Et@C̃oCg(Zk`)" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "̍쐬" -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "E̍쐬" -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "ǂ炪ŐV̕ύXt܂B" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "t@C̃o[W, ꂽt@C^Cv̂" -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Et@C̃o[W, ꂽt@C^Cv̂" -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Z`̔rʕ\" -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "̑" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Ȇ" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "EOL^Cv" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "EEOL^Cv" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "GR[fBO" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "EGR[fBO" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "t@CŖꂽِB̍قWinMergeɂĖA}[W܂B" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "t@CِBِ͖̍ꂽِ܂݂܂B" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "AoCit@CȂAX^XN(*)\܂B" -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "%1 %2 ̔r" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "CSV`" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "TAB؂`" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "VvHTML`" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "VvXML`" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "|[gt@C͊ɑ݂Ă܂B݂Ăt@C㏑܂?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4508,32 +4561,32 @@ msgstr "" "|[gG[:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "|[gɐ܂B" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "t@C̃plŊJĂ܂B" -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Iꂽt@C͓łB" -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "t@C̔rɃG[܂B" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "e|t@C쐬ł܂łBe|pXݒmFĂB" -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4550,7 +4603,7 @@ msgstr "" "[ҏW][ݒ][r]'s̈Ⴂ𖳎'IvV\n" "ZbgĂB" -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4561,22 +4614,22 @@ msgstr "" " ݂̃IvVݒł́AEOLɓꂳ܂B\n" " IvVύXāAقȂEOLێ悤ɂ܂?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "vOC'%2'Ńt@C'%1'̔rO̎sɃG[܂BrO͈ȍ~sȂ܂B" -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "IꂽtH_͖łB" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "oCit@CGfB^ŊJƂ͂ł܂B" -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4590,7 +4643,7 @@ msgstr "" "Ƀ}b`ȉ̃tH_쐬AtH_J܂?:\n" "%1" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4601,132 +4654,132 @@ msgstr "" "eX̃t@C̃R[hy[Wŕ\΁A\܂A}[WRs[댯ɂȂ܂B\n" "R[hy[WftHgR[hy[WƂĈ܂A낵ł()?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "x: ݂ɈقȂGR[fBÕt@CłB =%s E=%s }[WꍇA񂪎邩܂B" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "GR[fBOG[ɂ񂪎Ă܂B(̃t@C)" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "GR[fBOG[ɂ񂪎Ă܂B(Ẽt@C)" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "GR[fBOG[ɂ񂪎Ă܂B(̃t@C)" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "ق͂܂" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "s̍" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "%1‚̕u܂" -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "\"%s\"ł܂" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "tpXRs[܂" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "t@CRs[܂" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Location Pane" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Diff Pane" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "pb`t@C݂̏ɐ܂B" -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ڂ݂‚ȂAtH_ł!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ڂ݂‚ȂAtH_ł!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "o͌ʃt@C͊ɑ݂܂B ㏑܂?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 ‚̃t@CIĂ܂]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "m[}" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "ReLXg" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "jt@Ch" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "t@C %1ɏ߂܂B" -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "w肵o̓pX́A΃pXł͂܂: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "o̓pXw肵Ă" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "oCit@Cpb`t@C͐ł܂B" -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "tH_pb`t@C͐ł܂B" -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4737,17 +4790,17 @@ msgstr "" "\n" "pb`ɂ́AύXSĕۑĂKv܂B" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "tH_݂͑܂B" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "݂̃tH_rʂ̓NA܂B" -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4758,7 +4811,7 @@ msgstr "" "A[JCuT|[gׂ̈ɕKvȃR|[lg(7-zip Merge7z*.dll) ‚܂B\n" "A[JCuT|[gƂLɂ@ɂ‚Ă̏́A}jAQƂĂB" -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4767,7 +4820,7 @@ msgstr "" "\n" ": 7-Zip ́AWinMerge̐ݒɂ薳ɂȂĂ܂B" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4776,37 +4829,37 @@ msgstr "" "\n" ": 7-Zip ́AWinMerge̐ݒɂX^hAɐĂ܂B" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "GNX|[gt@Cw肵Ă" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "C|[gt@CIĂ" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "ݒ񂪃t@CC|[g܂B" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "ݒt@CɃGNX|[g܂B" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "t@Cݒ̃C|[gɎs܂B" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "t@Cւ̐ݒ݂̏Ɏs܂B" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4817,473 +4870,493 @@ msgstr "" "\n" "s܂?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "K\G[" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "}b`܂" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "ȐK\ł" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "ȏƍł" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "ȃLN^NXł" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "\\ ŏIĂ܂" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "ȌQƉZqł" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "[ [^ ̑ΉƂĂ܂" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "( \\( ̑ΉƂĂ܂" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "\\{ ̑ΉƂĂ܂" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} ̓eł" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Ȕ͈͂̏Iʒuł" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "sĂ܂" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "JԂZqȈʒuɂ܂" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "K\ُł" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "K\傫܂" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr ") \\) ̑ΉƂĂ܂" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Western European" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Eastern European" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "East Asian" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Not applicable" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approximates ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approximates ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approximates ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approximates ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approximates ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Mixed" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "̃t@Cۑ܂" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Ẽt@Cۑ܂" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "̃t@C𖼑Otĕۑ܂..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Ẽt@C𖼑Otĕۑ܂..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "̃t@C/tH_[hI[ԂɕύX܂" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Ẽt@C/tH_[hI[ԂɕύX܂" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "EOLWindows^Cvɕϊ܂" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "EOLUnix^Cvɕϊ܂" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "EOLMac^Cvɕϊ܂" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "݂̃[hҏW[h܂̓}[W[h؂ւ܂" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5292,12 +5365,12 @@ msgstr "" "t@CGR[fBO̕\Ɛݒs܂B\n" "t@CGR[fBOvpeB" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "RtNgt@CJċ܂" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5306,7 +5379,7 @@ msgstr "" "ݍsٕ̍I܂\n" "݂̍s" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5315,7 +5388,7 @@ msgstr "" "w肵s܂́Aقֈړ܂\n" "ړ(Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5324,7 +5397,7 @@ msgstr "" "vOIvVݒ肵܂\n" "IvV" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5333,37 +5406,37 @@ msgstr "" "ŐV̏ɍXV܂\n" "\XV (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Iꂽs̐擪ɍsԍtăNbv{[hփRs[܂" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Iꂽڂ̏ŐVɂ܂" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "ubN}[N̍쐬E폜s܂" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "̃ubN}[NɈړ܂" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "ÕubN}[NɈړ܂" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "SẴubN}[N폜܂" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5372,7 +5445,7 @@ msgstr "" "mɈvĂ鍀ڂ\܂\n" "ꍀڂ̕\" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5381,7 +5454,7 @@ msgstr "" "ق̂鍀ڂ\܂\n" "ٍڂ̕\" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5390,7 +5463,7 @@ msgstr "" "Eɂ̂ݑ݂鍀ڂ\܂\n" "݂̂ɑ݂鍀ڂ̕\" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5399,7 +5472,7 @@ msgstr "" "Eɂ̂ݑ݂鍀ڂ\܂\n" "Ê݂ɑ݂鍀ڂ̕\" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5408,7 +5481,7 @@ msgstr "" "oCit@C\܂\n" "oCit@C̕\" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5417,7 +5490,7 @@ msgstr "" "XLbvꂽڂ\܂\n" "XLbvꂽڂ̕\" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5426,7 +5499,7 @@ msgstr "" "\̂߂̃tHgI܂\n" "\tHgI" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5435,27 +5508,27 @@ msgstr "" "\tHgftHgVXetHgɖ߂܂\n" "ftHgtHg" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "󔒕\܂" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "DiffyC̕\/\؂ւ܂" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "P[VyC̓t@C̓eŜsN`Ƃĕ\܂" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "tH_rv_CAO\܂B" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5464,7 +5537,7 @@ msgstr "" "݂̃[U[C^[tF[XI܂\n" "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5473,12 +5546,12 @@ msgstr "" "s̍قFςĕ\܂\n" "s̍ق\" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "2‚̃yC̈ʒu܂" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5487,7 +5560,7 @@ msgstr "" "sԍ\܂\n" "sԍ\" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5496,7 +5569,7 @@ msgstr "" "sE[Ő܂Ԃ܂B\n" "sE[ŐܕԂ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5505,22 +5578,22 @@ msgstr "" "̃yCɃZNV}[W\܂B\n" "ZNV}[W̕\" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "eLXgTCY傫" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "eLXgTCY" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "g債tHgftHgTCYɃZbg܂" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5529,7 +5602,7 @@ msgstr "" "O̍قֈړ܂\n" "O̍ (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5538,7 +5611,7 @@ msgstr "" "̍قֈړ܂\n" "̍ (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5547,7 +5620,7 @@ msgstr "" "ŏ̍قɈړ܂\n" "ŏ̍ (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5556,7 +5629,7 @@ msgstr "" "݂̍قɈړ܂\n" "݂̍ (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5565,7 +5638,7 @@ msgstr "" "Ō̍قɈړ܂\n" "Ō̍ (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5574,7 +5647,7 @@ msgstr "" "IꂽeLXgẼt@CɃRs[܂\n" "EփRs[ (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5583,7 +5656,7 @@ msgstr "" "IꂽeLXg̃t@CɃRs[܂\n" "փRs[ (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5592,7 +5665,7 @@ msgstr "" "قEɃRs[A̍قɐi݂܂\n" "EɃRs[ (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5601,7 +5674,7 @@ msgstr "" "قɃRs[A̍قɐi݂܂\n" "ɃRs[ (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5610,7 +5683,7 @@ msgstr "" "ׂĂ̍قẼt@CɃRs[܂\n" "Eׂ" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5619,72 +5692,77 @@ msgstr "" "ׂĂ̍ق̃t@CɃRs[܂\n" "ׂ" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "̃tH_Iꂽڂ폜܂" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Iꂽڂr܂ (̍ڂIĂꍇAŏ̍ڂr܂)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "tH_r\̗I܂͕בւ܂" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "pb`t@C܂" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "tB^̑IƕύX܂" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "rʂ烌|[g𐶐܂" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "WJvOC[U[I܂ (tH_r̂Ƃ͓WJ܂)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "IɓWJvOCIÃt@CɓKp܂ (ǂ炩̃t@Cɂ́AgqKvł)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "̃t@CҏW邽߂̓WJvOCI܂" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "rOvOCgpȂ (W)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "֘AvOC" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "̑̃vOC" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "SẴvOCēǍ݂܂ (Jҗp)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5693,12 +5771,12 @@ msgstr "" "̃t@CANeBuɂ܂\n" "̃t@CI" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "JĂSẴEChE‚܂" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5707,22 +5785,22 @@ msgstr "" "WinMergewvJ\n" "WinMergewv" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "݂ WinMerge ̃o[WƐݒeLXgt@Cɏo͂܂" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "GNU General Public License\܂" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Private Build: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5731,7 +5809,7 @@ msgstr "" "[Xm[gJ\n" "[Xm[g" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5740,262 +5818,267 @@ msgstr "" "| WebTCgJ܂\n" "|" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "vOCݒ" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "rOvOCgp܂" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "”\ȂΔrOsȂ܂" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ݂‚܂ - .sct XNvg͖܂" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "<Ȃ>" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "o^ꂽAvP[VŃt@CJ܂" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "OGfB^Ńt@CJ܂" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "̃vOŊJ܂" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "ړubN\܂" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "SĂ̈ړubN\܂" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "݂̍قɑΉړubN݂̂\܂" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "J[\̍قֈړ܂" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "%1/%2Ɉړ(&O)" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "s%1Ɉړ(&O)" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "t@CVXe" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "ŋߎgXg" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "c[o[\ɂ܂" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "ACR̃c[o[\܂" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "傫ACR̃c[o[\܂" diff --git a/Src/Languages/Korean.po b/Src/Languages/Korean.po index 382332301f9..e1b07a1a244 100644 --- a/Src/Languages/Korean.po +++ b/Src/Languages/Korean.po @@ -73,7 +73,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "(&C)" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "ٿֱ(&P)" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "̵(&G)" @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "(&E)" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr " α׷(&R)" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "ܺ (&E)" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "α׷ (&W)..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "(&F)" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr " (&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "(&O)...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "ġ (&E)..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Ʈ ...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Ʈ (&V)..." @@ -162,1855 +164,1864 @@ msgid "Recent Projects" msgstr "ֱ Ʈ" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "(&X)" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "(&E)" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "(&O)..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "(&V)" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "۲ (&F)..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "⺻ ۲ (&O)" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr " (&T)" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "(&N)" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "۰(&S)" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "ũ(&B)" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr " ǥ(&S)" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr " (&B)" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "(&L)..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "(&T)" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "(&F)" #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "ġ (&G)" #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "÷(&P)" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr " (&M)" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "ڵ (&A)" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "Ŀ (&E)" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "÷ ٽ ε(&R)" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "(&D)" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr " (&L)..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "ʱȭ (&R)" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "â(&W)" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "ݱ(&O)" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr " ݱ(&S)" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "â ȯ(&P)\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr " (&H)" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr " (&V)" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "ܽ (&C)" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "(&H)" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "WinMerge (&W)\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr " Ʈ(&E)" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "(&T)" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "(&O)" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr " (&R)" -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "GNU ̼(&G)" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "WinMerge (&A)..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr " б (E&)" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr " б (&G)" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr " ڵ(&C)" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr " (&A)\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr " (&I)" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "ٸ (&D)" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "ʿ ϴ (&E)" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "ʿ ϴ (&G)" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "͸ (&H)" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "̳ʸ (&H)" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr " (&E)" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr " (&R)" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr " ħ(&S)\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr " κ ħ(&R)\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "(&M)" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "(&M)\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr " (&N)\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr " (&P)\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "ó (&F)\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr " õ (&C)\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr " (&L)\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr " (&R)\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr " (&E)\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "(&D)\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "丮 (&Customize Columns)" -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr " (&R)..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "(&S)\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr " (&L)" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "(&S)" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "ٸ ̸ (&A)..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr " (&R)" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "μ(&P)..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr " (&T)" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "̸ (&R)" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "EOL ȯ(&C)" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "(&W) (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "н(&U) (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "(&M) (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr " \tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr " ڵ(&F)..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr " (&U)\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "ٽ (&R)\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "߶󳻱(&T)\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "(&C)\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "ٿֱ(&P)\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr " (&D)\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "ã(&I)...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "ٲٱ(&C)...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "ũƮ(&S)" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr " ȣ (&C)\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "ϸũ(&B)" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "ϸũ (&T)\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr " ϸũ(&N)\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr " ϸũ(&P)\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr " ϸũ (&C)" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "̵(&G)...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "Ȯ/(&Z)" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ȯ(&I)\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "ǥ(&N)\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr " " -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "â (&L)" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr " (&V)" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr " (&W)" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr " ȣ (&N)" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr " (&M)" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "ڵ ٲ(&R)" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "â ¹ٲٱ(&A)" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr " â (&P)" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "ġ ǥâ(&C)" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr " ̵(&O)\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr " ̵(&T)\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr " (&A)" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr " (&E)" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "(&A)" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Ư (&M)" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "ʿ (&L)" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr " ġ (&E)" -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "ʿ (&R)" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr " ġ (&I)" -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "̵(&M)" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr " ̵ ġ (&L)" -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr " ̵ ġ (&R)" -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "(&D)" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "ʸ(&L)" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "ʸ(&R)" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "(&B)" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "̸ ٲٱ(&N)" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "(&H)" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr " (&O)" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr " (&O)" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr " (&Y)" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "ʸ(&L) (%1 / %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "ʸ(&R) (%1 / %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "(&B) (%1 / %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "ϸ (&F)" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "(&Z)" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "ʸ(&L)... (%1 / %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "ʸ(&R)... (%1 / %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "(&B)... (%1 / %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "ٸ ϸ(&D)... (%1 / %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr " ħ(&R)" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "ü (&C)" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "ϸ (&F)" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Prediffer " -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "prediffer (&N)" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "prediffer ڵ " -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr " ̵(&O)" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "̵ ǥ (&N)" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr " ̵ ǥ(&A)" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr " õ ̵ ǥ(&C)" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "WinMerge " -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "( )" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "All rights reserved." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "WinMerge Ȩ 湮!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "Ȯ" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "丮/ " -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "(&L):" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "ãƺ(&B)" -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "(&R):" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "ãƺ(&W)" -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "(&F):" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Ŀ(&U):" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "(&S)..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr " 丮 (&I)" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr ":" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr " 丮/" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "ͺ̽:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Ʈ:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr ":" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "йȣ:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "VSS Ʈ " -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr " ׸ " -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "üũƿ" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "ٸ ̸ ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr " ý" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr " ý(&V) :" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe (&P) :" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Ϲ" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "ó ڵ ũ(&S)" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr " ȭ ̱(&D)" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "ESC â ݱ(&O)" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr " ȭ ڿ ڵ ùٸ ˻" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Winmerge ̱ νϽ (&A)" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr " â (&K)" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr " ð ȣ(&P)" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr " ȭ ڵϼ (&P):" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr " " -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "丮 (&F)" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr " (&E)" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "Ϻ ޽ ʰ ֽϴ. ʱȭϸ ش ޽ ٽ ǥõ˴ϴ." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "ʱȭ" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr " :" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "ã" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "ã (&N) :" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "ܾ (&W)" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "ҹ (&C)" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr " ǥ(&E)" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "EOF (&O)" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "(&U)" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "Ʒ(&D)" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr " ã(&F)" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "ٲٱ" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr " (&P):" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "EOF (&D)" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr " " -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr " (&S)" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr " (&O)" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "ٲٱ(&R)" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr " ٲٱ(&A)" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "üũƿ" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "ּ" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "üũƿ üũ" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr " " -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr " " -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr " ǥ ( θ ):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr " " -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr ":" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "õ :" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr " κ" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "ؽƮ" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "õ :" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "̵ κ:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "õ ̵ κ:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "ܾ :" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "õ ܾ :" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "⺻" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "ȭ " -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "ý" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr " (&P)" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Ž ˾ ޴ ߰(&A)" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr " ޴ Ȱȭ(&N)" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr " 丮 ⺻ (&C)" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "ܺ (&E):" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "丮 ͸(&F):" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "ãƺ(&R)..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "ӽ " -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "ý ӽ (&Y)" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr " (&U):" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "ãƺ(&O)" -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "ġ " -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "¹ٲٱ(&S)" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "ϴ Ͽ ̱(&A)" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "(&R):" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "(&F)" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Ÿ(&Y):" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "ؽƮ(&C):" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr " " -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr " (&P)" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr " κ (&G)" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr " (&N)" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr " (&E)" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "ҹ (&T)" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Ŀǵ ο ÿ (&D)" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "ܺ (&X)" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "丮 ǥ ׸" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "(&U)" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Ʒ(&D)" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Ŀ " -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr " Ŀ:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr " Ŀ ǥ, Ȯڸ Ȯ " -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Ȯ :" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "丮 Ȳ" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr " ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr " Ϸ :" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr " :" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "̵" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "̵(&O):" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "̵ " -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "(&N)" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "(&D)" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "̵(&G)" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr " (&W)" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr " (&H)" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr " (&A)" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr " (&K)" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "ҹ (&C)" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "ɸ (&R) (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "̵ ã Ȱȭ" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr " (&M)" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "3 ̳ ð ̴ ϱ(&O)" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr " (&F):" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr " ߽߰ ٷ (&T)" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "ּ ͸" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr " " -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "ڵ ĵ(&R)" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr " EOL (&P)" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr " ũ(&T):" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr " (&T)" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr " (&N)" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr " ο" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr " " -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr " (&C)" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "ܾ (&W):" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr " " -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "׽Ʈ" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "ġ..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr " ..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr " " -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr " " -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "(&S)" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr " (&D)" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr " " -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "(&A)" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr " (&C)" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr " " -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "ڵ" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "⺻ ڵ" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "ڵ ƴ ⺻ ڵ :" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2019,32 +2030,32 @@ msgstr "" " ϵ ڵ մϴ : .html, .rc, .xml \n" "ؾ մϴ." -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "ý ڵ" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge UI " -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr " ڵ:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Ȱȭ " -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "7-Zip ˾Ƴ ϴ (ġ ̳?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2053,24 +2064,24 @@ msgstr "" " 7-zip( 3.11 ̻) ġǾ ְų,\n" "ܵ ʼ Ʈ α׷ 丮 ؾ մϴ" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr " ȣȯǴ ̽ ÷(Merge7z*.dll) ġǾ ־ մϴ" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "Ʒ õϴ ̽ ÷ Ͻñ ٶϴ." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2079,54 +2090,54 @@ msgstr "" "ʿ ÷\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "õϴ 7-Zip :" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr " ġǾ ִ 7-Zip:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "ܵ 7-Zip Ʈ:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "÷ :" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2135,488 +2146,499 @@ msgstr "" " ޽ ٽ ǥ (&M).\n" "( ޴ ޽ ֽϴ.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "÷ ٿε" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " īװ" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Ű:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Լ:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "ּ:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr ":" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr ":" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "ڿ:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "ó:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr " 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr " 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "丮 Ʈ" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr " (&F):" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "ãƺ..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "(&S):" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "Ŭ (&C)" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr " / " -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr " Ͻʽÿ" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr " ( )" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr " ( )" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr " " -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr " 7-Zip ÷ ʿ:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "7-Zip ÷ ٿε" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr " (&E)" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr " 7-Zip (&U)" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "WinMerge κ 7-Zip (&S)" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr " κ (&D)" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr " " -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr ":" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr ":" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "ٸ" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "ؽƮ:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "̳ʸ:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "ʸ " -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr ":" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr ":" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "ü:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "ݱ" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "()" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "ڵ :" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr " ڵ(&F):" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr " ڵ(&S):" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr " ڵ (&U)" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "(&A)" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "(&C)" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr " " -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr " ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr " ؽƮ Է(&T)" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "(&F)" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "(&T)" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "ݱ(&C)" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr " (&U)" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr " " -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr ":" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "ؽƮ:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr " κ:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "б (&E)" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "б (&A)" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr " " -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr " :" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr " :" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr " (&O)" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr " (&G):" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr " ϸ:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr ".bak Ȯ ߰(&A)" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr " ð ߰(&P)" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr " Ȯ" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr " XXX ׸ Ͻðڽϱ?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "κ" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "ƴϿ" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041203b5" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x412, 949" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "غ" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2625,7 +2647,7 @@ msgstr "" " մϴ\n" " (Ctrl-N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2634,7 +2656,7 @@ msgstr "" " ϴ.\n" " (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2643,7 +2665,7 @@ msgstr "" " ݽϴ.\n" "ݱ" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2652,7 +2674,7 @@ msgstr "" " մϴ.\n" " (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2661,7 +2683,7 @@ msgstr "" " ̸ մϴ.\n" "ٸ ̸ " -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2670,7 +2692,7 @@ msgstr "" "μ մϴ.\n" " " -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2679,7 +2701,7 @@ msgstr "" "͸ ٲٰų μ մϴ.\n" "μ " -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2688,7 +2710,7 @@ msgstr "" " μմϴ.\n" "μ" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2697,12 +2719,12 @@ msgstr "" "̸ \n" "̸ " -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr " ٽ ̱" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2711,32 +2733,32 @@ msgstr "" "Ʈ \n" "Ʈ (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Ʈ ߻߽ϴ" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Ʈ ϴ ߻߽ϴ" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Ʈ " -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Ʈ Ƚϴ." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Ʈ Ǿϴ." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2745,7 +2767,7 @@ msgstr "" " ο Ʈ Ͽ մϴ\n" "Ʈ " -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2754,7 +2776,7 @@ msgstr "" "α׷ , , ۱ ϴ.\n" "" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2763,27 +2785,27 @@ msgstr "" "α׷ մϴ.\n" "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr " " -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2792,7 +2814,7 @@ msgstr "" " â ̵մϴ.\n" " â" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2801,7 +2823,7 @@ msgstr "" " â ̵մϴ.\n" " â" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2810,7 +2832,7 @@ msgstr "" "â ܽ 迭մϴ.\n" "ܽ 迭" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2819,7 +2841,7 @@ msgstr "" "â 迭մϴ.\n" " 迭" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2828,7 +2850,7 @@ msgstr "" "â 迭մϴ.\n" " 迭" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2837,7 +2859,7 @@ msgstr "" " κ Ŭ մϴ.\n" "" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2846,7 +2868,7 @@ msgstr "" " κ ߶󳻾 Ŭ ̵մϴ.\n" "߶󳻱" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2855,7 +2877,7 @@ msgstr "" "Ư ˻մϴ.\n" "ã" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2864,7 +2886,7 @@ msgstr "" "Ŭ Դϴ.\n" "̱" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2873,7 +2895,7 @@ msgstr "" " ۾ ݺմϴ.\n" "ݺ" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2882,7 +2904,7 @@ msgstr "" "Ư ٸ ٲߴϴ.\n" "ٲٱ" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2891,7 +2913,7 @@ msgstr "" " մϴ.\n" " " -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2900,7 +2922,7 @@ msgstr "" " մϴ.\n" " " -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2909,7 +2931,7 @@ msgstr "" "ٽ մϴ.\n" "ٽ " -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2918,7 +2940,7 @@ msgstr "" " ų ϴ.\n" " " -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2927,7 +2949,7 @@ msgstr "" " ǥ ų ϴ.\n" " ǥ " -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2936,7 +2958,7 @@ msgstr "" " ̱/\n" " " -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2945,57 +2967,57 @@ msgstr "" "â ũ ڵ \n" "â " -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "â ũ⸦ մϴ." -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "â ġ ̵մϴ." -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "â ũ⸦ ּȭմϴ." -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "â ũ⸦ ִȭմϴ." -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr " â ̵մϴ." -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr " â ̵մϴ." -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr " â ݽϴ." -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "â ũ ǵϴ." -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "۾ ϸ Ȱȭմϴ." -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr " â Ȱȭմϴ." -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3004,7 +3026,7 @@ msgstr "" "̸ ⸦ մϴ.\n" "̸ " -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3023,7 +3045,7 @@ msgstr "" "WinMerge. \n" "WinMerge " -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3042,23 +3064,23 @@ msgstr "" "WinMerge. \n" "WinMerge " -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr " EOL " -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "ƹŰ ʽÿ" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr " ο ư ʽÿ" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3067,152 +3089,152 @@ msgstr "" ":\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge ʽϴ. Ʈ ̸, ȯ Ͽ ȯմϴ; ڼ ޴ GNU ̼ Ͻʽÿ." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "Ȯ(&O)" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "(&A)" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "õ(&)" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "(&I)" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr " (&A)" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "(&Y)" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr " (&A)" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "ƴϿ(&N)" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr " ƴϿ(&L)" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "(&C)" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "(&S)" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr " (&A)" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr " ޽ ٽ ǥ (&M)" -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "ٽ (&Q)" -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr " " -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "ؽƮ " -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr " " -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "->" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "κ:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr ":" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "κ:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr ":" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr " %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "ڵ" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr " (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr " ޽ ڽ Ȱȭ˴ϴ." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Ǿϴ. Ϻ 񱳸 ʽϴ." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr " ۲ â ʽϴ." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3223,7 +3245,7 @@ msgstr "" "\n" " : 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3234,127 +3256,129 @@ msgstr "" "\n" "ʱȭ Ŀ WinMerge Ͽ ֽʽÿ." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "α׷|*.exe;*.bat;*.cmd| (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr " (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Ʈ (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt| (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML (*.htm,*.html)|*.htm;*.html| (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML (*.xml)|*.xml| (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "ü " -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr " " -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr " ¥" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr " ¥ ũ" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr " ũ" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "̸" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr " ϸ ԷϽʽÿ." -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " (*.flt)|*.flt| (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3366,7 +3390,7 @@ msgstr "" "\n" "%1 WinMerge/Filters - Ͻʽÿ." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3379,7 +3403,7 @@ msgstr "" "\n" " ϰ ȮϽʽÿ." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3390,7 +3414,7 @@ msgstr "" "\n" "/ý ޴ Ͻʽÿ." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3403,12 +3427,12 @@ msgstr "" "\n" "Ȥ б ƴѰ?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "ġ ġ" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3419,208 +3443,223 @@ msgstr "" "\n" " ϴ." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr " ̹ մϴ.  Ͻðڽϱ?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr " ǥ" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "cleartool.exe (&P):" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "SS.EXE (&P):" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "丮 " -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr " " -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "̸ " -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "̸ " -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr " " -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr " " -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "ٽ ĵ Դϴ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr " " -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "ʿ " -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "ʿ " -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr " " -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr " " -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr " ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr " ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr " ̵ ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr " ..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr ": %s : %d/%d ä: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr ": %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr ": %s : %d/%d ä: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "ٸ (%1 of %2)" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 " -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 " #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "׸ %1 / %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "׸: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr " 丮 Ǵ Ͻʽÿ." -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "丮 " -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr " 丮/ " -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr " ߸ Դϴ!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr " ߸ Դϴ!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr " ߸ Դϴ!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Ŀ Ȱȭ Ͻʽÿ." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "丮/ ϴ!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "شϴ ϴ : %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "unpack : %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3633,12 +3672,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "ġ Ľ ." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3649,32 +3688,32 @@ msgstr "" "%1 \n" "ġ ƴմϴ." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "ٸ ̸ " -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "%1 κ ұ?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 () б Դϴ. ? (ٸ ̸ Ϸ ƴϿ ϼ.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr " üũ " -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr " ϴ" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3687,7 +3726,7 @@ msgstr "" "\n" " ұ?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3703,7 +3742,7 @@ msgstr "" "\t- ٸ ̸ (Ȯ)\n" "\t- ()?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3713,7 +3752,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3723,7 +3762,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3737,7 +3776,7 @@ msgstr "" "\n" "?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3746,7 +3785,7 @@ msgstr "" "%1\n" "б Դϴ. ðڽϱ?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3760,17 +3799,17 @@ msgstr "" "\n" " ݰ ٽ ּ." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr " ٸ ̸ " -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr " ٸ ̸ " -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3781,42 +3820,42 @@ msgstr "" "\n" "ϱ ħ ּ." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Ϸ ҽ Ʈ θ ؾ մϴ (: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "VSS üũƿ ..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "üũƿ ߻Ͽϴ. ̻ ϴ..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr " ý ." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS ŷ ΰ ġ ʽϴ. ϰڽϱ?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "VSS ͺ̽ ʽϴ!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "VSS :" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3824,177 +3863,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr " " -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (5.0 )" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 ̻)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr " ߽߰ " -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr " Ǵ ߽߰ " -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr " 丮 մϴ." -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr " Ư 丮 մϴ." -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr " ϸ մϴ." -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr " ϸ մϴ." -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr " ο մϴ." -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr " ϴ (on the fly filter)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr " ̸ ٲߴϴ." -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr " (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr " (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr " ġ (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr " ġ (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr " ġ (%1 / %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr " ġ (%1 / %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr " (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 / %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "丮 " -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - ̵ 丮 ϼ:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr " - ̵ 丮 ϼ:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 )" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 / %2 )" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4005,17 +4043,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr " Ͻðڽϱ:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " %d ׸ Ͻðڽϱ:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4027,458 +4065,473 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr " ϴ." -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "ܺ ͸ ̿ؼ ϴ" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr " α׷ ؼ ϴ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr " ϴ." -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "ܺ ͸ ̿ؼ ϴ" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr " α׷ ؼ ϴ ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "ܺ : %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr " Ȯ: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "ϸ Ŭ忡 մϴ" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr " θ Ŭ忡 մϴ" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr " θ Ŭ忡 մϴ" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr " θ Ŭ忡 մϴ" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr " " -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr " Ͽ ߰" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr " Ͽ ߰" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr " Ͽ ߰" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "ٸ Ͽ ߰ ()" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr " ġ ̵" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr " ġ ̵" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "̸" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "丮" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr " " -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr " ¥" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr " ¥" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Ȯ" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr " ũ" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr " ũ" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr " ũ (ª)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr " ũ (ª)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr " ð" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr " ð" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "ֽ " -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr " " -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr " " -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr " " -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr " Ӽ" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr " Ӽ" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr " EOL" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr " EOL" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr " ڵ" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr " ڵ" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr " " -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "̳ʸ" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr " ϴ" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr " " -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "͸ " -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "͸ 丮" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "ʸ: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "ʸ: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr " (̳ʸ )" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr " (̳ʸ )" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr " " -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "ʸ " -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "ʸ " -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "ҿ ð: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 ׸ " -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 ׸ " -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "丮 Ǵ ϸ." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr " 丮 丮 ̸." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "ڼ ." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr " ð." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr " ð." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr " Ȯ." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr " ũ(byte)." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr " ũ(byte)." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr " ũ(ª)" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr " ũ(ª)" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr " ð." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr " ð." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr " ֱٿ Ǿ ˷ݴϴ." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr " ( ؼ ϴ)." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr " ( ؼ ϴ)." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr " ." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr " Ӽ." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr " Ӽ." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr " EOL" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr " EOL" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr " ڵ." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr " ڵ." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " κ . Winmerg κ õǸ, յ ʽϴ." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " . ̴ κ ʽϴ." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "̳ʸ ̸ * ǥ." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "%1 & %2 " -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "ǥ и " -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr " и " -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "ܼ HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "ܼ XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " մϴ. ?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4487,32 +4540,32 @@ msgstr "" " :\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr " " -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr " â ֽϴ." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr " ϵ մϴ." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr " ߻߽ϴ." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "ӽ ϴ. ӽ Ȯϼ." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4527,7 +4580,7 @@ msgstr "" "\n" ": ij ׻ ϰ ۾Ϸ, ǿ 'ij ' ϸ ˴ϴ (/ )." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4535,22 +4588,22 @@ msgid "" " Do you want to change the options and preserve the different EOL ?" msgstr "" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "'%2' ÷ '%1' () prediff ϴ ߻߽ϴ. ̻ prediff ʽϴ." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr " 丮 Դϴ." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "̳ʸ ϴ." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4565,7 +4618,7 @@ msgstr "" "%1\n" "?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4576,132 +4629,132 @@ msgstr "" " ڵ ϴ ۾ ֽϴ.\n" " ڵ ұ(õ)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr ": ڵ ٸϴ, =%s and =%s, ۾ Ҿ ֽϴ." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "ڵ ս: " -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "ڵ ս: " -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "ڵ ս: " -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr " " -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr " %1 ٲپϴ." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "شϴ ڿ ã ϴ : \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "ü " -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr " ̸ " -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "ġâ" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "â" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "ġ ۼǾϴ." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ų 丮Դϴ!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ų 丮Դϴ!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " ̸ ġ մϴ. ?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 õ]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "ǥ" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "ؽƮ" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "ϵ" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "%1 Ͽ ϴ." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " ΰ ƴմϴ: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr " " -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "̳ʸ Ͽ ġ ϴ." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "丮 ġ ϴ." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4712,17 +4765,17 @@ msgstr "" "\n" " ġ ϴ." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr " ʴ 丮Դϴ." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr " 丮 ϴ." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4734,7 +4787,7 @@ msgstr "" " ɿ ʿ Ʈ(7-zip and/or Merge7z*.dll) ϴ. \n" " ɿ Ͻø ޴ ϼ." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4743,7 +4796,7 @@ msgstr "" "\n" "˸: WinMerge 7-Zip Ǿϴ." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4752,37 +4805,37 @@ msgstr "" "\n" "˸: WinMerge 7-Zip ѵǾϴ." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr " " -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr " " -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Ϸκ ." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Ϸ ." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Ϸκ ." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Ϸκ ." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4793,473 +4846,493 @@ msgstr "" "\n" " Ͻðڽϱ?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr " ǥ " -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr " " -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "߸ ǥ" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "߸ " -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "߸ Ŭ" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "齽 " -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "߸ " -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "ġ ʴ [ Ǵ [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "ġ ʴ ( Ǵ \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "ġ ʴ \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} " -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "߸ " -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "޸ " -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "߸ ǥ" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr " ǥ " -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "ʹ ū ǥ" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "ġ ʴ ) Ǵ \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Western European" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Eastern European" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "East Asian" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr " Ұ" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "ISO-8859-2 ٻ" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "ISO-8859-1 ٻ" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "ISO-8859-7 ٻ" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "ISO-8859-9 ٻ" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "ISO-8859-8 ٻ" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "ȥյ" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr " " -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr " " -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr " ٸ ̸ ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr " ٸ ̸ ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr " 丮/ б Ӽ " +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr " 丮/ б Ӽ " +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "EOL ȯ" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "EOL н ȯ" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "EOL ȯ" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr " / ȯ" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5268,12 +5341,12 @@ msgstr "" " ڵ Ӽ /\n" " ڵ Ӽ" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "ġ & " -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5282,7 +5355,7 @@ msgstr "" " ο մϴ\n" " ο " -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5291,7 +5364,7 @@ msgstr "" " ̳ ̵մϴ\n" "̵ (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5300,7 +5373,7 @@ msgstr "" " մϴ.\n" "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5309,37 +5382,37 @@ msgstr "" " ħ\n" " ħ (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr " տ ȣ ٿ Ŭ մϴ" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "õ ħ" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "ϸũ " -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr " ϸũ ̵" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr " ϸũ ̵" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr " ϸũ " -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5348,7 +5421,7 @@ msgstr "" " ǥմϴ.\n" " ̱" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5357,7 +5430,7 @@ msgstr "" "ٸ ǥմϴ.\n" "ٸ ̱" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5366,7 +5439,7 @@ msgstr "" "ʿ ϴ ǥմϴ.\n" "ʿ ϴ ̱" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5375,7 +5448,7 @@ msgstr "" "ʿ ϴ ǥմϴ.\n" "ʿ ϴ ̱" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5384,7 +5457,7 @@ msgstr "" "̳ʸ ǥմϴ.\n" "̳ʸ ̱" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5393,7 +5466,7 @@ msgstr "" " ǥմϴ.\n" " ̱" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5402,7 +5475,7 @@ msgstr "" "۲ մϴ\n" "۲ " -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5411,27 +5484,27 @@ msgstr "" "ý ⺻ ۲÷ մϴ.\n" "⺻ ۲" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr " ڸ ǥմϴ." -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr " â ų ϴ." -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "ġ ǥâ ü Ȳ ̹ ݴϴ." -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "丮 Ȳ ǥմϴ." -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5440,7 +5513,7 @@ msgstr "" " ٲٱ\n" "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5449,12 +5522,12 @@ msgstr "" " ٸ ̱\n" " ̱" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr " â ġ ٲߴϴ." -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5463,7 +5536,7 @@ msgstr "" " ȣ ǥմϴ.\n" " ȣ ̱" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5472,7 +5545,7 @@ msgstr "" "ڵ ٹٲ մϴ.\n" "ڵ ٹٲ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5481,22 +5554,22 @@ msgstr "" " â ̱\n" " ̱" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "ؽƮ ũ ũ" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "ؽƮ ũ ۰" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "⺻ ؽƮ ũ ʱȭ" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5505,7 +5578,7 @@ msgstr "" " κ ũ\n" " κ (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5514,7 +5587,7 @@ msgstr "" " κ ũ\n" " κ (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5523,7 +5596,7 @@ msgstr "" "ó κ ũ\n" "ó κ (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5532,7 +5605,7 @@ msgstr "" " κ ũ\n" " κ (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5541,7 +5614,7 @@ msgstr "" " κ ũ\n" " κ (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5550,7 +5623,7 @@ msgstr "" " κ մϴ.\n" " (Alt Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5559,7 +5632,7 @@ msgstr "" " κ մϴ.\n" " (Alt Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5568,7 +5641,7 @@ msgstr "" " ϰ, ̵մϴ\n" " - (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5577,7 +5650,7 @@ msgstr "" " ϰ, ̵մϴ\n" " - (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5586,7 +5659,7 @@ msgstr "" " Ϸ մϴ.\n" " " -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5595,72 +5668,77 @@ msgstr "" " Ϸ մϴ.\n" " " -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr " մϴ." -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "õ ϵ մϴ ( õǾ ù° մϴ)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "丮 / " -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "ġ " -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr " /" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "񱳰 " -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Ŀ մϴ (丮 񱳿 ʽϴ)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ο Ŀ ˴ϴ ( ϸ Ȯڰ ʿ)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr " Ŀ " -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "prediffer (ǥ)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "ϴ ÷" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "ٸ ÷" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr " ÷ ݰ ٽ (for )" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5669,12 +5747,12 @@ msgstr "" " Ȱȭ\n" " " -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr " â ݱ" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5683,22 +5761,22 @@ msgstr "" "WinMerge \n" "WinMerge " -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "WinMerge ؽƮ Ϸ մϴ" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "GNU ̼ ǥ" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr " : %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5707,7 +5785,7 @@ msgstr "" " Ʈ \n" " Ʈ" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5716,262 +5794,267 @@ msgstr "" " Ʈ \n" "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "÷ " -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "prediffer " -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "prediff ϸ ϱ" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH - .sct ũƮ " -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "< >" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<ڵ>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr " α׷ ϴ" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "ܺ ϴ" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr " Ư α׷ մϴ" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "̵ ǥ " -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "̵ ǥ" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr " õ ̵ ǥմϴ." -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ŀ ִ ̵մϴ." -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr " ̵մϴ. (%1 / %2)" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "%1 ٷ ̵" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr " " -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr " ý ̿" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "ֱ (MRU) " -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "⺻" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "ġ" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "̵ ü" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "ڿ" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr " " -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr " ۰ ǥ" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr " ũ ǥ" diff --git a/Src/Languages/Norwegian.po b/Src/Languages/Norwegian.po index 0a854cd3c41..d408e6cff06 100644 --- a/Src/Languages/Norwegian.po +++ b/Src/Languages/Norwegian.po @@ -71,7 +71,7 @@ msgstr "&Klipp ut" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "Ko&pier" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "&Lim inn" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "G &til..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "med ®istrert program" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "med &ekstern editor" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&med..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Filer" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&pne...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "pne prosjekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -160,1855 +162,1864 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "L&ukk" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Rediger" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Innstillinger..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Vis" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Velg &skrifttype..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Bruk standard s&krifttype" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "S&tatuslinje" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "S&prk..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Verkty" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Generer rettelse..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Programtillegg" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Manual utpakking" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk utpakking" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Rediger med utpakker" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Oppdater programtillegg" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Vindu" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Lukk" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Endre vindu\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "&Horisontale vinduer" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "&Vertikale vinduer" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Kaskade" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Hjelp" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "A&rkivsttte deaktivert..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "V&entsre skrivebeskyttet" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "H&yre skrivebeskyttet" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Velg &alt\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Oppdater\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Flette" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Neste forskjell\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Forrige forskjell\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&rste forskjell\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuell forskjell\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Siste forskjell\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopier til &hyre\tAlt+Hyre" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopier til &venstre\tAlt+Venstre" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Tilpass kolonner..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Lagre\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Lagre &venstre" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Lagre" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Lagre &som..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Lagre &hyre" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Flettemodus\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Angre\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gjenopprett\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pier\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Lim inn\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&k...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstatt...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Skript" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Tom >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avansert" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopier med linjenummer\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&G til...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Vis mellomrom" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "V&is linjeforksjell" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "&Forskjellsvindu" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "&Lokasjonsvindu" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopier t&il hyre og g videre\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopier &til venstre og g videre\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Kopier alt &til hyre" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Kopier alt til ve&nstre" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Forhndsforskjell" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Venstre til hyre" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "V&enstre til..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Hyre til venstre" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "H&yre til..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Flytt" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Venstre til..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Hyre til..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Slett" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Venstre" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Hyre" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Begge" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&pne venstre" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "&pne hyre" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&ier stinavn" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Venstre (%1 av %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Hyre (%1 av %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Begge (%1 av %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Kopier &filnavn" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Venstre... (%1 av %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Hyre... (%1 av %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Begge... (%1 av %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Forskjellene... (%1 av %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Kopier full sti" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopier &filnavn" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Instillinger for forhndsforskjell" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Ingen forhndsforskjell" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "&Autoforhndsforskjell" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "G& til forskjell" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Ingen flyttede blokker" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Alle flyttede blokker" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttet blokk for g&jeldende forskjell" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Alle rettigheter forbeholdes" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besk WinMerge sin hjemmeside!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Velg filer eller mapper..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Venstre:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&pne..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Hyre:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&pne..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Velg..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Utpakker:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Velg..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Inkluder undermapper" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Hjelp" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller mapper som skal sammenlignes" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Prosjekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Bruker:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Passord:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Lenke til ml-VSS-prosjekt" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "For alle elementer" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Sjekk ut" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Lagre som..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Versjonsstyringssystem" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Versjonsstyringssystem" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Sti til cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Generelt" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatisk &rulling til frste forskjell" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Fjern oppstartsbilde" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "L&ukk vinduer med ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiser stier automatisk i pne-dialoger" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Nullstill" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Sprk" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Tilgjengelige sprk:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Sk" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "F&inn hva:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Sammenlign bare &hele ord" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Sammenlign store/sm &bokstaver" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "Regulrt &uttrykk" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Retning" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Opp" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Ned" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Finn neste" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Erstatt" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Ers&tatt med:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Ikke bryt enden av filen" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Erstatt i" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Valgte" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "He&le filen" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Erstatt" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Erstatt &alt" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Linjefilter" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulre uttrykk (ett pr linje):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Farger" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Forskjeller:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Valgte forskjeller:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Bakgrunn" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Slettet" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Ignorerte forskjeller:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Flyttet:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Valgt flyttet:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Ordforskjell:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Valgt ordforskjell:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Standardverdier" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Send slettede filer til sppelbtten" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Legg til utforsker sin kontekstmeny" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "&Aktiver avansert meny" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Ekstern editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "B&la gjennom..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Rettelsegenerator" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fil&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fil&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "B&ytt" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Legg til i eksisterende fil" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&il:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Kontekst:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Mellomrom" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Sammen&lign" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnorer endringer" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&norer alt" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&er tomme linjer" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Skill mellom sm &og store bokstaver" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inklud&er kommandolinje" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "pne i e&kstern editor" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Visningskolonner" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Velg utpakker" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Filutpakker:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Vis alle utpakkere, ikke kontroller filtype" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Filetypeliste:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Beskrivelse:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "G til" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "G& til:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "G til hva" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nje" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Forskjell" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&G til" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Sammenlign" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Mellomrom" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Sammenlign &mellomrom" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Ignorer e&ndringer av mellomrom" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignorer &alle mellomrom" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorer blan&ke linjer" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorer store/sm &bokstaver" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "&Aktiver flyttet blokk-oppdagelse" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Filsammenligningsmetode:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Uthev syntaksen" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &oppdatering" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Bevar original EOL-tegn" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulator" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tabulatorstrrelse:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Sett inn tabulatorer" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Sett inn mellomrom" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Rediger..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Slett..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Lagre endrede filer?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Fil p venstre side" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Lagre endringer" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Kast endringer" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Fil p hyre side" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "L&agre endringer" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Ka&st endringer" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Tegntabell" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2017,596 +2028,607 @@ msgstr "" "Detekter tegntabellinformasjon for disse filene : .html, .rc, .xml \n" "M starte programmet p nytt." -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "System tegntabell" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "I flge WinMerge brukergrensesnitt" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Tilpasset tegntabell:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - arkivsttte er ikke aktivert" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Innstillinger" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Directory Compare Report" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Forskjellig" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identiske" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041404e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x414, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2615,7 +2637,7 @@ msgstr "" "Opprett et tomt dokument\n" "Nytt dokument (Ctrl-N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2624,7 +2646,7 @@ msgstr "" "pne et eksisterende dokumentet\n" "pne (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2633,7 +2655,7 @@ msgstr "" "Lukk det aktive dokumentet\n" "Lukk" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2642,7 +2664,7 @@ msgstr "" "Lagre det aktive dokumentet\n" "Lagre (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2651,7 +2673,7 @@ msgstr "" "Lagre det aktive dokumentet med et nytt navn\n" "Lagre som" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2660,7 +2682,7 @@ msgstr "" "Endrer skriverens indstillinger\n" "Sideoppsett" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2669,7 +2691,7 @@ msgstr "" "Endrer skriver og skriverens indstillinger\n" "Skriveroppsett" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2678,7 +2700,7 @@ msgstr "" "Skriv ut det aktive dokumentet\n" "Skriv ut" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2687,12 +2709,12 @@ msgstr "" "Vis de fulle sidene\n" "Utskriftsforhndsvisning" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2701,39 +2723,39 @@ msgstr "" "pne prosjektfil\n" "Project file (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2742,7 +2764,7 @@ msgstr "" "Vis programinformasjon, versjonsnummer og opphavsrett\n" "Om" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2751,27 +2773,27 @@ msgstr "" "Avslutt programmet; spr om man vil lagre dokumenter\n" "Avslutt" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "pne dette dokumentet" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2780,7 +2802,7 @@ msgstr "" "Skift til det neste vinduet\n" "Neste vindu" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" "Skift til det forrige vinduet\n" "Forrige vindu" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2798,7 +2820,7 @@ msgstr "" "Arranger vinduene s de overlapper\n" "Kaskade vinduer" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2807,7 +2829,7 @@ msgstr "" "Arranger vinduene som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2816,7 +2838,7 @@ msgstr "" "Arranger vinduene som ikke-overlappende brikker\n" "Brikker vinduer" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2825,7 +2847,7 @@ msgstr "" "Kopier det valgte og sett det i utklippsbeholderen\n" "Kopier" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" "Klipp det valgte ut og sett det i utklippsbeholderen\n" "Klipp" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2843,7 +2865,7 @@ msgstr "" "Finn den angitte teksten\n" "Finn" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2852,7 +2874,7 @@ msgstr "" "Sett inn utklippsbeholderens innhold\n" "Sett inn" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2861,7 +2883,7 @@ msgstr "" "Gjenta den siste handlingen\n" "Gjenta" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2870,7 +2892,7 @@ msgstr "" "Erstatt den angitte teksten med en annen tekst\n" "Erstatt" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2879,7 +2901,7 @@ msgstr "" "Velg hele dokumentet\n" "Velg alt" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2888,7 +2910,7 @@ msgstr "" "Angre den siste handlingen\n" "Angre" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2897,7 +2919,7 @@ msgstr "" "Gjenopprett den forrige handlingen\n" "Gjenopprett" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2906,7 +2928,7 @@ msgstr "" "Vis eller skjul verktylinjen\n" "Vis verktylinjen" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2915,69 +2937,69 @@ msgstr "" "Vis eller skjul statuslinjen\n" "Vis statuslinjen" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Endre vindusstrrelse" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Endre vindusposisjon" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Minimer vinduet til et ikon" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Maximer vinduet til full strrelse" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Skift til det neste dokumentvinduet" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Skift til det forrige dokumentvinduet" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Lukk det aktive vinduet og spr om dokumenter skal lagres" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Gjenopprett vinduet til normal strrelse" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Liste med aktive vinduer" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktiver dette vinduet" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2986,183 +3008,183 @@ msgstr "" "Lukk utskriftsforhndsvisning\n" "Avbryt forhndsvisning" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Bevar originale EOL-tegn" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Trykk hvilken som helst knapp" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Hyreklikk p stien for kopiere" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Prv igjen" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorer" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignorer &alt" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Ja til &alt" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nei" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nei til a<" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Fortsett" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Hopp over" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Hopp over &alt" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Ikke hvis denne &meldingen igjen." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Ikke still dette &sprsmlet igjen." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Versjon %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Innstillinger (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Alle beskjedbokser vises n igjen." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Det er gjort endringer i noen innstillinger, som kan ha innflytelse p allerede pne vinduer. Noen av disse innstillinger virker muligens ikke fr vinduene er gjenpnet." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Den valgte endring av skrifttype vil ikke kunne ses i allerede pne vinduer." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3170,7 +3192,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3178,127 +3200,129 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "pne" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programmer|*.exe;*.bat;*.cmd|Alle filer (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alle filer (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge prosjektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Fullt innhold" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Raskt innhold" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Endringsdato" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Navn" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Plassering" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Beskrivelse" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Velg navn for nytt filter" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfiltere (*.flt)|*.flt|Alle filer (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3307,7 +3331,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3316,7 +3340,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3324,7 +3348,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3333,12 +3357,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3346,208 +3370,223 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Sti til cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Sti til SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultat av sammenligning av mapper" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Filsammenligning" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Venstre uten tittel" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Hyre uten tittel" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Skanner filer..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "pner valgte" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopierer venstre til hyre" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopierer hyre til venstre" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopierer alt til venstre" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopierer alt til hyre" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopierer filer..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Sletter filer..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Flytter filer..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Kol: %d/%d Tegn: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linje: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Kol: %d/%d Tegn: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Flette" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Forskjell %1 av %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 forskjeller funnet" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 forskjell funnet" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Velg to eksisterende mapper eller filer for sammenligne" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Mappe valg" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Velg to mapper eller filer for sammenligning." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Venstre sti er ugyldig!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Hyre sti er ugyldig!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Begge stier er ugyldig!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Velg to filer for aktivere utpakkervalg." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan ikke sammenligne fil og mappe!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Fil ikke funnet: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Fil ikke pakket ut: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3560,42 +3599,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Lagre som" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Lagre endringer til %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 er markert som skrivebeskyttet. Vil du lagre filen under et annet navn?" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Sjekk skrivebeskyttelsen p destinasjonen" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Feil under backup av filen" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3604,7 +3643,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3615,7 +3654,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3630,7 +3669,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3645,7 +3684,7 @@ msgstr "" "\n" "Vil du lagre den upakkede versjonen fil en annen fil?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3660,7 +3699,7 @@ msgstr "" "\n" "Skriv over endret fil?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3669,7 +3708,7 @@ msgstr "" "%1\n" "er markert skrivebeskyttet. Vil du overstyre det skrivebeskyttede elementet?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3684,17 +3723,17 @@ msgstr "" "\n" "Hvis du vil oppdatere lukk gjeldende filsammenligning og last inn filene p nytt." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Lagre venstre fil som" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Lagre hyre fil som" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3702,42 +3741,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du skal angi en SourceSafe prosjektsti for fortsette (ie: $/MittProjekt)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versjonsstyringssystemet returnerte en feil under forsket p sjekke filen ut. Kan ikke fortsette..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Feil under utfrelse av versjonsstyringssystemkommando." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS Working Folder og plassering av gjeldende fil stemmer ikke overens. Fortsett?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS database(r) funnet!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Feil fra VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3745,177 +3784,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Ingen" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (eldre enn 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 og nyere)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Slett valgte elementer til venstre" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Slett valgte elementer til hyre" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Slett de valgte element(er) p begge sider" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skjul valgte element(er) (i farta filter)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Hyre til venstre (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Venstre til hyre (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Hyre til venstre (%1 av %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Venstre til hyre (%1 av %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Venstre til... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Hyre til... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Venstre til... (%1 av %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Hyre til... (%1 av %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Venstre (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Hyre (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Begge (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Venstre (%1 av %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Hyre (%1 av %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Begge (%1 av %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Velg mlmappe" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3926,17 +3964,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -3948,490 +3986,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "pne venstre fil" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "pne venstre fil i ekstern editor" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "pne venstre fil med ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "pne hyre fil" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "pne hyre fil i ekstern editor" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "pne hyre fil med ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopier filnavn til utklippstavle " -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopier stinavn p venstre side til utklippstavle" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopier stinavn p hyreside til utklippstavle" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopier stinavn p begge sider til utklippstavle" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Ukjent arkivformat" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Legg til element fra venstre side til arkiv" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Legg til element fra hyre side til arkiv" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Legg til element fra begge sider til arkiv" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Legg til forskjellige elementer til arkiv (begge sider)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flytt valgte filer p venstre side til tilpasset mappe" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flytt valgte filer p hyre side til tilpasset mappe" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Filnavn" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Mappe" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultat av sammenligningen" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Venstre dato" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Hyre dato" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Filtype" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Venstre strrelse" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Hyre strrelse" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Venstre opprettelsestid" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Hyre opprettelsestid" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Nyere fil" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Venstre filversjon" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Hyre filversjon" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Venstre attributter" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Hyre attributter" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Venstre koding" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Hyre koding" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binr" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Kan ikke sammenligne filer" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Fil hoppet over" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Mappe hoppet over" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binre filer er identiske" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binre filer er forskjellige" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Filer er forskjellige" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Bare venstre" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Bare hyre" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Forlpt tid: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 element valgt" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elementer valgt" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Fil elle mappe navn." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Undermappenavn nr undermapper er inkludert." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Sammenligningsresultat, lang form." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Venstre side endringsdato." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Hyre side endringsdato." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Filtype." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Venstre filstrrelse i byte." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Hyre filstrrelse i byte." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Venstre side opprettelsestid." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Hyre side opprettelsestid." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Forteller hvilken side som sist ble endret." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Venstre side filversjon, bare for noen filtyper." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Hyre side filversjon, bare for noen filetyper." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Kort sammenligningsresultat." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Venstre side attributter." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Hyre side attributter." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Venstre side koding." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Hyre side koding." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Viser asterisk (*) hvis filen er binr." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Sammenligning %1 med %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Samme filen er pen i begge panel." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "De valgte filene er identiske." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Det skjedde en feil under sammenligning av filene." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Midlertidige filer kan ikke opprettes. Sjekk sti til den TMP/TEMP-mappe." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4446,32 +4499,32 @@ msgstr "" "\n" "Merknad: Hvis du alltid vil behandle linjeskifttypene likt, velg innstillingen 'Ignorer forskjell i linjeskift' i sammenligningsarket i innstillingsdialogen (tilgjengelig under Rediger/Innstillinger)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "En feil oppstod under forhndsforskjell for filen '%1' med programtillegget '%2'. Forhndsforskjellen blir ikke brukt mer." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4482,132 +4535,132 @@ msgstr "" "Visning av filene i hvert sin tegntabell ser best ut, men fletting/flytting er farlig.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Ingen forskjell" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Linjeforskjell" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Erstattet %1 streng(er)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan ikke finne strengen \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopier full sti" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopier filnavn" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Fil med rettelser vellykket skrevet." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element ikke funnet eller er mappe!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element ikke funnet eller er mappe!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Rettelsesfilen eksisterer allerede. Vil du overskrive den?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 filer valgt]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Kunne ikke skrive til fil %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan ikke opprette en fil med rettelser for binre filer." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan ikke opprette en fil med rettelser for mapper." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4615,17 +4668,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Gjeldende resultat for mappesammenligning vil bli slettet." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4636,51 +4689,51 @@ msgstr "" "Alle ndvendig komponenter (7-zip og/eller Merge7z*.dll) for arkivsttte ble ikke funnet.\n" "Se manualen for mer informasjon om arkivsttte og hvordan aktivere den." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4688,492 +4741,512 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Feil i regulrt uttrykk" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Ingen treff" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Ugyldig regulrt uttrykk" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Ugyldig collation tegn" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Ugyldig tegnklassenavn" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Etterflgende omvendt skrstrek" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Ugyldig tilbakereferanse" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Ubalansert [ eller [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Ubalansert ( eller \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Ubalansert \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Ugyldig i innhold i \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Ugyldig omrde slutt" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Tom for minne" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Ugyldig foregende regulrt uttrykk" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Fortidlig slutt p regulrt uttrykk" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "For stort regulrt uttrykk" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Ubalansert ) eller \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Lagre venstre fil" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Lagre hyre fil" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Lagre venstre fil med navn..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Lagre hyre fil med navn..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Endre venstre fil/mappe skrivebeskyttelsestatus" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Endre hyre fil/mappe skrivebeskyttelsestatus" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Veksle mellom redigerings- og flettemodus" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5182,7 +5255,7 @@ msgstr "" "G til linje eller forskjell\n" "G til (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5191,7 +5264,7 @@ msgstr "" "Sett programinnstillinger\n" "Innstillinger" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5200,79 +5273,79 @@ msgstr "" "Oppdater visning\n" "Oppdater (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopier valgte linjer til utklippstavle med linjenummer foran" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5281,7 +5354,7 @@ msgstr "" "Velg skrifttype for visningen\n" "Velg skrifttype" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5290,103 +5363,103 @@ msgstr "" "Bruk standard skrifttype for visningen\n" "Standard skrifttype" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Viser et tegn for mellomrom" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Veksle forskjellsvindu" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Plasseringsvindu viser oversiktbilde av filene" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5395,7 +5468,7 @@ msgstr "" "Kopier den valgte teksten til den hyre filen\n" "Kopier hyre (Alt Hyre)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5404,7 +5477,7 @@ msgstr "" "Kopier den valgte teksten til den venstre filen\n" "Kopier venstre (Alt Venstre)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5413,7 +5486,7 @@ msgstr "" "Kopier forskjell til hyre og g videre til neste\n" "Kopier hyre og g videre (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5422,7 +5495,7 @@ msgstr "" "Kopier forskjell til hyre og g videre til neste\n" "Kopier venstre og g videre (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5431,7 +5504,7 @@ msgstr "" "Kopier alle forskjeller til den hyre filen\n" "Alt til hyre" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5440,367 +5513,377 @@ msgstr "" "Kopier alle forskjeller til den venstre filen\n" "Alt til venstre" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Velg og endre rekkeflge for kolonner for mappesammenligning" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Generer en fil med rettelser" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Velg og endre filter" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Brukeren velger utpakker (ingen utpakker ved sammenligning av mapper)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Den tilpassede utpakkeren brukes p begge filer (en filtype m kunne bestemmes)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Velg en utpakker for denne filen" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Ingen forhndforskjellviser (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Foresltte programtillegg" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Andre programtillegg" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Fjern og laste p nytt alle programtillegg (for utviklere)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Skriver gjeldende versjon av WinMerge og konfigurasjon til en tekstfil" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Kompilert privat: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Instillinger for programtillegg" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Ingen forhndsforskjell" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Forhndsforskjell hvis mulig" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ikke funnet - .sct skript ikke aktivert" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Ikke vis flyttede blokker" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Vis flyttede blokker bare fra gjeldende forskjell" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "G til forskjell under markr" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G& til forskjell %1 av %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "G& til linje %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Polish.po b/Src/Languages/Polish.po index 13e47918a39..e3f08c0247b 100644 --- a/Src/Languages/Polish.po +++ b/Src/Languages/Polish.po @@ -72,7 +72,7 @@ msgstr "&Wytnij" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Kopiuj" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "Wk&lej" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Przejd do" @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "&Otwrz" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "w za&rejestrowanej aplikacji" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "w &zewntrznym edytorze" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&w..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Plik" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nowy\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otwrz...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Otwrz plik konfliktu" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Otwrz projekt ...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Zapi&sz projekt..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "Ostatnie projekty" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "Zakocz" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Edycja" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Opcje..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Widok" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Zmi&e czcionk..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Czcionka &domylna" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Pasek &narzdzi" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Brak" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&May" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Duy" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Pasek s&tanu" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Pasek &zakadek" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Jzyk..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Narzdzia" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtry..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Generuj patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Wtyczki" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Rozpakuj &rcznie" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Rozpakuj &automatycznie" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Edytuj w programie rozpakowujcym" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Przeaduj wtyczki" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Debugowanie" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "Zaa&duj ustawienia..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "Ze&ruj opcje" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Okno" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Zamknij" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Zamknij &wszystkie" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Przecz &panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "P&oziomo" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "P&ionowo" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Kaskadowo" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Pomoc" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "Pomoc &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "Informacje o w&ydaniu" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Tumaczenia" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&Konfiguracja" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Obsuga ar&chiww wyczona..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&O programie..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Lewa tylko &odczyt" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Prawa t&ylko odczyt" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Kodowanie pliku" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Wybierz &wszystkie\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Poka &identyczne archiwa" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Poka &rne archiwa" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Poka &unikatowe dla lewej" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Poka u&nikatowe dla prawej" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Poka po&minite" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Poka pliki &binarne" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Poka elementy u&kryte" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Statystyki po&rwnania" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "O&dwie\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Odwie zaznaczone\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Scal" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "&Porwnaj\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nastpna rnica\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Pop&rzednia rnica\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "P&ierwsza rnica\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Bieca rnica\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Os&tatnia rnica\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiuj na praw\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiuj na lew\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Usu\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Dostosuj kolumny..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Utwrz &raport..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Zapisz\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Zapisz &lew" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Zapisz" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Zapisz &jako..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Zapisz &praw" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Drukuj..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "&Ustawienia strony" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Drukuj &Podgld" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Konwertuj koce linii do" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Tryb scalania\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "&Kodowanie pliku" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Cofnij\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Powtrz\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Wytnij\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiuj\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "Wk&lej\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Zaznacz &rnic linii\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "W&yszukaj...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Zastp...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Skrypty" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Pusty >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Zaawansowane" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopuj z numerami wierszy\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "Za&kadki" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Dodaj zakadk\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nastpna zakadka\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Poprzednia zakadka\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Wyczy wszystkie zakadki" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Id do...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Powikszenie" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Powiksz\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Zmniejsz\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Rozmiar oryginalny\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Podwietlanie skadni" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "&Zablokuj panele" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Poka biae znaki" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Poka rnice &linii" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Poka &numery linii" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Poka &marginesy" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Za&wijaj linie" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Za&mie panele" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Panel &rnic" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Panel &lokalizacji" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiuj na prawo i przejd dalej\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiuj na lewo i przejd dalej\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Kopiuj wszystko na praw" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Kopiuj wszystko na lew" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Rnicowanie wstpne" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&Porwnaj" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Porwnaj specjalne" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Lewa na praw" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "L&ewa do..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Prawa na lew" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "Pra&wa do..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "Prze&nie" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Lewa do..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Prawa do..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Usu" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Lewa" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Prawa" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Obie" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Zmie &nazw" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "U&kryj elementy" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "O&twrz lew" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Otwrz p&raw" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiuj &cieki" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Lewa (%1 z %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Prawa (%1 z %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Obie (%1 z %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Kopiuj &nazwy plikw" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Lewa... (%1 z %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Prawa... (%1 z %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Obie... (%1 z %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Rnice... (%1 z %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "O&dwie" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "Kopiuj &pen ciek" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopiuj nazw p&liku" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Ustawienia wstpnego rnicowania" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Bez rnicowania wstpnego" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Automatyczne rnicowanie wstpne" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Id &do rnicy" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "Bez &przeniesionych blokw" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "W&szystkie przeniesione bloki" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Przeniesiony blok dla biecej rnicy" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "O programie WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(kompilacja prywatna)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Wszelkie prawa zastrzeone." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Zajrzyj na stron WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Wsptwrcy" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Wybierz pliki lub katalogi..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Lewa:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Szukaj..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Prawa:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "S&zukaj..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtr:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Wybierz..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Program &rozpakowujcy:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Wybierz..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Uwzgldnij podkatalogi" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Stan" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Anuluj" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Pomoc" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Obiekty do porwnania" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Baza danych:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Uytkownik:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Haso:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "cze do projektu VSS" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Zastosuj do wszystkich" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Sprawd" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Zapisz jako..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "System ledzenia wersji" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "ledzenie &wersji:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "S&cieka cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Oglne" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Przejd automatycznie do pierwszej rnicy" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Wycz ekran powitalny" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zam&knij okna klawiszem ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Automatycznie weryfikuj cieki w oknie Otwrz" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Zezwl na uruchomienie tylko &jednej instancji programu" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "Zapytaj przed zamykaniem wielu okien" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Zapisz daty pliku przy porwnywaniu" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Otwrz okno autouzupeniania:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Wcz wiele okien porwnania dla" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Porwnania &folderw" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Porwnania &plikw" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge pozwala ukry niektre komunikaty. Nacinij przycisk, aby wywietla wszystkie komunikaty." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Resetuj" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Jzyk" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Dostpne jzyki:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Wyszukaj" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Szukaj:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Dopasuj &cae sowa" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Wielko &liter" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "Wyraenie ®ularne" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Nie zawijaj k&oca linii" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Kierunek" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "Do &gry" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&W dl" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Nastpny" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Zastp" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Z&astp:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Nie zawijaj koca pliku" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Zastp w" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Selekcja" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "Cay &plik" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Zastp" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "&Wszystkie" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Racjonalne dopasowanie wielkoci" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Sprawd" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Komentarze" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn po CheckOut" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtry wierszy" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Wcz filtry linii" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Wyraenia regularne (1 na wiersz):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Zapisz" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nowy" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Edytuj" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Usu" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Kolory" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Rnica:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Wybrana rnica:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "To" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Usunite" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Tekst" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Pominita rnica:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Przeniesione:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Wybrane przeniesiono:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Rnica-sowo:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Wybrana rnica-sowo:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Domylne" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Okno dialogowe" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "System" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Wylij usunite pliki do &kosza" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integracja" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Dodaj do menu kontekstowego eksploratora" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Wcz menu &zaawansowane" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Domy&lnie uwzgldnij podkatalogi" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "Zewntrzny &edytor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filtruj folder:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "P&rzegldaj" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Folder plikw tymczasowych" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "systemowy" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "wasny folder" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Prz&egldaj..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Generuj patch" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Plik&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Plik&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Za&mie" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "Dodaj do &istniejcego pliku" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Wynik:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&yl:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Kontekst:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Biae &znaki" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Porw&naj" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Po&mi zmiany" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Pomi &wszystkie" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Pomi &biae znaki" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Uwzgldnij wielko &liter" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Uwzgldnij wiersz &polece" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Otwrz w &zewntrznym edytorze" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Wywietl kolumny" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "W &gr" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "W d" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Wybierz program rozpakowujcy" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Program rozpakowujcy:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Poka wszystkie programy, nie sprawdzaj rozszerzenia" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lista rozszerze:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Postp porwnania folderw" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Zatrzymaj" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Porwnywanie elementw..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Elementy porwnane:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Wszystkich:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Id do" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&Id do:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Plik" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Element docelowy" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&Wiersz" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Rnica" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Id do" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Porwnaj" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Biae znaki" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Porwnaj &biae znaki" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "P&omi zmiany biaych" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Pomi wszystkie biae" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignoruj rnice pustych linii" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignoruj rnice wielkoci liter" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Ignoruj rnice przeniesienia karetki systemowej (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Wcz &wykrywanie przeniesionych blokw" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Dopasuj takie same linie" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignoruj rnice czasu mniejsze ni 3 sekundy" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Metoda porwnania plikw:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Zatrzymaj po pierwszej rnicy" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Komentarze filtra" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Edytor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Podwietlaj skadni" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automatyczne &skanowanie" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Zapisz &oryginalne znaki koca linii" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulatory" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Wielko:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Wstaw tabulatory" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Wstaw spacje" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Kolorowanie rnic linii" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Poka rnice linii" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "Poziom &znakw" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "Poziom &sw:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtry plikw" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testuj" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instaluj..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Nowy..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Edycja..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Usu..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Zapisz zmodyfikowane pliki?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Plik z lewej" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Zapisz zmiany" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Odrzu zmiany" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Plik z prawej" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Zachowa&j zmiany" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Odr&zu zmiany" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Odrzu wszystkie" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Strona kodowa" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Kodowanie domylne" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Wybierz domylne kodowanie dla otwieranych plikw nie-Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,32 +2029,32 @@ msgstr "" "Wykrywaj stron kodow dla tych plikw : .html, .rc, .xml \n" "wymaga restartu" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Strona kodowa systemu" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Wedug interfejsu WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Str. kodowa uytkownika:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge Obsuga archiww wyczona" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nie mona wykry wersji 7-Zip (nie jest zainstalowany?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2052,12 +2063,12 @@ msgstr "" "Obsuga archiww wymaga programu 7-Zip w wersji 3.11 lub pniejszej lub skopiowania\n" "zasadniczych jego komponentw do katalogu programu." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "W tym katalogu musi si znajdowa take odpowiednia wtyczka interfejsu (Merge7z*.dll)." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2066,12 +2077,12 @@ msgstr "" "Skorzystaj z zalecanej poniej wersji 7-Zip, pki nie bd dostpne wtyczki dla\n" "pniejszych wersji." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Wersja" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2080,54 +2091,54 @@ msgstr "" "Wymagana wtyczka\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Zalecana wersja 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "obecna" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Program 7-Zip zainstalowany w systemie:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "brak" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "brak" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Komponenty 7-Zip dla wersji autonomicznej:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "przestarzaa" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Wtyczki na ciece:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2136,488 +2147,499 @@ msgstr "" "Nie wywietlaj tej wiadomoci ponownie.\n" "(Mona przywrci wywietlanie tych opcji z menu Pomoc.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Pobieranie wtyczek" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opcje" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategorie" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importuj" -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Eksportuj" -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Sowa kluczowe:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nazwy funkcji:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Komentarze:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Liczby:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatory:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Sowa:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Uytkownika 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Uytkownika 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Pogrubienie" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Raport porwnania folderw" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "&Plik raportu:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Przegldaj..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Styl:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiuj do schowka" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Folder wspdzielony lub prywatny" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Jaki rodzaj filtra chcesz utworzy ?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtr wspdzielony (dla wszystkich uytkownikw)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtr prywatny (tylko dla biecego uytkownika)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Wsparcie dla archiww" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Wsparcie archiww wymaga zainstalowanej wtyczki 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Pobierz wtyczk 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Wcz wsparcie dla archiww" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Uyj stacjonarnego 7-Zip, jeli dostpny" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Uy&j lokalnego 7-Zip z folderu WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "Wy&krywaj typ archiwum z sygnatury pliku" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Statystyki porwnania" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Foldery:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Pliki:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Rnych" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Tekst:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binarne:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unikalne" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Lewa:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Prawa:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identyczne" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Wszystkich:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Zamknij" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Dziaanie" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Dziaanie)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Wybierz stron kodow dla" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&adowanie pliku:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Zapis pliku:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Uyj tej samej strony kodowej dla obu" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "Z&astosuj" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "A&nuluj" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Test filtra" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testowanie filtra ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Podaj tekst do sprawdzenia:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "Nazwa &folderu" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Wynik:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Testuj" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Zamknij" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Uyj wasnych kolorw tekstu" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Kolory tekstu uytkownika" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Odstp:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Czcionka regularna:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Zaznaczenie:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "cieki" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Ty&lko do odczytu" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Ty&lko do odczytu" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Otwrz..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Zapisz..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Pliki kopii" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Twrz kopie plikw w:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Twrz pliki kopii w:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Folder oryginalnego pliku" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Globalny folder dla kopii:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nazwa pliku kopii:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "Dod&aj rozszerzenie .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "Dodaj znacznik czasu" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Potwierd kopiowanie" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Czy na pewno skopiowa XXX elementw?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Z lewej" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "na praw" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Tak" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Nie" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041504e2" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x415, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Gotowe" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2626,7 +2648,7 @@ msgstr "" "Tworzy puste dokumenty\n" "Nowe dokumenty (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2635,7 +2657,7 @@ msgstr "" "Otwrz istniejcy dokument\n" "Otwrz (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2644,7 +2666,7 @@ msgstr "" "Zamknij aktywny dokument\n" "Zamknij" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2653,7 +2675,7 @@ msgstr "" "Zapisz aktywny dokument\n" "Zapisz (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2662,7 +2684,7 @@ msgstr "" "Zapisz aktywny dokument pod inn nazw\n" "Zapisz jako" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2671,7 +2693,7 @@ msgstr "" "Zmie opcje wydruku\n" "Ustawienia strony" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2680,7 +2702,7 @@ msgstr "" "Zmie opcje drukarki i wydruku\n" "Ustawienia wydruku" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2689,7 +2711,7 @@ msgstr "" "Wydrukuj biecy dokument\n" "Drukuj" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2698,12 +2720,12 @@ msgstr "" "Wywietl cale strony\n" "Podgld wydruku" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Poka wszystkie ukryte elementy" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2712,32 +2734,32 @@ msgstr "" "Otwrz plik projektu\n" "Plik projektu (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Nieznany bd podczas otwierania projektu" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Nieznany bd podczas zapisu projektu" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Plik projektu" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Plik projektu zaadowano pomylnie." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Plik projektu zapisano pomylnie." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2746,7 +2768,7 @@ msgstr "" "Zapisz aktualne cieki i opcje do pliku projektu\n" "Zapisz plik projektu" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2755,7 +2777,7 @@ msgstr "" "Wywietl informacje o programie, numer wersji i info o prawach autorskich\n" "O programie" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2764,27 +2786,27 @@ msgstr "" "Wyjd z programu; program pyta, czy zachowa dokumenty\n" "Wyjd" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Otwrz ten dokument" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2793,7 +2815,7 @@ msgstr "" "Przejd do nastpnego panelu\n" "Nastpny panel" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2802,7 +2824,7 @@ msgstr "" "Wr do poprzedniego panelu\n" "Poprzedni panel" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2811,7 +2833,7 @@ msgstr "" "Ustaw okna w nakadajc si kaskad\n" "Kaskadowo" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2820,7 +2842,7 @@ msgstr "" "Ustaw okna obok siebie poziomo\n" "Okna poziomo" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2829,7 +2851,7 @@ msgstr "" "Ustaw okna obok siebie pionowo\n" "Okna pionowo" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2838,7 +2860,7 @@ msgstr "" "Kopiuj selekcj i wstaw do schowka\n" "Kopiuj" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2847,7 +2869,7 @@ msgstr "" "Wytnij selekcj i wstaw do schowka\n" "Wytnij" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2856,7 +2878,7 @@ msgstr "" "Znajd wskazany tekst\n" "Wyszukaj" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2865,7 +2887,7 @@ msgstr "" "Wstaw zawarto schowka\n" "Wklej" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2874,7 +2896,7 @@ msgstr "" "Powtrz ostatni czynno\n" "Powtrz" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2883,7 +2905,7 @@ msgstr "" "Zastp dany tekst innym\n" "Zastp" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2892,7 +2914,7 @@ msgstr "" "Zaznacz cay dokument\n" "Zaznacz wszystko" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2901,7 +2923,7 @@ msgstr "" "Cofnij ostatni czynno\n" "Cofnij" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2910,7 +2932,7 @@ msgstr "" "Powtrz cofnit czynno\n" "Powtrz" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2919,7 +2941,7 @@ msgstr "" "Poka lub ukryj pasek narzdzi\n" "Przecz pasek narzdzi" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2928,7 +2950,7 @@ msgstr "" "Poka lub ukryj pasek stanu\n" "Przecz pasek stanu" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2937,7 +2959,7 @@ msgstr "" "Poka lub ukryj pasek zakadek\n" "Wcz pasek zakadek" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2946,57 +2968,57 @@ msgstr "" "Zmieniaj rozmiar paneli automatycznie\n" "Zablokuj panele" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Zmie rozmiar okna" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Zmie pozycj okna" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Zredukuj okno do ikony" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Maksymalnie powiksz okno" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Przecz na okno nastpnego dokumentu" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Przecz na okno poprzedniego dokumentu" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zamknij aktywne okno; program pyta, czy zachowa dokumenty" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Przywrc normalny rozmiar okna" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Wcz list zada" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktywuj to okno" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3005,7 +3027,7 @@ msgstr "" "Zamknij podgld wydruku\n" "Anuluj podgld" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3024,7 +3046,7 @@ msgstr "" "WinMerge.PorwnaniePlikw\n" "Porwnanie plikw WinMerge " -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3043,23 +3065,23 @@ msgstr "" "WinMerge.PorwnanieFolderw\n" "Porwnanie folderw WinMerge" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Zapisz oryginalne znaki koca linii" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Nacinij dowolny klawisz" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Kliknij prawym klawiszem na ciek do skopiowania" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3068,152 +3090,152 @@ msgstr "" "Twrcy:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge jest rozprowadzany BEZ JAKIEJKOLWIEK GWARANCJI. To jest darmowe oprogramowanie i mona je redystrybuowa pod szczeglnymi warunkami; w celu uzyskania szczegowych informacji zobacz Licencj GNU General Public License w menu Pomoc." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Przerwij" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "P&onw" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignoruj" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignoruj &wszystkie" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Tak" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Tak na &wszystkie" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nie na w&szystkie" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Kontynuuj" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "Pom&i" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Pomi ws&zystkie" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Nie wywietlaj ponownie tego komunikatu." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Nie &pytaj ponownie." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Kolory skadni" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Kolory tekstu" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Kontrola wersji" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Z lewej:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "na lew:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Z prawej:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Na praw" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Wersja %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opcje (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Wszystkie komunikaty zostan ponownie wywietlone." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Dokonano modyfikacji w pliku biecej sesji porwnywania. Niektre ustawienia nie zostan zastosowane przed ponownym uruchomieniem powrwnywania." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Wybrana czcionka nie zostanie zastosowana do widocznych okien z rnicami." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3224,7 +3246,7 @@ msgstr "" "\n" "Prosz uy wartoci 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3235,127 +3257,129 @@ msgstr "" "\n" "Po wyzerowaniu konieczne bdzie ponowne uruchomienie programu." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Otwrz" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Pliki projektw WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Pliki ustawie (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Pliki Text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Pliki HTML (*.htm,*.html)|*.htm;*.html|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Pliki XML (*.xml)|*.xml|Wszystkie pliki (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Pena zawarto" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Skrcona zawarto" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Data modyfikacji" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Data modyfikacji i wielko" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Wielko" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nazwa" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "lokalizacja" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtry" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Wybierz nazw dla nowego filtru" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtry plikw(*.flt)|*.flt|Wszystkie filtry (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3368,7 +3392,7 @@ msgstr "" "Prosz skopiowa plik %1 do folderu WinMerge/Filters:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3381,7 +3405,7 @@ msgstr "" "\n" "Upewnij si, e folder taki istnieje i jest zapisywalny." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3392,7 +3416,7 @@ msgstr "" "\n" "Prosz wybra folder filtrw w opcje/System." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3405,12 +3429,12 @@ msgstr "" "\n" "By moe plik ten jest tylko do odczytu?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Lokalizuj plik fitra do instalacji" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3421,208 +3445,223 @@ msgstr "" "\n" "Nie mona skopiowa pliku do foldera filtrw." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Plik filtra ju istnieje. Czy nadpisa istniejcy plik?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Wyraenia regularne" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&cieka do cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "c&ieka do SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Wyniki porwnania katalogw" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Porwnywanie plikw" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Lewy bez tytuu" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Prawy bez tytuu" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Ich plik" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Mj plik" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Skanowanie plikw..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Otwieranie wybranych" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopiowanie lewej na praw" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopiowanie prawej na lew" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopiowanie wszystkich na lew" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopiowanie wszystkich na praw" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopiowanie plikw..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Usuwanie plikw..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Przenoszenie plikw..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Tworzenie raportu..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Lin: %s Kol: %d/%d Zn: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linia: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Lin: %s Kol: %d/%d Zn: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Scal" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Rnica %1 z %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "Znaleziono %1 rnic" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "Znaleziono 1 rnic" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "Tylko odczyt" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Element %1 z %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Elementy: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Wybierz dwa istniejce katalogi lub pliki do porwnania" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Wybr katalogu" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Wybierz dwa katalogi lub pliki do porwnania." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Lewa cieka nieprawidowa!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Prawa cieka nieprawidowa!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Obie cieki nieprawidowe!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Wybierz dwa pliki, aby umoliwi wybr programu rozpakowujcego." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Nie mona porwna pliku i katalogu!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Nie znaleziono pliku: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Plik nie rozpakowany: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3635,12 +3674,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Bd parsowania pliku konflitku" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3651,32 +3690,32 @@ msgstr "" "%1\n" "nie jest plikiem konfliktu" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Zapisz jako" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Zapisa zmiany w %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 tylko do odczytu. Czy chcesz zachowa plik pod inn nazw?" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Bd sprawdzania moliwoci zapisu w miejscu docelowym" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Bd przy tworzeniu kopii zapasowej pliku" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3689,7 +3728,7 @@ msgstr "" "\n" "Kontynuowa ?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3706,7 +3745,7 @@ msgstr "" "\t-uy innej nazwy pliku (wybierz Ok)\n" "\t-anulowa operacj (wybierz Anuluj)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3721,7 +3760,7 @@ msgstr "" "\n" "Czy zachowa rozpakowan wersj w innym pliku?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3736,7 +3775,7 @@ msgstr "" "\n" "Czy zachowa rozpakowan wersj w innym pliku?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3751,7 +3790,7 @@ msgstr "" "\n" "Nadpisa zmieniony plik?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3760,7 +3799,7 @@ msgstr "" "%1\n" "jest oznaczony jako tylko do odczytu. Czy zignorowa status tylko do odczytu?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3775,17 +3814,17 @@ msgstr "" "\n" "Jeli chcesz odwiey pliki, zamknij biec sesj i zaaduj je ponownie." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Zapisz lewy plik jako" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Zapisz prawy plik jako" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3796,42 +3835,42 @@ msgstr "" "\n" "Przed kontynuacj odwie dokumenty." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Musisz wskaza sciek projektu SourceSafe aby kontynuowa (tj.: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Pobie pliki z VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "System ledzenia wersji zwrci bd podczas prby pobrania pliku. Nie mona kontynuowa..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Bd wykonania polecenia systemu wersjonowania." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Katalog roboczy VSS oraz lokalizacja bieacego pliku nie zgadzaj si. Kontynuowa?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Nie znaleziono bazy VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Bd VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3842,7 +3881,7 @@ msgstr "" " Prosz sprawdzi config_spec uywanego widoku.\n" " Cofn operacj checkout?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3851,170 +3890,169 @@ msgstr "" "System ledzenia wersji zwrci bd podczas operacji uncheckout.\n" " Prosz sprawdzi config_spec uywanego widoku." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Brak" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "(Visual SourceSafe (poniej 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 i wyej)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Zatrzymaj na przerwie" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Zatrzymaj na przerwie lub punktorze" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiuj wybrany plik do wskazanego katalogu" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiuj wybrany plik do katalogu" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Usu wybran pozycj z lewej" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Usu wybran pozycj z prawej" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Usu wybrane pozycje po obu stronach" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ukryj wybrane elementy (filtr roboczy)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Zmie nazw wybranej pozycji na obu stronach" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Prawa na lew (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Lewa na praw (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Prawa na lew (%1 z %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lewa na praw (%1 z %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Lewa na... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Prawa na... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lewa na... (%1 z %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Prawa na... (%1 z %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Lewa (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Prawa (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Obie (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Lewa (%1 z %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Prawa (%1 z %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Obie (%1 z %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Wybierz katalog docelowy" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Lewa strona - wybierz folder docelowy:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Prawa strona - wybierz folder docelowy:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 objtych plikw)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 z %2 objtych plikw)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4025,17 +4063,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Czy na pewno skopiowa:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Czy na pewno skopiowa %d elementw:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4054,458 +4092,473 @@ msgstr "" "\n" "Prosz odwiey porwnanie." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Otwrz lewy plik" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Otwrz lewy plik w zewntrznym edytorze" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Otwrz lewy plik w..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Otwrz prawy plik" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Otwrz prawy plik w zewntrznym edytorze" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Otwrz prawy plik w..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nie mona uruchomi zewntrznego edytora: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Nieznane rozszerzenie dla zewntrznego edytora: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiuj nazwy plikw do schowka" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiuj cieki z lewej do schowka" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiuj cieki z prawej do schowka" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiuj cieki z obu stron do schowka" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Nieznany format archiwum" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj elementy z lewej do archiwum" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj elementy z prawej do archiwum" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj elementy z obu stron do archiwum" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj rne elementy do archiwum (z obu stron)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Kopiuj wybrany plik z lewej do katalogu" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Kopiuj wybrany plik z prawej do katalogu" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Plik" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Katalog" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Wynik porwnania" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Lewa data" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Prawa data" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Rozszerzenie" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Lewy rozmiar" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Prawy rozmiar" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Prawy rozmiar (krtki)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Lewy rozmiar (krtki)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Lewy czas utworzenia" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Prawy czas utworzenia" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Nowszy plik" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Wersja lewego pliku" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Wersja prawego pliku" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Skrcony wynik" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Lewe atrybuty" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Prawe atrybuty" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Lewe EOL" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Prawe EOL" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Lewe kodowanie" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Prawe kodowanie" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Ignorowane rn." -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Rnice" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binarne" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Nie mona porwna plikw" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Anulowany" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Plik pominity" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Katalog pominity" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Tylko lewa: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Tylko prawa: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Pliki binarne s identyczne" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Pliki binarne s rne" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Pliki s rne" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Tylko lewa" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Tylko prawa" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Bd" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Upyno: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "wybrano 1 element" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "wybrano %1 elementw" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Plik lub katalog." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nazwa podkatalogu, gdy podkatalogi s przetwarzane." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Wynik porwnania wersja pena." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Data modyfikacji lewej strony." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Data modyfikacji prawej strony." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Rozszerzenie pliku." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Rozmiar lewego pliku w bajtach." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Rozmiar prawego pliku w bajtach." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Lewa wielko pliku skrcona." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Prawa wielko pliku skrcona." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Czas utworzenia lewej strony." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Czas utworzenia prawej strony." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Pokazuje, ktra strona zostaa pniej zmodyfikowana." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Wersja pliku z lewej - tylko dla niektrych typw." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Wersja pliku z prawej - tylko dla niektrych typw." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Skrcony wynik porwnania." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atrybuty lewej strony." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atrybuty prawej strony." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Lewa strona pliku typu EOL" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Prawa strona pliku typu EOL" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Kodowanie lewej strony." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Kodowanie prawej strony." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Liczba rnic zignorowanych w pliku. Rnice te zostay zignorowane przez WinMerge i nie mog zosta poczone." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Liczba rnic w pliku. Liczba ta nie zawiera zignorowanych rnic." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Pokazuje gwiazdk (*) jeli plik binarny." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Porwnaj %1 z %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Lista z przecinkami" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Lista z tabulatorami" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Prosty HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Prosty XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Plik raportu ju istnieje. Czy chcesz nadpisa istniejcy plik ?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4514,32 +4567,32 @@ msgstr "" "Bd przy tworzeniu raportu:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Raport zosta pomylnie utworzony." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Ten sam plik otwierany w obu panelach." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Wybrane pliki s identyczne." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Bd podczas porwnywania plikw." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Nie mona utworzy plikw tymczasowych. Sprawd ustawienie cieki tymczasowej." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4554,7 +4607,7 @@ msgstr "" "\n" "Uwaga: Jeli odmienne znaki koca linii maj zawsze by traktowane jako rwnowane, ustaw opcj 'Ignoruj rnice koca linii...' na zakadce porwnania w oknie opcji (dostpne w Edycja/Opcje)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4565,22 +4618,22 @@ msgstr "" "Przy pomocy tej opcji zostan zunifikowane do gwnego typu.\n" "Czy chcesz zmieni opcj i pozostawi rne znaki koca linii?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Bd przy wstpnym porwnaniu pliku '%1' za pomoc wtyczki '%2'. Wstpne porwnanie nie zostanie zastosowane." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Wybrany folder jest nieprawidowy." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nie mona otworzy w edytorze pliku binarnego." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4595,7 +4648,7 @@ msgstr "" "%1\n" "na drugiej stronie i otworzy te foldery?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4606,132 +4659,132 @@ msgstr "" "Wywietlanie kadego pliku w odpowiedniej stronie kodowej da lepsze wyniki, ale scalenie/skopiowanie bdzie niebezpieczne.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Ostrzeenie: Pliki uywaj rnego kodowania, lewy=%s a prawy=%s, a ich poczenie moe spowodowa utrat informacji." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Utrata informacji z powodu bdw kodowania: oba pliki" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Utrata informacji z powodu bdw kodowania: prawy plik" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Utrata informacji z powodu bdw kodowania: lewy plik" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Brak rnic" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Wiersz rnicy" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Zastpiono %1 sekwencji znakw." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nie mona znale sekwencji znakw \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopiuj pen ciek" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopiuj nazw pliku" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Okno lokacji" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Okno Diff" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Utworzono patch." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. element nie zosta znaleziony albo jest katalogiem!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. element nie zosta znaleziony albo jest katalogiem!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Plik patch ju istnieje. Czy napisa plik?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[wybrano %1 plikw]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normalny" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Kontekst" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Zunifikowany" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Nie mona zapisa do pliku %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Wybrana cieka docelowa nie jest absolutna: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Wybierz plik docelowy" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nie mona utworzy patcha z plikw binarnych." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nie mona utworzy patcha z katalogw." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4742,17 +4795,17 @@ msgstr "" "\n" "Tworzenie patcha wymaga zapisania wszystkich zmian w plikach." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Folder nie istnieje." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Wyniki biecego porwnania katalogw zostan usunite." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4763,7 +4816,7 @@ msgstr "" "Nie znaleziono komponentw (7-zip i/lub Merge7z*.dll) wymaganych do obsugi archiww.\n" "Informacje o obsudze archiww zawiera podrcznik." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4772,7 +4825,7 @@ msgstr "" "\n" "Uwaga: Integracja 7-Zip jest wyczona w ustawieniach programu." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4781,37 +4834,37 @@ msgstr "" "\n" "Uwaga: Integracja 7-Zip ograniczona jest do podstawowych operacji w ustawieniach programu." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Wybierz plik do eksportu" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Wybierz plik do importu" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Zaimportowano opcje z pliku." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Wyeksportowano opcje do pliku." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Bd podczas importu opcji z pliku." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Bd podczas eksportu opcji do pliku." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4822,473 +4875,493 @@ msgstr "" "\n" "Czy na pewno kontynuowa?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Bd w wyraeniu regularnych" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Brak trafienia" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Niepoprawne wyraenie regularne" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Niepoprawny znak kolacjonowania" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Niepoprawna nazwa klasy znakw" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Ukonik nastpczy" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Niepoprawne odniesienie wsteczne" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Brakujce [ lub [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Brakujce ( lub \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Brakujce \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Niepoprawna zawarto \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Niepoprawne zakoczenie zakresu" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Brak pamici" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Niepoprawne poprzedzajce wyraenie regularne" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Przedwczesne zakoczenie wyraenia regularnego" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Wyraenie regularne zbyt due" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Brakujce ) lub \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Zachodnia Europa" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Wschodnia Europa" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Wschodnia Azja" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Poudniowa Azja" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "rodkowy Wschd" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Nie stosuje si" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrylica" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS aciski US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabski" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grecki" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Kr.Batyckie" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS aciski 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grecki 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS aciski 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrylica" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turecki" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugalski" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandzki" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrajski" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Francuski (Kanada)" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Skandynawski" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrylica CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grecki 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Tajski" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japoski" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chiski (uproszczony)" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Koreaski" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chiski (tradycyjny)" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows aciski 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrylica (Sowiaskie)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows aciski 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grecki" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows aciski 5 (Turecki)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrajski" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabski" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Kr.Batyckie" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Wietnamski" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romaski" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grecki" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrylica" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa rodkowa" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turecki" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Kodowanie ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Kodowanie ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Kodowanie ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Kodowanie ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Kodowanie ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "czone" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Zapisz lewy plik" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Zapisz prawy plik" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Zapisz lewy plik pod nazw..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Zapisz prawy plik pod nazw..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Zmie status 'tylko odczyt' lewego pliku/katalogu" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Zmie status 'tylko odczyt' prawego pliku/katalogu" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konwertuj ZKL na Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konwertuj ZKL na Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konwertuj ZKL na Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Przecz midzy trybami edycji i scalania" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5297,12 +5370,12 @@ msgstr "" "Poka i dostosuj waciwoci kodowania pliku\n" "Waciwoci kodowania pliku" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Otwrz i rozwi plik konfliktu" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5311,7 +5384,7 @@ msgstr "" "Zaznacz obszar rnicy w biecej linii\n" "Rnica w biecej linii" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5320,7 +5393,7 @@ msgstr "" "Przejd do linii lub rnicy\n" "Id do (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5329,7 +5402,7 @@ msgstr "" "Ustaw opcje programu\n" "Opcje" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5338,79 +5411,79 @@ msgstr "" "Odwie podgld\n" "Odwie (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiuj wybrane linie do schowka dodajc numeracj wierszy" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Odwie zaznaczone elementy" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Dodaj zakadk" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Id do nastpnej zakadki" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Id do poprzedniej zakadki" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Wyczy wszystkie zakadki" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "Wywietla pliki, ktre s dokadnie identyczne" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "Wyswietla pliki z rnicami" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "Wyswietla pliki istniejce tylko po lewej" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "Wyswietla pliki istniejce tylko po prawej" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "Wywietla pliki binarne" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "Wywietla pominite pliki" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5419,7 +5492,7 @@ msgstr "" "Wybierz czcionk podgldu\n" "Wybierz czcionk podgldu" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5428,27 +5501,27 @@ msgstr "" "Przywr domyln czcionk systemow podgldu\n" "Czcionka domylna" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Pokazuje biae znaki" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Przecz panel rnic" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel pokazuje oglny obraz z plikw" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Poka okno statystyk porwnania folderu" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5457,7 +5530,7 @@ msgstr "" "Wybierz jzyk interfejsu uytkownika\n" "Jzyk" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5466,12 +5539,12 @@ msgstr "" "Pokazuj rnice wewntrz linii rnymi kolorami\n" "Pokazuj rnic linii" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Zamie pozycje dwch okien" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5480,7 +5553,7 @@ msgstr "" "Poka numery linii\n" "Poka numery linii" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5489,7 +5562,7 @@ msgstr "" "Wcz zawijanie sw\n" "Zawijaj linie" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5498,22 +5571,22 @@ msgstr "" "Pokazuje marginesy zaznaczenie dla obu paneli\n" "Poka marginesy zaznaczenia" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Zwiksz rozmiar tekstu" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Zmniejsz rozmiar tekstu" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Resetuj powikszenie" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5522,7 +5595,7 @@ msgstr "" "Id do poprzedniej rnicy\n" "Poprzednia rnica (Alt+Gra)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5531,7 +5604,7 @@ msgstr "" "Id do nastpnej rnicy\n" "Nastpna rnica (Alt+D)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5540,7 +5613,7 @@ msgstr "" "Id do pierwszej rnicy\n" "Pierwsza rnica (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5549,7 +5622,7 @@ msgstr "" "Id do biecej rnicy\n" "Bieca rnica (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5558,7 +5631,7 @@ msgstr "" "Id do ostatnej rnicy\n" "Ostatnia rnica (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5567,7 +5640,7 @@ msgstr "" "Kopiuj wybrany tekst do prawego pliku\n" "Kopiuj na prawo (Alt Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5576,7 +5649,7 @@ msgstr "" "Kopiuj wybrany tekst do lewego pliku\n" "Kopiuj na lewo (Alt Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5585,7 +5658,7 @@ msgstr "" "Kopiuj rnic na prawo i przejd do nastpnej\n" "Kopiuj na prawo i nastpna (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5594,7 +5667,7 @@ msgstr "" "Kopiuj rnic na lewo i przejd do nastpnej\n" "Kopiuj na lewo i nastpna (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5603,7 +5676,7 @@ msgstr "" "Kopiuj wszystkie rnice do prawego pliku\n" "Wszystkie na prawo" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5612,72 +5685,77 @@ msgstr "" "Kopiuj wszystkie rnice do lewego pliku\n" "Wszystkie na lewo" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Usu zaznaczone elementy z obu folderw" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porwnaj zaznaczony element (porwnaj pierwszy element jeli zaznaczono wiele elementw)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Wybierz i ponownie uporzdkuj kolumny porwnania katalogw" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Generuj plik patch" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Wybierz i modyfikuj filtry" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Generuje raport z wynikw porwnania" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Uytkownik wybiera program rozpakowujcy (bez rozpakowywania podczas porwnania katalogw)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Program rozpakowujcy zostanie uruchomiony dla obu plikw (jeden plik wymaga rozszerzenia)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Wybierz program rozpakowujcy, by edytowa plik" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Bez rnicowania wstpnego (normalne)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Sugerowane wtyczki" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Inne wtyczki" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Odcz i ponownie podcz wszystkie wtyczki (dla programistw)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5686,12 +5764,12 @@ msgstr "" "Aktywuje nastpny widoczny plik\n" "Aktywuj nastpny plik" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Zamyka wszystkie otwarte okna" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5700,22 +5778,22 @@ msgstr "" "Otwiera pomoc WinMerge\n" "Pomoc WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Wywietla biec wersj WinMerge oraz tekstowy plik konfiguracji" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Wywietla licencj GNU General Public License" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Kompilacja prywatna: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5724,7 +5802,7 @@ msgstr "" "Otwiera dokument z informacjami o wydaniu\n" "Informacje o wydaniu" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5733,262 +5811,267 @@ msgstr "" "Otwiera witryn tumacze\n" "Tumacznia" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Ustawienia wtyczki" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Bez rnicowania wstpnego" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Rnicuj wstpnie, jeli mona" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nie znaleziono WSH skrypty .sct wyczone" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Otwrz plik w zarejestrowanej aplikacji" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Otwrz plik w zewntrznym edytorze" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Otwrz plik w wybranym programie" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Nie wywietlaj przenoszonych blokw" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Wywietl wszystkie przeniesione bloki" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Wywietl przeniesione bloki tylko od biecej rnicy" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Id do rnicy pod kursorem" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Id &do rnicy %1 z %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "&Id do linii %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Wyczone" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Z systemu plikw" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Z listy MRU" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Zasoby" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Ukryj pasek narzdzi" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Poka may pasek narzdzi" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Poka duy pasek narzdzi" diff --git a/Src/Languages/Portuguese.po b/Src/Languages/Portuguese.po index 6d20d2bbbeb..9fe5429399c 100644 --- a/Src/Languages/Portuguese.po +++ b/Src/Languages/Portuguese.po @@ -71,7 +71,7 @@ msgstr "Cor&tar" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "Co&piar" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "Co&lar" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Ir para..." @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "&Abrir" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "com a aplicao registada" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "com editor &externo" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "com..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Ficheiro" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir pro&jecto...\Ctrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "&Guardar projecto..." @@ -160,5310 +162,5391 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Sair" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Opes..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Seleccionar &fonte..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Usar fonte pre&definida" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Barra de ferramentas" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Barra de esta&do" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Idioma..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Ferramentas" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "Filtros..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Gerar ficheiro patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "Plugins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "E&xtraco manual" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Extraco automtica" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "Editar com extractor" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Recarregar plugins" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "Dep&urar" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "Carregar configurao..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Janela" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Fechar" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Fechar &Todos" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Mudar &Vista\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &horizontalmente" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &verticalmente" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "Cascata" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "A&juda" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Suporte de ar&quivo desactivado..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "Acerca de &WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Ler apenas lado &esquerdo" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Ler apenas lado &direito" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Codificao do ficheiro" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Seleccionar &tudo\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Mostrar itens idnticos" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Mostrar itens diferentes" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostrar itens nicos do lado esquerdo" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar itens nicos do lado direito" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Mostrar itens ignorados" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Mostrar ficheiros &binrios" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar itens ocultados" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Comparar estatsticas" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Actuali&zar\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Actualizar seleco\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "Combinar" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Comparar\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Prxima diferena\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferena anterior\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Primeira diferena\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferena actual\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "ltima diferena\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar para o lado direito\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar para o lado esquerdo\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Eliminar\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "Personalizar colunas..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "&Gerar relatrio..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Guardar lado esquerdo" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Guardar" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Guardar como..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Guardar lado direito" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Pr-&visualizar" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "Converter final de linhas para" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Modo Combinar\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Desfazer\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Refazer\tCtrl+Z" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar...\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Colar\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar diferenas de linha\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "Procurar...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Substituir...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "Scripts" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Vazio >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avanado" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "Copiar com ns de linha\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Alternar marcadores\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "Prximo marcador\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Marcador anterior\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "Eliminar todos os marcadores" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Ir para...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Combinar" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Ver espaos" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Ver diferenas de linha" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Ver ns de linha" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Ajuste de linha" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Trocar janelas" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Janela de diferenas" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Janela de localizao" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiar para a direita e avanar\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar para o lado esquerdo\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Copiar tudo para a direita" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "C&opiar tudo para a esquerda" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "Pr-diferenciar" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Comparar" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "Da esquerda para a direita" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "Da esquerda para..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "Da direita para a esquerda" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "Da direita para..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "Mover" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "Da esquerda para..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "Da direita para..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "Eliminar" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "Esquerda" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "Direita" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "Ambos" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Renomear" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "Ocultar itens" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Abrir esquerda" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Abrir direita" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Copiar localizao" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "Direito (%1 de 2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Co&piar localizao" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "Esquerda... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "Direita... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "Ambos... (%1 de %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "Diferenas... (%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "Actualizar" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "Copiar localizao completa" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Co&piar nome de ficheiro" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Definies de Pr-diferenciao" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "No pr-diferenciar" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Pr-diferenciao manual" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Ir para diferena" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "No mostrar blocos movidos" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "Todos os blocos movidos" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Bloco movido para a diferena actual" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Acerca de WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Todos os direitos reservados." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visite o site de WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Seleccione ficheiros ou arquivos" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "Esquerda:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "Pesquisar..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "Direita:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Pesquisar..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "Filtro:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "E&xtractor:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "Seleccionar..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "Incluir sub-ficheiros" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ajuda" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Ficheiros ou arquivos a comparar" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Base de dados:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projecto:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Utilizador:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Palavra-passe:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Hiperligao ao destino do projecto VSS" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos os itens" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Guardar como..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Sistema de verso" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "Sistema de verso:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "Destino de cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Geral" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Ir automaticamente para a primeira diferena" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Desactivar ecr de apresentao" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Fechar janela com ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verificar automaticamente localizao na janela de abertura" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Permitir apenas uma execuo" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-completar janela de abertura:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Activar janelas mltiplas de comparao para" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Comparao de arquivos" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Comparao de ficheiros" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ocultar mensagens comuns. Prima o boto Repor para visualizar novamente todas as mensagens." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Repor" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Idioma" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Idiomas disponveis:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Localizar" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "Localizar:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Apenas palavras completas" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Reconhecer maisculas/minsculas" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "Termo corrente" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "No ultrapassar fim de ficheiro" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direco" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "Acima" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "Abaixo" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "Localizar prximo" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Substituir" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Substituir por:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "No ultrapassar fim de ficheiro" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Substituir em" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "Seleco" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "Ficheiro completo" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "Substituir" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Substituir todos" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Alterao lgica de maisculas/minsculas" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Comentrios" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Verificar depois de sair" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtros de linha" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Ignorar linhas com as seguintes caractersticas" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Termos correntes (um por linha):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Cores" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Diferena:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Diferena seleccionada:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Fundo" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Eliminado" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Diferena ignorada:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Movida:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Movida seleccionada:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Diferena de palavra:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Diferena de palavra seleccionada:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Predefinio" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dilogo" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Enviar ficheiros eliminados para a Reciclagem" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integrao" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Adicionar ao menu de contexto do explorador" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Activar menu avanado" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Incluir sub-pastas por predefinio" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "com editor &externo:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "Arquivo do filtro:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Pesquisar..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Gerador de ficheiro patch" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Ficheiro&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Ficheiro&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Trocar" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "Anexar a ficheiro existente" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "Resultado:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "Formato" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Estilo:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "Contexto:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Espaos" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Comparar" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Ignorar alteraes" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ignorar todos" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorar linhas em branco" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Reconhecer maisculas/minsculas" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Incluir linha de comando" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir em editor externo" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Mostrar colunas" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Seleccionar extractor" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "E&xtractor de ficheiros:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Mostrar todos os extractores, no verificar extenses" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Lista de extenses:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descrio:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Progresso da comparao de arquivos" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Parar" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "A comparar itens..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Itens comparados:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Total de itens:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ir para" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Ir para:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Ficheiro" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Ir para" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Linha" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "Diferena" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "Ir para" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Espao" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Comparar" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Ignorar alterao" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignorar todas" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar linhas em branco" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorar maisculas/minsculas" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Activar deteco de bloco movido" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ignorar diferenas de tempo inferiores a 3 segundos" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Mtodo de comparao de ficheiros:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "Parar aps primeira diferena" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtrar comentrios" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Destacar sintaxe" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Re-anlise automtica" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Manter caracteres EOL originais" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulaes" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "Tamanho de tabs:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Inserir tabulaes" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Inserir espaos" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Cores de diferena de linha" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Ver diferenas de linha" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "A nvel do caracter" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "A nvel da palavra:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtros de ficheiro" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testar" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Novo..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Eliminar..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Guardar ficheiros modificados?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Ficheiro do lado esquerdo" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Guardar alteraes" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "Rejeitar alteraes" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Ficheiro do lado direito" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Guardar alteraes" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Rejeitar alteraes" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Rejeitar tudo" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Pgina de cdigo" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Pgina de cdigo predefinida" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Seleccionar a pgina de cdigo predefinida quando carregar ficheiros non-Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "Detectar informao da pgina de cdigo para estes ficheiros : .html, .rc, .xml\nnecessrio reinicializar sesso" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Pgina de cdigo do sistema" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "A mesma que o interface de utilizador do WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Personalizar pgina de cdigo:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - suporte de arquivo desactivado" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Impossvel detectar verso 7-Zip (no instalada?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "Suporte de arquivo requer a instalao de 7-Zip 3.11 ou mais recente ou os seus\ncomponentes essenciais tm de ser copiados para a pasta de destino do programa para execuo autnoma." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Para alm disso, dever haver um plugin de interface adequado (Merge7z*.dll) na pasta do programa." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "Utilize a verso 7-zip recomendada abaixo at que os plugins de interface para verses mais recentes estejam disponveis." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Verso" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "Necessrio plugin\n(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Verso recomendada de 7-zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "presente" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-zip instalado no seu computador:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nenhum" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "falta" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes 7-zip para operaes autnomas:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "desactualizado" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins na pasta:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Descarregar plugin" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opes" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "Categorias" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Palavras-chave:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nomes das funes:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Comentrios:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nmeros:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Pr-processador:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Utilizador 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Utilizador 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Negrito" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Relatrio de comparao de arquivos" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Ficheiro do relatrio:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Pesquisar..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "Estilo:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "Copiar para a rea de Transferncia" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtro partilhado ou privado" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Qual o tipo de filtro que deseja criar?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro partilhado (para todos os utilizadores deste computador)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (apenas para o utilizador actual)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Suporte de arquivo" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "O suporte de arquivo necessita o plugin 7-zip instalado:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Descarregar o plugin 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Activar suporte de arquivo" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Utilizar 7-zip autnomo, se disponvel" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Utilizar 7-zip local da pasta WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "Detectar tipo de arquivo pela assinatura" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Comparar estatsticas" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Pastas:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Ficheiros:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diferente" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binrio:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "nico" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Esquerda:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Direita:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Idntico" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Fechar" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Seleccionar pgina de cdigo para" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "Carregar &Ficheiro:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Guardar &Ficheiro:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "Utilizar a mesma pgina de cdigo para ambos" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "Aplicar" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "Cancelar" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testar filtro" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "A testar filtro ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "Inserir texto a testar:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "Nome do arquivo" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "Testar" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "Fechar" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "Utilizar cores de texto personalizadas" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Personalizar cores do texto" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Espao:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Texto normal:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Seleco:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Destino" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Apenas de leitura" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Apenas de leitura" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Guardar..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "081604e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x816, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Pronto" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "Criar documentos\nNovos documentos (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "Abrir um documento existente\nAbrir (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "Close the active document\nClose" msgstr "Fechar o documento activo\nFechar" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "Guardar o documento actual\nGuardar (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "Guardar o documento actual com novo nome\nGuardar como" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "Change the printing options\nPage Setup" msgstr "Modificar as opes de impresso\nConfigurao de pgina" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "Alterar a impressora e as opes de impresso\nConfigurao de impresso" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "Print the active document\nPrint" msgstr "Imprimir o documento actual\nImprimir" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "Display full pages\nPrint Preview" msgstr "Exibir pginas inteiras\nPr-visualizao" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Mostrar todos os itens ocultados" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "Abrir projecto\nProject file (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Erro desconhecido ao abrir projecto" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Erro desconhecido ao guardar projecto" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Projecto:" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Projecto carregado com sucesso." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Projecto guardado com sucesso." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "Guardar localizao e opes do projecto\nSave Project File" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "Mostrar informao do programa, nmero da verso e direitos de autor\nAbout" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "Sair da aplicao; confirmar guardar documentos\nExit" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Abre este documento" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "Mudar para a prxima janela\nNext Pane" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "Voltar janela anterior\nPrevious Pane" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "Ordenar janelas em cascata\nCascade Windows" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "Ordenar janelas sem sobreposio\nTile Windows" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "Ordenar janelas sem sobreposio\nTile Windows" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "Copiar a seleco e coloc-la na rea de Transferncia\nCopy" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "Cortar a seleco e coloc-la na rea de Transferncia\nCut" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "Find the specified text\nFind" msgstr "Localizar texto especificado\nFind" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "Inserir contedo da rea de Transferncia\nPaste" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "Repeat the last action\nRepeat" msgstr "Repetir a ltima aco\nRepeat" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "Substituir texto especificado por texto diferente\nReplace" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "Select the entire document\nSelect All" msgstr "Seleccionar todo o documento\nSelect All" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "Anular a ltima aco\nUndo (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "Refazer a anterior aco anulada\nRedo (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "Mostrar/Ocultar a barra de ferramentas\nToggle ToolBar" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "Mostrar/Ocultar a barra de estado\nToggle StatusBar" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Alterar o tamanho da janela" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Alterar a posio da janela" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um cone" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o tamanho mximo" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Mudar para a janela do prximo documento" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Mudar para a janela do documento anterior" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Fechar a janela activa e confirmar guardar documentos" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Aumentar a janela para o tamanho normal" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Activar lista de tarefas" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Activar esta janela" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "Fechar pr-visualizao\nCancel Preview" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Manter caracteres EOL originais" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Prima uma tecla" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Clique com o boto direito do rato no destino a copiar" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "Abortar" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "Tentar novamente" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "Ignorar" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignorar todos" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "Sim" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Sim para todos" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "No" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "No para todos" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "Continuar" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "Avanar" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Avanar todos" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "No voltar a exibir esta mensagem." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "No voltar a perguntar." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Cores de sintaxe" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Cores do texto" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Controlo de verso" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Verso %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opes (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas as mensagens esto novamente disponveis." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Foram efectuadas alteraes na sesso actual de comparao de ficheiros. Algumas definies podero estar activas apenas aps reinicializar a actual comparao de ficheiros." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "A alterao de fonte seleccionada no ser aplicada s janelas de diferenas actuais." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Projectos WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Contedo essencial" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Data de modificao" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Data de modificao e tamanho" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Tamanho" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nome" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Localizao" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtros" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F]" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Descrio" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Seleccionar nome de ficheiro para novo filtro" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Ficheiros de filtros (*.ini)|*.ini|Todos os ficheiros (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Localizar filtro a instalar" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "Destino para cleartool.exe:" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "Destino para SS.EXE:" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Relatrio de comparao de arquivos" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Comparao de ficheiros" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Sem ttulo esquerda" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Sem ttulo direita" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Analisando ficheiros..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "A abrir seleco" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "A copiar da esquerda para a direita" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "A copiar da direita para a esquerda" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "A copiar tudo para a esquerda" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "A copiar tudo para a direita" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "A copiar ficheiros..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "A eliminar ficheiros..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "A mover ficheiros..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "A criar relatrio..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linha: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Diferena %1 de %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 diferenas encontradas" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 diferena encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Item %1 de %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Item %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dois arquivos ou ficheiros existentes para comparar" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Seleco de pasta" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dois arquivos ou ficheiros para comparar." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "A pasta de destino da esquerda invlido!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "A pasta de destino da direita invlida!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Ambas as pastas de destino so invlidas!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Seleccione dois ficheiros para activar a seleco de extractor." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Impossvel comparar ficheiro ou arquivo!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Ficheiro no encontrado: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Ficheiro no extrado: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "Impossvel abrir ficheiro\n%1\n\n%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Guardar como" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Guardar alteraes em %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 apenas de leitura. Deseja substituir o ficheiro apenas de leitra ? (No, para guardar com novo nome.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Erro na verificao de escrita na pasta de destino" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Erro ao criar cpia de segurana" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2128 #, 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 "Erro ao guardar ficheiro.\n%1\n%2\nDeseja:\n\t-usar um nome diferente para o ficheiro (Prima Ok)\n\t-abortar a aco actual (Prima Cancelar)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, 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 "Plugin '%2' impossvel comprimir as suas alteraes no ficheiro esquerdo em '%1'.\n\nO ficheiro original no ser alterado.\n\nDeseja guardar a verso no comprimida em outro ficheiro?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, 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 "Plugin '%2' impossvel comprimir as suas alteraes no ficheiro direito em '%1'.\n\nO ficheiro original no ser alterado.\n\nDeseja guardar a verso no comprimida em outro ficheiro?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "Outra aplicao actualizou o ficheiro\n%1\ndesde a incializao de WinMerge.\n\nSubstituir ficheiro modificado?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "%1\n apenas de leitura. Deseja substituir o item apenas de leitura?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, 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 "Outra aplicao actualizou o ficheiro\n%1\ndesde a ltima anlise do WinMerge.\n\nSe desejar actualizar os ficheiros, feche o ficheiro de comparao actual e carregue novamente os ficheiros." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Guardar ficheiro esquerdo como..." -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Guardar ficheiro direito como..." -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "Impossvel combinar diferenas quando os documentos no esto sincronizados.\n\nActualizar documentos antes de continuar." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Tem de especificar o destino de um projecto SourceSafe para continuar (ex: $/OMeuProjecto)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger ficheiros de VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistema de verses apresentou erro ao tentar desproteger ficheiro. Impossvel contiuar..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Erro ao executar comando do sistema de verses." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "O ficheiro de trabalho de VSS e o destino do ficheiro actual no coincidem. Continuar?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Base(s) de dados VSS no encontrada(s)!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Erro no VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, 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 "O sistema de verses apresentou um erro ao tentar desproteger o ficheiro.\n Verifique a configurao da visualizao utilizada.\n Anular a operao de desproteco?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "Versioning System returned an error while attempting to undo checkout the file.\n Please, check config spec of used view. " msgstr "O sistema de verses apresentou um erro ao tentar anular a desproteco do ficheiro.\n Verifique a configurao da visualizao utilizada." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Nenhum" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (inferior a 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 e superior)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Quebra de linha nos espaos" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Quebra de linha nos espaos ou pontuao" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar o item seleccionado para a directoria nomeada" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar o item seleccionado para a directoria personalizada" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Eliminar item seleccionado esquerda" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Eliminar item seleccionado direita" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Eliminar item(s) seleccionado(s) em ambos os lados" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ocultar item(s) seleccionado(s) (no filtro)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Renomear o item seleccionado em ambos os lados" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Da direita para a esquerda (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Da esquerda para a direita (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Da direita para a esquerda (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Da esquerda para a direita (%1 de %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Da esquerda para... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Da direita para... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Da esquerda para... (%1 de %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Da direita para... (%1 de %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Esquerda (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Direita (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Ambos (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Esquerda (%1 de 2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Direita (%1 de 2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos (%1 de %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Seleccione pasta de destino" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Lado esquerdo - seleccione pasta de destino:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Lado direito - seleccione pasta de destino:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ficheiros afectados)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 ficheiros afectados)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "Tem certeza que deseja eliminar\n\n%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2217 #, 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:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Abrir ficheiro esquerdo" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Abrir ficheiro esquerdo no editor externo" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Abrir ficheiro esquerdo com..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Abrir ficheiro direito" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Abrir ficheiro direito no editor externo" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Abrir ficheiro direito com..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Erro ao executar editor externo: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extenso desconhecida do editor externo: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar nomes dos ficheiros para a rea de Transferncia" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar destino do lado esquerdo para a rea de Transferncia" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar destino do lado direito para a rea de Transferncia" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar destino de ambos os lados para a rea de Transferncia" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Formato de arquivo desconhecido" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Adicionar itens do lado esquerdo ao arquivo" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Adicionar itens do lado direito ao arquivo" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Adicionar itens de ambos os lados ao arquivo" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adicionar outros itens ao arquivo (ambos os lados)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nome do ficheiro" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Pasta" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultado da comparao" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Data da esquerda" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Data da direita" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extenso" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Lado esquerdo" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Lado direito" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Lado direito (Curto)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Lado esquerdo (Curto)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Data de criao - Esq" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Data de criao - Dta" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Ficheiro mais recente" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Verso do ficheiro esquerdo" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Verso do ficheiro direito" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Resultado resumido" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atributos esq" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atributos dta" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "EOL esq" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "EOL dta" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Codificao esq" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Codificao dta" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Diferena ignorada." -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Diferenas" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binrio" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Impossvel comparar ficheiros" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Item abortado" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Ficheiro omitido" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Arquivo omitido" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Os ficheiros binrios so idnticos" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Os ficheiros binrios so diferentes" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Os ficheiros so diferentes" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Apenas esquerda" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Apenas direita" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tempo decorrido: %Id ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 item seleccionado" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 itens seleccionado" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nome do ficheiro ou pasta." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nome de sub-ficheiro quando sub-ficheiros includos." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultado da comparao, forma extensa." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Data de modificao do lado esquerdo." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Data de modificao do lado direito." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Extenso do ficheiro." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Tamanho do ficheiro em bytes." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Tamanho do ficheiro direito em bytes." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Tamanho do ficheiro esquerdo abreviado." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Tamanho do ficheiro direito abreviado." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Data de criao do lado esquerdo." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Data de criao do lado direito." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica o lado com a data de modificao mais recente." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verso do ficheiro do lado esquerdo, apenas para alguns tipos de ficheiros." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verso do ficheiro do lado direito, apenas para alguns tipos de ficheiros." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Resultado resumido da comparao." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atributos do lado esquerdo." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atributos do lado direito." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Tipo de ficheiro EOL do lado esquerdo" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Tipo de ficheiro EOL do lado direito" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Codificao do lado esquerdo." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Codificao do lado direito." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nmero de diferenas ignoradas no ficheiro. Estas diferenas so ignoradas pelo WinMerge e no podem ser combinadas." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nmero de diferenas no ficheiro. Este nmero no inclui diferenas ignoradas." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Apresenta um asterisco (*) se ficheiro for binrio." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 com %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Lista separada por vrgulas" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabulaes" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML simples" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "HTML simples" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "Error creating the report:\n%1" msgstr "Erro ao criar relatrio:\n%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "O relatrio foi criado com sucesso." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "O mesmo ficheiro est aberto em ambas as janelas." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Os ficheiros seleccionados so idnticos." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocorreu um ero ao comparar os ficheiros." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Impossvel criar ficheiros temporrios. Verifique as suas definies de ficheiros temporrios." -#: Merge.rc:2349 +#: Merge.rc:2383 #, 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:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ocorreu um erro ao pr-diferenciar o ficheiro %1' com o plugin %2'. A pr-diferenciao no ser aplicada." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "O arquivo seleccionado invlido." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Impossvel abrir ficheiro binrio no editor." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "Different codepages found in left (cp%d) and right (cp%d) files. \nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default windows codepage (recommended)?" msgstr "Encontrados pginas de cdigo diferentes nos ficheiros da esquerda (cp%d) e direita (cp%d). \nApresentar cada ficheiro na sua pgina de cdigo ter melhor visualizao, mas combinar/copiar poder ser arriscado.\Deseja tratar os dois ficheiros como tendo as pginas de cdigo predefinidas para as janelas?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Ateno: Os ficheiros utilizam codificaes diferentes, esquerda=%s e direita=%s e combinar poder causar perda de informao." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informaes perdidas devido a erros de codificao: ambos os ficheiros" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informaes perdidas devido a erros de codificao: ficheiro direito" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informaes perdidas devido a erros de codificao: ficheiro esquerdo" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Sem diferenas" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Diferena de linha" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Substituda(s) %1 string(s)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposvel localizar string \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copiar localizao completa" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copiar nome de ficheiro" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Janela de localizao" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Janela de diferenas" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Ficheiro patch escrito com sucesso." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. item no encontrado ou uma directoria!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. item no encontrado ou uma directoria!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "O ficheiro patch j existe. Deseja substitu-lo?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 itens seleccionados]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Impossvel escrever no ficheiro %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "A localizao de destino no uma localizao absoluta: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Especifique o ficheiro de destino" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Impossvel criar ficheiro patch a partir de ficheiros binrios." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Impossvel criar ficheiro patch a partir de directorias." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "Por favor, guarde todos os ficheiros antes.\n\nCiar um ficheiro patch requer a inexistncia de alteraes por guardar nos ficheiros." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "O arquivo no existe." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Os resultados de comparao da directoria actual sero eliminados." -#: Merge.rc:2418 +#: Merge.rc:2452 #, 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:2419 +#: Merge.rc:2453 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "\nNota: integrao 7-Zip desactivada nas definies do WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "\nNota: integrao 7-Zip est restricta a operao autnoma nas definies do WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Seleccione ficheiro a exportar" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Seleccione ficheiro a importar" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Opes importadas do ficheiro." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Opes exportadas para o ficheiro." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Importao de opes do ficheiro falhou." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Escrita de opes para o ficheiro falhou." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Erro de expresso regular" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Sem coincidncias" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Expresso regular invlida" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Caracter de intercalao invlido" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Nome de classe de caracter invlido" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Referncia anterior invlida" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Sem coincidncias [ ou [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Sem coincidncias ( ou \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Sem coincidncias \\(" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contedo invlido de \\(\\)" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Fim de zona invlido" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Sem memria" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Expresso regular anterior invlida" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Fim prematuro da expresso regular" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Expresso regular demasiado extensa" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Sem coincidncias ) ou \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Europeu Ocidental" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Europeu Oriental" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "sia Oriental" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "sia SE & SO" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Mdio Oriente" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "No aplicvel" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirlico" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS EUA Latino" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS rabe" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grego" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Eixo Bltico" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latino 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grego 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latino 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirlico" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugus" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islands" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreu" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canad Francs" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nrdico" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirlico CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grego 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Tailands" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japons" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chins (Simplificado)" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Coreano" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chins (Tradicional)" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latino 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirlico (Eslavo)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latino 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grego" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latino 5 (Turco)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreu" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows rabe" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Eixo Bltico" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamita" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romnico" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grego" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirlico" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa Central" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproximadamente ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproximadamente ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproximadamente ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproximadamente ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproximadamente ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Misturado" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Guardar ficheiro esquerdo" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Guardar ficheiro direito" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Guardar ficheiro com o nome..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Guardar ficheiro direito com o nome..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Alterar estado \"apenas de leitura\" de ficheiro/dir esquerdo" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Alterar estado \"apenas de leitura\" de ficheiro/dir direito" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Alternar entre modos de edio e combinao" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "Ver e ajustar propriedades de codificao\nPropriedades de codificao do ficheiro" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "Seleccionar rea de diferenas na linha actual\nDiferena na linha actual" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "Ir para linha ou diferena\nIr para (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "Set program options\nOptions" msgstr "Definir opes do programa\nOpes" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "Actualizar visualizao\nActualizar (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar linhas seleccionadas para a rea de Transferncia adicionando ns de linha ao incio de linha" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Actualizar itens seleccionados" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Alternar marcaes" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Ir para a prxima marcao" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Ir para a marcao anterior" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Eliminar todos os marcadores" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "Mostrar itens exactamente iguais\nMostrar itens idnticos" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "Mostra itens com diferenas\nMostra itens diferentes" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "Mostra itens exstentes apenas no lado esquerdo\nMostra itens nicos da esquerda" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "Mostra itens exstentes apenas no lado direito\nMostra itens nicos da direita" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "Mostra ficheiros binrios\nMostra ficheiros binrios" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "Mostra itens omitidos\nMostra itens omitidos" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "Selecciona a fonte de visualizao\nSelecciona fonte de visualizao" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "Repor fonte do sistema predefinida de visualizao\nFonte predefinida" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Mostra espaos em branco" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Mostrar/Ocultar janela de diferenas" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Janela de localizao mostra viso geral dosficheiros" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Mostra estatsticas da comparao de arquivos" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Troca a posio das duas janelas" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "Mostra os nmeros de linha\nMostra nmeros de linha" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "Ajustar comprimento de linhas largura da janela\nAjustar linhas" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "Copiar o texto seleccionado para oficheiro esquerdo\nCopiar direita (Alt+Direita)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "Copiar o texto seleccionado para o ficheiro esquerdo\nCopiar esquerda (Alt+Esquerda)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "Copiar diferena para a direita e avanar para a prxima\nCopiar direita e avanar (Ctrl+Alt+Direita)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "Copiar diferena para a esquerda e avanar para a prxima\nCopiar esquerda e avanar (Ctrl+Alt+Esquerda)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "Copiar todas as diferenas para o ficheiro da direita\nTodas direita" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "Copiar todas as diferenas para o ficheiro da esquerda\nTodas esquerda" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Eliminar itens seleccionados de ambas as directorias" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Comparar o item seleccionado (comparar primeiro item, se vrios itens seleccionados)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar e reordenar colunas de comparao da directoria" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Gerar ficheiro patch" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Seleccionar e modificar filtros" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Gera um relatrio dos resultados de comparao" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "O utilizador selecciona o extractor (sem extraco quando comparando dir)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "O extractor adoptado aplica-se a ambos ficheiros (apenas um ficheiro necessita de extenso)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccione um extractor para editar este ficheiro" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "No pr-diferenciar (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Outros plugins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarregar todos os plugins e recarreg-los (para developers)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Fecha todas as janelas abertas" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Exporta a verso actual de WinMerge e a configurao para um ficheiro de texto" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Compilao privada: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Definies de plugin" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "No pr-diferenciar" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Pr-diferenciar, se possvel" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no encontrado - scripts .sct desactivados" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Abrir ficheiro com a aplicao registada" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Abrir ficheiro com editor externo" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Abrir ficheiro com programa especfico" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "No mostrar blocos movidos" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostrar blocos movidos apenas da diferena actual" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ir para a diferena sob o cursor" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ir para diferena %1 de %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Ir para linha %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Desactivado" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Do sistema de ficheiros" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Da lista MRU" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Romanian.po b/Src/Languages/Romanian.po index bbcd2f28070..a1ee5b47a1f 100644 --- a/Src/Languages/Romanian.po +++ b/Src/Languages/Romanian.po @@ -72,7 +72,7 @@ msgstr "&Taie" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Copie" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "Li&pete" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Mergi la..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "D&eschide" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "cu aplicaia n®istrat" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "cu editor &extern" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&cu..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Fiier" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nou\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "D&eschide...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "D&eschide fiierul cu conflicte..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Deschide pro&iectul...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Sal&veaz proiectul..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "Proiecte recente" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "Ieir&e" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Editare" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Opiuni..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Vizualizare" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Selecteaz &font..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Utilizeaz font im&plicit" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "Bar de unel&te" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Deloc" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Mic" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "Ma&re" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Bar de &stare" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, fuzzy, c-format msgid "Ta&b Bar" msgstr "&Bara de tab-uri" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Limb..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "Unel&te" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Genereaz petic..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plug-in-uri" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Dezarhivare &manual" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Dezarhivare &automat" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Editeaz cu dezarhivator" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Rencarc plug-in-urile" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Debug" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "ncarc confi&gurarea..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Reseteaz opiunile" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Ferea&stra" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "nchi&de" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "nchid&e toate" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Schimb &panou\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Altur &orizontal" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Altur &vertical" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Cascad" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "A&jutor" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "Ajutor &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "Informaii v&ersiune" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Traduceri" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "C&onfigurare" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Suportul de a&rhivare dezactivat..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "Licena Public General &GNU" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Despre WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Stnga numai-citir&e" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Dreapta numa&i-citire" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Codare caractere fiier" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Selecte&az tot\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Arat elementele &identice" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Arat elementele &diferite" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Arat elementele unic&e din stnga" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Arat elementele unice d&in dreapta" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Arat elementele omise" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Arat fiierele binare" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Arat elementele ascunse" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Statistici de compa&rare" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Rempro&sptare\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Remprosptare selectate\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Fuziune" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparare\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Urmtoarea difere&n\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Anterioa&ra diferen\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prima diferen\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Curenta diferen\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "U<ima diferen\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copie la d&reapta\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copi&e la stnga\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&terge\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "Personalizare &coloane..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Generare &raport..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Salvare\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Sa&lvare stnga" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Salvare" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Salvare c&a..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Salvare d&reapta" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "Ti&prire..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Aranjare n pa&gin" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Pre&vizualizare tiprire" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "Convertete sfriturile de linie la" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Modul fuziune\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "Codar&e caractere fiiere..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "An&uleaz\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Ref\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Taie\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copie\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "Li&pete\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Selecteaz &diferenele pe linie\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Gsete...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "nlo&cuiete...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Script-uri" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Gol >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avansat" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copie cu numrul de linie\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "Semn de &carte" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Basculeaz semn de carte\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "Urmtorul sem&n de carte\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Anteriorul se&mn de carte\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "terge toate semnele de &carte" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Mer&gi la...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "Mrime te&xt" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Mrete\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Mic&oreaz\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Evideniere sintax" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "B&locheaz panourile" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Afieaz blanc&urile" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Afiea&z diferenele pe linie" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Afieaz numrul liniei" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Afieaz &marginile" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Infoa&r rndurile lungi" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Interschimb p&anourile" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "&Panoul cu diferene" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Panoul cu lo&caia" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "C&opiaz la dreapta i avanseaz\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiaz la s&tnga i avanseaz\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Copiaz tot la dre&apta" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Copia&z tot la stnga" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Predifereniator" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Comp&ar" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "C&ompar special" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "Stnga &la dreapta" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "St&nga la..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "D&reapta la stnga" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "D&reapta la..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Mut" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "St&nga la..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "D&reapta la..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&terge" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "St&nga" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "D&reapta" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "Am&bele" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Rede&numete" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "Ascunde e&lementele" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Deschide st&nga" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Deschide drea&pta" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Cop&ie cile de fiier" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "S&tnga (%1 din %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "D&reapta (%1 din %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "Am&bele (%1 din %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Copie numele de &fiier" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "Arhivea&z" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "Stn&ga... (%1 din %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "D&reapta... (%1 din %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "Am&bele... (%1 din %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Diferene... (%1 din %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Remprospteaz" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Copie calea ntreag" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Copie numele de &fiier" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Setri predifereniator" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "Fr predifere&niator" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Auto predifereniator" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Mergi la difere&n" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "Fr blocuri &mutate" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "To&ate blocurile mutate" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Blocuri mutate pentru diferena &curent" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Despre WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Build privat)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Toate drepturile rezervate" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Viziteaz pagina de baz WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Contribuitori" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Selecteaz fiiere sau directoare" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "Stn&ga:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "Rsf&oiete..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "D&reapta:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "Rsf&oiete..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtru:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Selecteaz..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Dezarhiva&tor:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Selecteaz..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Include subdirectoare" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Stare:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Renun" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ajutor" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Fiiere sau directoare pentru comparare" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Baza de date:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Proiect:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Utilizator:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Parol:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Legtura ctre proiectul VSS destinaie" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Aplic la toate elementele" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Extrage" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Salveaz ca..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Sistem de versionare" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "Sistem de &versionare:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "Ca&lea ctre cleartool.exe" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "General" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "De&sfoar automat la prima diferen" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Dezactiveaz fereastra de ntmpinare" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "nchide ferestrele cu tasta ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verific automat cile n dialogul de deschidere" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Permite rularea unei singure instane" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "ntreab nainte de a nchide fereste multiple" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Pstreaz data i timpul fiierului pentru compararea fiierelor" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Auto-completare n dialogul de deschidere:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Activeaz ferestre de comparare multiple pentru" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Comparare &directoare" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Comparare fii&ere" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ascunderea unor casete de mesaj. Apas butonul Revenire pentru a face ca toate casetele de mesaj s apar din nou." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Revenire" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Limb" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Traduceri disponibile:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Gsete" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "Ce a&nume:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Potrivete doar cu&vinte ntregi" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Majuscule semnificative" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Expresie regulat" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Nu relua de la nceputul fiierului" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direcie" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "S&us" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Jos" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Gsete" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "nlocuiete" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "C&u ce:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "Nu relua de la nceputul &fiierului" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "nlocuiete n" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Selecie" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "ntre&gul fiier" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "nlocuie&te" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "nlocuiete t&ot" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Extrage" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Comentarii" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Repune dup extragere" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtre de linie" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Activeaz filtrele de linie" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresii regulate (cte una pe linie):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Salveaz" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nou" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Editeaz" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "nltur" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Culori" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Diferen:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Diferen selectat:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Fundal" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "ters" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Diferen ignorat:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Mutat:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Selecie mutat:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Diferen cuvnt:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Diferen cuvnt selectat:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Implicite" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Trimite fiierele terse ctre Recycle Bin" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integrare" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Adaug la meniul contextual Explorer" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Activeaz me&niul contextual avansat" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "In&clude implicit i subdirectoare" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "Editor &extern:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "Directorul cu &filtre:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "&Rsfoiete..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Directorul cu fiiere temporare" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Direc&torul cu fiiere temporare al sistemului" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Director personali&zat:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "R&sfoiete..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Generator petice" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "&Fiier 1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "F&iier 2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Interschim&b" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Adaug la fiier existent" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Rezultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "S&til:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Context:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Blancur&i" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Com&par" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnor schimbri" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&nor tot" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor linii goal&e" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Senzi&tiv la tipul caracterelor" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inclu&de linia de comand" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Deschide n editor e&xtern" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Afieaz coloanele" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Mut mai s&us" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Mut mai &jos" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Selecteaz dezarhivator" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Dezarhivator fiiere:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Afieaz toate dezarhivatoarele, far a verifica extensia" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "List extensii:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descriere:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Progres comparare directoare" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stop" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparare elemente..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Elemente comparate:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Elemente total:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Mergi la" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&La:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fiier" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Anume" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Li&nie" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Diferen" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Mergi la" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Comparare" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Blanc" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Compar" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignor schimbare" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnor tot" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignor li&nii goale" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignor minus&cule/majuscule" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&r diferenele sfritului de linie (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Activea&z detecie blocuri mutate" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Potrivete linii si&milare" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&or diferene de timp mai mici de 3 secunde" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Metod comparare &fiier:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "Opre&te dup prima diferen" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Comentarii filtre" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "E&videniere sintax" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Rescanare &automat" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Pstreaz caracterele de SDL originale" -#: Merge.rc:1189 +#: Merge.rc:1197 #, fuzzy, c-format msgid "Tabs" msgstr "Tab-uri" -#: Merge.rc:1190 +#: Merge.rc:1198 #, fuzzy, c-format msgid "&Tab size:" msgstr "Mrime &tab:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, fuzzy, c-format msgid "&Insert Tabs" msgstr "&Insereaz tab-uri" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "In&sereaz blancuri" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Colorarea diferenelor pe linie" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Arat diferenele pe linie" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "La nivel de &caracter" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "La nivel de cu&vnt:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtre fiiere" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testeaz" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instaleaz..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Nou..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Editeaz..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "terge..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Salvare fiiere modificate?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Fiier stnga" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Salveaz modificrile" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "Renun la mo&dificri" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Fiier dreapta" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S&alveaz modificrile" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Renun la s&chimbri" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Denun la tot" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Codare caractere" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Codare caractere implicit" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Selecteaz codarea caracterelor folosit implicit la ncrcarea fiierelor non-Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,32 +2029,32 @@ msgstr "" "Detecteaz automat codarea caracterelor pentru aceste tipuri de fiiere: .html, .rc, .xml\n" "(este necesar repornirea sesiunii)." -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Codarea sistemului" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Conform cu interfaa WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Codare caractere personalizat:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Suportul de dezarhivare este dezactivat" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Imposibil de detectat versiune de 7-Zip (este instalat?)." -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2053,12 +2064,12 @@ msgstr "" "sau ca componentele eseniale s fie copiate in directorul programului pentru\n" "funcionare autonom." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Trebuie s existe deasemenea i un plug-in interfa adecvat (Merge7z*.dll) n aceeai locaie." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2067,12 +2078,12 @@ msgstr "" "V rugm s utilizai versiunea de 7-Zip recomandat mai jos pn cnd\n" "plug-in-uri interfee mai noi vor fi disponibile." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Versiune" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2081,54 +2092,54 @@ msgstr "" "Plug-in necesar\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versiunea recomandat de 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "prezent" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalat pe calculatorul tu:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "nici unul" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "lipsete" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componente 7-Zip pt. funcionare autonom:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "depite" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plug-in-uri n locaie:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2137,488 +2148,499 @@ msgstr "" "Nu afia acest &mesaj din nou.\n" "(Mesajul poate fi oricnd reactivat din meniul Ajutor.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, fuzzy, c-format msgid "Plugin Download" msgstr "Download plug-in" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opiuni" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "Categorii" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Import..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Export..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Cuvinte cheie:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, fuzzy, c-format msgid "Function names:" msgstr "Nume de funcii:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Comentarii:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Numere:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatori:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "iruri de caractere:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Utilizator 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Utilizator 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Aldine" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Raport comparare directoare" -#: Merge.rc:1412 +#: Merge.rc:1420 #, fuzzy, c-format msgid "Report &File:" msgstr "&Fiier raport:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Rsfoiete:" -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, fuzzy, c-format msgid "&Copy to Clipboard" msgstr "&Copie n memorie" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtru public sau privat" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Ce tip de filtru dorii s creai?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtru public (pentru toi utilizatorii de pe maina curent)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtru privat (doar pentru utilizatorul curent)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Suport arhivare" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Suportul arhivare necesit ca plug-in-ul 7-Zip s fie instalat:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, fuzzy, c-format msgid "Download 7-zip Plugin" msgstr "Copie plug-in-ul 7-Zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Activ&eaz suportul pentru fiierele arhiv" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "Folosete 7-Zip autonom dac este disponibil" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Folo&sete 7-Zip local din directorul WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detecteaz tipul arhivei dup semntura fiierului" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Statistici ale comparrii" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Directoare:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Fiiere:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diferite" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binare:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unice" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Stnga:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Dreapta:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identice" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "n total:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "nchide" -#: Merge.rc:1509 +#: Merge.rc:1517 #, fuzzy, c-format msgid "Affects" msgstr "Afecteaz" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, fuzzy, c-format msgid "(Affects)" msgstr "(Afecteaz)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Selecteaz codare caractere pentru" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "ncrcare &fiier:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Salvare fiier:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "Aceeai codare caractere pentr&u ambele" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Aplic" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Renun" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testeaz filtru" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testare filtru..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "Introduc&ei textul pentru testare:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "Nu&me director" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Testeaz" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "n&chide" -#: Merge.rc:1554 +#: Merge.rc:1562 #, fuzzy, c-format msgid "&Use customized text colors" msgstr "Folosete c&ulori ale textului personalizate" -#: Merge.rc:1557 +#: Merge.rc:1565 #, fuzzy, c-format msgid "Custom text colors" msgstr "Culori ale textului personalizate" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Blancuri:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Text normal:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Selecie:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Ci" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Numai-citir&e" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Num&ai-citire" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Deschide..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Salveaz..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Copii de siguran" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Creaz copii de siguran pentru:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Creaz copii de siguran n:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Directorul &original al fiierului" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "Directorul de siguran &global:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Numele fiierului de siguran:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Adaug extensia .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "Adaug timp" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Confirm copierea" -#: Merge.rc:1635 +#: Merge.rc:1643 #, fuzzy, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Suntei sigur c vrei s copiai XXX elemente?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "De la stnga" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "De la dreapta" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Nu" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, fuzzy, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, fuzzy, c-format msgid "0x409, 1252" msgstr "0x409, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, fuzzy, c-format msgid "Ready" msgstr "Gata" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2627,7 +2649,7 @@ msgstr "" "Creaz documente goale\n" "Documente noi (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2636,7 +2658,7 @@ msgstr "" "Deschide un document existent\n" "Deschide (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2645,7 +2667,7 @@ msgstr "" "nchide documentul activ\n" "nchide" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2654,7 +2676,7 @@ msgstr "" "Salveaz documentul activ\n" "Salveaz (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2663,7 +2685,7 @@ msgstr "" "Salveaz documentul activ cu un nou nume\n" "Salveaz ca" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2672,7 +2694,7 @@ msgstr "" "Schimb setrile de tiprire ale paginii\n" "Setri pagin" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2681,7 +2703,7 @@ msgstr "" "Schimb imprimanta i opiunile de tiprire\n" "Setri tiprire" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2690,7 +2712,7 @@ msgstr "" "Tiprete documentul curent\n" "Tiprete" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2699,12 +2721,12 @@ msgstr "" "Afieaz pagini ntregi \n" "Previzualizare tiprire" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Marcheaz din nou ca vizibile toate elementele ascunse" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2713,32 +2735,32 @@ msgstr "" "Deschide un fiier proiect\n" "Fiier proiect (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Eroare necunoscut la ncercarea de deschidere a fiierului proiect" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Eroare necunoscut la ncercarea de salvare a fiierului proiect" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Fiier proiect" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Fiierul proiect a fost ncrcat cu succes" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Fiierul proiect a fost salvat cu succes" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2747,7 +2769,7 @@ msgstr "" "Salveaz cile curente si opiunile n fiierul proiect\n" "Salveaz fiierul proiect" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2756,7 +2778,7 @@ msgstr "" "Afieaz informaii despre program, numrul versiunii i drepturile de copiere\n" "Despre" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2765,27 +2787,27 @@ msgstr "" "nchide aplicaia; solicit salvarea documentelor\n" "Ieire" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Deschide acest document" -#: Merge.rc:1774 +#: Merge.rc:1796 #, fuzzy, c-format msgid "" "Switch to the next window pane\n" @@ -2794,7 +2816,7 @@ msgstr "" "Comut la urmtorul panou\n" "Urmtorul panou" -#: Merge.rc:1775 +#: Merge.rc:1797 #, fuzzy, c-format msgid "" "Switch back to the previous window pane\n" @@ -2803,7 +2825,7 @@ msgstr "" "Comut napoi la precedentul panou\n" "Precedentul panou" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2812,7 +2834,7 @@ msgstr "" "Aranjeaz ferestrele astfel nct s se suprapun\n" "Cascadeaz ferestrele" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2821,7 +2843,7 @@ msgstr "" "Aranjeaz ferestrele adiacent orizontal fr s se suprapun\n" "Adiacent orizontal" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2830,7 +2852,7 @@ msgstr "" "Aranjeaz ferestrele adiacent vertical fr s se suprapun\n" "Adiacent vertical" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2839,7 +2861,7 @@ msgstr "" "Copie selecia n memorie\n" "Copie" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2848,7 +2870,7 @@ msgstr "" "Taie selecia i mut n memorie\n" "Taie" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2857,7 +2879,7 @@ msgstr "" "Gsete textul specificat\n" "Gsete" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2866,7 +2888,7 @@ msgstr "" "Insereaz coninutul memoriei\n" "Lipete" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2875,7 +2897,7 @@ msgstr "" "Repet ultima aciune\n" "Repet" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2884,7 +2906,7 @@ msgstr "" "nlocuiete textul specificat cu un alt text\n" "nlocuiete" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2893,7 +2915,7 @@ msgstr "" "Selecteaz ntregul document\n" "Selecteaz tot" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2902,7 +2924,7 @@ msgstr "" "Anuleaz ultima aciune\n" "Anuleaz (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2911,7 +2933,7 @@ msgstr "" "Ref precedenta aciune anulat\n" "Ref (Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2920,7 +2942,7 @@ msgstr "" "Arat sau ascunde bara de unelte\n" "Basculeaz bara de unelte" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2929,7 +2951,7 @@ msgstr "" "Arat sau ascunde bara de stare\n" "Basculeaz bara de stare" -#: Merge.rc:1805 +#: Merge.rc:1827 #, fuzzy, c-format msgid "" "Show or hide the tab bar\n" @@ -2938,7 +2960,7 @@ msgstr "" "Arat sau ascunde bara cu file\n" "Basculeaz bara cu file" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2947,57 +2969,57 @@ msgstr "" "Redimensioneaz automat panourile\n" "nghea panouri" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Schimb mrimea ferestrei" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Schimb poziia ferestrei" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Redu fereastra la o icoan" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Lrgete fereastra la mrimea ntreag" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Comut la urmtoarea fereastr document" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Comut la precedenta fereastr document" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "nchide fereastra activ i solicit salvarea documentelor" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Restaureaz fereastra la mrimea normal" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Activeaz lista de sarcini" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Activeaz aceast fereastr" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3006,7 +3028,7 @@ msgstr "" "nchide modul previzualizare\n" "nchide previzualizare" -#: Merge.rc:1838 +#: Merge.rc:1860 #, fuzzy, c-format msgid "" "\n" @@ -3025,7 +3047,7 @@ msgstr "" "WinMerge.FileCompare\n" "WinMerge Comparare fiiere" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3044,23 +3066,23 @@ msgstr "" "WinMerge.FolderCompare\n" "WinMerge Comparare directoare" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Pstreaz caracterele de SDL originale" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Apas orice tast" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Clic-dreapta pe cale pentru a o copia" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3069,152 +3091,152 @@ msgstr "" "Dezvoltatori:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge vine fr ABSOLUT NICIO GARANIE. Acesta este software liber i suntei invitai s-l redistribuii sub anumite circumstane; vedei Licena Public General GNU n meniul Ajutor pentru detalii." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "Re&nun" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Rencearc" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignor" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignor to&ate" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "D&a la toate" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nu" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nu la to&ate" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Continu" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "O&mite" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Omite to&ate" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Nu afia acest &mesaj din nou." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Nu &ntreba aceasta din nou." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Culori sintax" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Culori text" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Control versiuni" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Ctre:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "De la stnga:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Ctre stnga:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "De la dreapta:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Ctre dreapta:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Versiune %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Opiuni (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Toate casetele de mesaj vor fi de acum afiate din nou." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Modificri au fost efectuate la sesiunea curent de comparare de fiiere. Anumite setri nu vor fi luate n considerare dect dup ce compararea de fiiere curent este repornit." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Schimbarea de font selectat nu va fi aplicat nici unei ferestre de comparare vizibile." -#: Merge.rc:1938 +#: Merge.rc:1960 #, fuzzy, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3225,7 +3247,7 @@ msgstr "" "\n" "V rugm folosii valorile 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3236,127 +3258,129 @@ msgstr "" "\n" "V rugm s repornii WinMerge dup resetare." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Deschide" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programe|*.exe;*.bat;*.cmd|Toate fiierele (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Toate fiierele (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Fiiere proiect WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Fiiere opiuni (*.ini)|*.ini|Toate fiierele (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Fiiere text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Toate fiierele (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Fiiere HTML (*.htm,*.html)|*.htm;*.html|Toate fiierele (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Fiiere XML (*.xml)|*.xml|Toate fiierele (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Coninut ntreg" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Coninut rapid" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Dat modificare" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Dat modificare i mrime" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Mrime" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nume" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Locaie" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Descriere" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Selecteaz numele fiierului pentru noul filtru" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Fiiere filtru (*.flt)|*.flt|Toate fiierele (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3369,7 +3393,7 @@ msgstr "" "V rugm copiai fiierul %1 n directorul WinMerge/Filters :\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3382,7 +3406,7 @@ msgstr "" "\n" "V rugm verificai c fiierul exist i este editabil." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3393,7 +3417,7 @@ msgstr "" "\n" "V rugm selectai directorul filtru n Opiuni.../Sistem." -#: Merge.rc:1998 +#: Merge.rc:2020 #, fuzzy, c-format msgid "" "Failed to delete the filter file:\n" @@ -3406,12 +3430,12 @@ msgstr "" "\n" "Este posibil ca fiierul s nu poat fi editat (numai-citire)?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Selectai fiierul filtru pentru instalare" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3422,208 +3446,223 @@ msgstr "" "\n" "Nu s-a putut copia noul fiier filtru n directorul filtru." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Fiierul filtru deja exist. Suprascrie?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Expresie regulat" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Calea ctre cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Calea ctre SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Rezultate comparare directoare" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Comparare fiiere" -#: Merge.rc:2024 +#: Merge.rc:2052 #, fuzzy, c-format msgid "Untitled left" msgstr "Nedenumit stnga" -#: Merge.rc:2025 +#: Merge.rc:2053 #, fuzzy, c-format msgid "Untitled right" msgstr "Nedenumit dreapta" -#: Merge.rc:2026 +#: Merge.rc:2054 #, fuzzy, c-format msgid "Theirs File" msgstr "Fiierul lor" -#: Merge.rc:2027 +#: Merge.rc:2055 #, fuzzy, c-format msgid "Mine File" msgstr "Fiierul meu" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Scanare fiiere..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Deschidere selecie" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Copiere stnga ctre dreapta" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Copiere dreapta ctre stnga" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Copiere toate la stnga" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Copiere toate la dreapta" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Copiere fiiere..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "tergere fiiere..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Mutare fiiere..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Creare raport..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, fuzzy, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Lin: %s Col: %d/%d Car: %d/%d SDL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Linie: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, fuzzy, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Lin: %s Col: %d/%d Car: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Fuziune" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Deferena %1 din %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 diferene gsite" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "O diferen gsit" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, fuzzy, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Element %1 din %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Elemente: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Selectai dou directoare sau fiiere existente pentru comparare" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Selectare directoare" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Selectai dou directoare sau dou fiiere pentru comparare." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Calea din stnga este nevalid!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Calea din dreapta este nevalid!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Ambele ci sunt nevalide!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, fuzzy, c-format msgid "Choose two files to enable unpacker selection." msgstr "Alegei dou fiiere pentru a activa selecia cu dezarhivatorul." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Nu se poate compara un fiier cu un director!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Fiier negsit: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Fiier nedezarhivat: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3636,12 +3675,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Analizarea fiierului de conflicte a euat." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3652,32 +3691,32 @@ msgstr "" "%1\n" "nu e un fiier de conflicte." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Salveaz ca" -#: Merge.rc:2092 +#: Merge.rc:2122 #, fuzzy, c-format msgid "Save changes to %1?" msgstr "Salveaz schimbrile n %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, fuzzy, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 este marcat ca numai-citire. Dorii suprascrierea fiierului numai-citire? (Apsai nu ca s forai redenumirea.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, fuzzy, c-format msgid "Error checking destination writeability" msgstr "Eroare la verificarea posibilitii de a scrie n locaia destinaie" -#: Merge.rc:2095 +#: Merge.rc:2125 #, fuzzy, c-format msgid "Error backing up file" msgstr "Eroare la salvarea copiei de siguran a fiierului" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3690,7 +3729,7 @@ msgstr "" "\n" "Continuai oricum?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3707,7 +3746,7 @@ msgstr "" "\t- folosii un alt nume de fiier (apsai Ok)\n" "\t- renunai la operaia curent (apsai Renun)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3722,7 +3761,7 @@ msgstr "" "\n" "Dorii s salvai versiunea nearhivat n alt fiier?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3737,7 +3776,7 @@ msgstr "" "\n" "Dorii s salvai versiunea nearhivat n alt fiier?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3752,7 +3791,7 @@ msgstr "" "\n" "Suprascriei fiierul modificat?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, fuzzy, c-format msgid "" "%1\n" @@ -3761,7 +3800,7 @@ msgstr "" "%1\n" "este marcat ca numai-citire. Dorii s suprascriei elementul numai-citire?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3776,17 +3815,17 @@ msgstr "" "\n" "Dac dorii s remprosptai fiierele, nchidei compararea curent i ncrcai din nou fiierele." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Salveaz fiierul din stnga ca" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Salveaz fiierul din dreapta ca" -#: Merge.rc:2111 +#: Merge.rc:2141 #, fuzzy, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3797,42 +3836,42 @@ msgstr "" "\n" "Remprosptai documentele nainte de a continua." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Trebuie s specificai calea unui proiect SourceSafe pentru a continua (ex.: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Extrage fiierele din VSS.." -#: Merge.rc:2119 +#: Merge.rc:2149 #, fuzzy, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Sistemul de versionare a returnat o eroare ncercnd s extrag fiierul. Imposibil de continuat..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Eroare la execuia comenzii sistemului de versionare." -#: Merge.rc:2121 +#: Merge.rc:2151 #, fuzzy, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "Directorul de lucru VSS i locaia fiierului curent nu se potrivesc. Continuai?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Nu s-a gsit nicio baz de date VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Eroare de la VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3843,7 +3882,7 @@ msgstr "" " V rugm, verificai specificaiile scopului folosit.\n" " Anuleaz operaia de extragere?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, fuzzy, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3852,170 +3891,169 @@ msgstr "" "Sistemul de versionare a returnat o eroare ncercnd s anuleze extragerea fiierului.\n" " V rugm, verificai specificaiile scopului folosit." -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Nici unul" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (mai vechi de 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 sau mai nou)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, fuzzy, c-format msgid "Break at whitespace" msgstr "ntrerupe la blanc" -#: Merge.rc:2136 +#: Merge.rc:2166 #, fuzzy, c-format msgid "Break at whitespace or punctuation" msgstr "ntrerupe la blanc sau semn de punctuaie" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copie elementul selectat n directorul specificat" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copie elementul selectat n directorul preferin" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "terge elementul selectat din stnga" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "terge elementul selectat din dreapta" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "terge elementul(ele) selectat(e) din ambele pri" -#: Merge.rc:2149 +#: Merge.rc:2179 #, fuzzy, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ascunde elementul(ele) selectat(e) (filtru din-zbor)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Redenumete elementele selectate n ambele pri" -#: Merge.rc:2151 +#: Merge.rc:2181 #, fuzzy, c-format msgid "Right to Left (%1)" msgstr "De la dreapta la stnga (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, fuzzy, c-format msgid "Left to Right (%1)" msgstr "De la stnga la dreapta (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "De la dreapta la stnga (%1 din %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "De la stnga la dreapta (%1 din %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Stnga la... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Dreapta la... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Stnga la... (%1 din %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Dreapta la... (%1 din %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Stnga (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Dreapta (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Ambele (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Stnga (%1 din %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Dreapta (%1 din %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Ambele (%1 din %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Selectare director destinaie" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Partea stng - selectare director destinaie:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Partea dreapt - selectare director destinaie:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 fiiere afectate)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 din %2 fiiere afectate)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4026,17 +4064,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Suntei sigur c vrei s copiai:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Suntei sigur c vrei s copiai %d elemente:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, fuzzy, c-format msgid "" "Operation aborted!\n" @@ -4055,458 +4093,473 @@ msgstr "" "\n" "V rugm remprosptai compararea." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Deschide fiier stnga" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Deschide fiierul stnga n editor extern" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Deschide fiier stnga cu..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Deschide fiier dreapta" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Deschide fiierul dreapta cu editor extern" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Deschide fiier dreapta cu..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Execuia editorului extern a euat: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, fuzzy, c-format msgid "Unknown extension on external editor: %1" msgstr "Extensie necunoscut n editorul extern: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copie numele fiierelor n memorie" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copie cile din partea stng n memorie" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copie cile din partea dreapt n memorie" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copie cile din ambele pri n memorie" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Format arhiv necunoscut" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Adaug elementele din partea stng la arhiv" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Adaug elementele din partea dreapt la arhiv" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Adaug elementele din ambele pri la arhiv" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Adaug elementele diferite la arhiv (ambele pri)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Mut fiierul selectat din stnga ctre director specificat" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Mut fiierul selectat din dreapta ctre director specificat" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nume fiier" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Director" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Rezultat comparare" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Dat stnga" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Dat dreapta" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extensie" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Mrime stnga" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Mrime dreapta" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Mrime dreapta (scurt)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Mrime stnga (scurt)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, fuzzy, c-format msgid "Left Creation Time" msgstr "Timp creare stnga" -#: Merge.rc:2240 +#: Merge.rc:2274 #, fuzzy, c-format msgid "Right Creation Time" msgstr "Timp creare dreapta" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Fiier mai nou" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Versiune fiier stnga" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Versiune fiier dreapta" -#: Merge.rc:2244 +#: Merge.rc:2278 #, fuzzy, c-format msgid "Short Result" msgstr "Rezultat scurt" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atribute stnga" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atribute dreapta" -#: Merge.rc:2247 +#: Merge.rc:2281 #, fuzzy, c-format msgid "Left EOL" msgstr "SDL stnga" -#: Merge.rc:2248 +#: Merge.rc:2282 #, fuzzy, c-format msgid "Right EOL" msgstr "SDL dreapta" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Set de caractere stnga" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Set de caractere dreapta" -#: Merge.rc:2256 +#: Merge.rc:2290 #, fuzzy, c-format msgid "Ignored Diff." msgstr "Diferene ignorate" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Diferene" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binar" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Imposibil de comparat fiierele" -#: Merge.rc:2265 +#: Merge.rc:2299 #, fuzzy, c-format msgid "Item aborted" msgstr "Element ntrerupt" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Fiier omis" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Director omis" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Numai stnga: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Numai dreapta: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Fiierele binare sunt identice" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Fiierele binare sunt diferite" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Fiierele sunt diferite" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Numai stnga" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Numai dreapta" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Eroare" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Timp scurs: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "Un element selectat" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elemente selectate" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nume de fiier sau director." -#: Merge.rc:2292 +#: Merge.rc:2326 #, fuzzy, c-format msgid "Subfolder name when subfolders are included." msgstr "Nume de sub-director pentru cnd sub-directoarele sunt incluse." -#: Merge.rc:2293 +#: Merge.rc:2327 #, fuzzy, c-format msgid "Comparison result, long form." msgstr "Rezultate comparare, forma lung." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Data modificrii prii stngi." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Data modificrii prii drepte." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Extensia fiierului." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Dimensiune fiier stnga n octei." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Dimensiune fiier dreapta n octei." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Dimensiune fiier stnga prescurtat." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Dimensiune fiier dreapta prescurtat." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Timp creare stnga." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Timp creare dreapta." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Spune care parte are o dat a modificrii mai recent." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versiune fiier stnga, numai pentru unele tipuri de fiiere." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versiune fiier dreapta, numai pentru unele tipuri de fiiere." -#: Merge.rc:2311 +#: Merge.rc:2345 #, fuzzy, c-format msgid "Short comparison result." msgstr "Rezultat comparare pe scurt." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atribute partea stng." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atribute partea dreapt." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Tip SDL fiier partea stng." -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Tip SDL fiier partea dreapt." -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Set de caractere partea stng." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Set de caractere partea dreapt." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Numr de diferene ignorate n fiier. Aceste diferene sunt ignorate de WinMerge i nu pot fi fuzionate." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Numr de diferene n fiier. Acest numr nu include diferenele ignorate." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Arat un asterisc (*) dac fiierul este binar." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Compar %1 cu %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, fuzzy, c-format msgid "Comma-separated list" msgstr "List separat-de-virgule" -#: Merge.rc:2333 +#: Merge.rc:2367 #, fuzzy, c-format msgid "Tab-separated list" msgstr "List separat-de-tab-uri" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML simplu" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "XML simplu" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Fiierul raport exist deja. Dorii s suprascriei fiierul existent?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4515,32 +4568,32 @@ msgstr "" "Eroare la creare raport:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Raportul a fost creat cu succes." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Acelai fiier este deschis n ambele panouri." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Fiierele selectate sunt identice." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "A fost ntlnit o eroare n timpul comparrii fiierelor." -#: Merge.rc:2348 +#: Merge.rc:2382 #, fuzzy, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Fiierele temporare nu au putut fi create. Verificai setarea cii ctre locaia temporar." -#: Merge.rc:2349 +#: Merge.rc:2383 #, fuzzy, c-format msgid "" "These files use different carriage return types.\n" @@ -4555,7 +4608,7 @@ msgstr "" "\n" "Not: Dac ntotdeauna dorii tratarea ca i echivalent a tuturor caracterelor de sfrit de linie (SDL), setai opiunea 'Ignor diferenele de sfrit de linie..' n fila Comparare a dialogului de opiuni (disponibil sub meniul Editare/Opiuni)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4566,22 +4619,22 @@ msgstr "" " Conform setrilor curente, aceastea vor fi unificate la tipul principal.\n" " Dorii s schimbai preferinele i ca s pstrai SDL diferite?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "O eroare a fost ntlnit n timpul prediferenierii fiierului '%1' utiliznd plug-in-ul '%2'. Prediferenierea nu va fi utilizat n continuare." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Directorul selectat este invalid." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nu se poate deschide n editor un fiier binar." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4596,7 +4649,7 @@ msgstr "" "%1\n" "n partea cealalt i s deschidei ambele directoare?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4607,132 +4660,132 @@ msgstr "" "Afiarea n setul de caractere propriu este mai potrivit dar fuziunea/copierea este periculoas.\n" "Dorii tratarea ambelor fiiere ca i cum ar fi n setul de caractere implicit din Windows (recomandat)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Atenie: Fiierele folosesc seturi de caractere diferite, stnga=%s i dreapta=%s, iar fuziunea poate duce la pierdere de informaie." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Pierdere de informaie datorit incompatibilitii seturilor de caractere: ambele fiiere" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Pierdere de informaie datorit incompatibilitii seturilor de caractere: fiier dreapta" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Pierdere de informaie datorit incompatibilitii seturilor de caractere: fiier stnga" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Nicio diferen" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Diferen pe linie" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "S-a(u) nlocuit %1 ir(uri)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nu s-a gsit irul \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copie calea ntreag" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copie numele fiierului" -#: Merge.rc:2391 +#: Merge.rc:2425 #, fuzzy, c-format msgid "Location Pane" msgstr "Panou locaie" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Panou diferene" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Fiierul petic a fost scris cu succes." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. elementul nu a fost gsit sau este un director!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. elementul nu a fost gsit sau este un director!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Fiierul petic deja exist. Dorii suprascrierea lui?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, fuzzy, c-format msgid "[%1 files selected]" msgstr "[%1 fiier(e) selectat(e)]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Context" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unificat" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Nu s-a reuit scrierea n fiierul %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, fuzzy, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Locaia destinaie nu este o cale absolut: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Specificai un fiier destinaie" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nu s-a reuit crearea unui fiier petic din fiiere binare." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nu s-a reuit crearea unui fiier petic din directoare." -#: Merge.rc:2411 +#: Merge.rc:2445 #, fuzzy, c-format msgid "" "Please save all files first.\n" @@ -4743,17 +4796,17 @@ msgstr "" "\n" "Crearea unui petic necesit ca fiierele s nu aib coninut nesalvat." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Directorul nu exist." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Rezultatele comparrii curente de directoare vor fi terse." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4764,7 +4817,7 @@ msgstr "" "Componentele necesare (7-zip i/sau Merge7z*.dll) pentru dezarhivare nu au fost gsite.\n" "Vedei manualul pentru mai multe informaii despre suportul de dezarhivare i despre cum s-l activai." -#: Merge.rc:2419 +#: Merge.rc:2453 #, fuzzy, c-format msgid "" "\n" @@ -4773,7 +4826,7 @@ msgstr "" "\n" "Not: integrarea 7-Zip este dezactivat n setrile WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, fuzzy, c-format msgid "" "\n" @@ -4782,37 +4835,37 @@ msgstr "" "\n" "Not: integrarea 7-Zip este restricionat la operare de sine stttoare n setrile WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Selectai fiierul pentru export" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Selectai fiierul pentru import" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Opiuni importate din fiier." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Opiuni exportate ctre fiier." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "A euat importul opiunilor din fiier." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "A euat scrierea opiunilor ctre fiier." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4823,473 +4876,493 @@ msgstr "" "\n" "Dorii s continuai?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, fuzzy, c-format msgid "Regular expression error" msgstr "Eroare la expresia regulat" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Nicio potrivire" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Expresie regulat nevalid" -#: Merge.rc:2436 +#: Merge.rc:2470 #, fuzzy, c-format msgid "Invalid collation character" msgstr "Caracter cu colaie nevalid" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Nume de clas de caractere nevalid" -#: Merge.rc:2438 +#: Merge.rc:2472 #, fuzzy, c-format msgid "Trailing backslash" msgstr "Backslash de sfrit" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Referin invers nevalid" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "[ sau [^ fr corespondent" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "( sau \\( fr corespondent" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "\\{ fr corespondent" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Coninut nevalid al \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Sfrit de ir nevalid" -#: Merge.rc:2445 +#: Merge.rc:2479 #, fuzzy, c-format msgid "Out of memory" msgstr "Eroare de resurse de memorie" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Expresie regulat anterioar nevalid" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Sfrit prematur al expresiei regulate" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Expresie regulat prea lung" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr ") sau \\) fr corespondent" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Western European" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Eastern European" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "East Asian" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, fuzzy, c-format msgid "Not applicable" msgstr "Nu se aplic" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2546 +#: Merge.rc:2580 #, fuzzy, c-format msgid "Approximates ISO-8859-2" msgstr "Aproximeaz ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, fuzzy, c-format msgid "Approximates ISO-8859-1" msgstr "Aproximeaz ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, fuzzy, c-format msgid "Approximates ISO-8859-7" msgstr "Aproximeaz ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, fuzzy, c-format msgid "Approximates ISO-8859-9" msgstr "Aproximeaz ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, fuzzy, c-format msgid "Approximates ISO-8859-8" msgstr "Aproximeaz ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Amestecat" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " O" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KO" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MO" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GO" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TO" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PO" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Salveaz fiierul stng" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Salveaz fiierul drept" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Salveaz fiierul stng cu numele..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Salveaz fiierul drept cu numele..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Schimb starea numai-citire a fiierului/directorului stng" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Schimb starea numai-citire a fiierului/directorului drept" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Convertete SDL ctre modul Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Convertete SDL ctre modul Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Convertete SDL ctre modul Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Interschimb ntre modurile editare i fuziune" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5298,12 +5371,12 @@ msgstr "" "Verific i ajusteaz proprietile de codare ale fiierelor.\n" "Proprietile de codare ale fiierelor" -#: Merge.rc:2595 +#: Merge.rc:2639 #, fuzzy, c-format msgid "Open and resolve conflict file" msgstr "Deschide i rezolv fiierul conflict" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5312,7 +5385,7 @@ msgstr "" "Selecteaz zona diferen de pe linia curent\n" "Diferena de pe linia curent" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5321,7 +5394,7 @@ msgstr "" "Mergi la linie sau la diferen\n" "Mergi la (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5330,7 +5403,7 @@ msgstr "" "Seteaz opiunile programului\n" "Opiuni" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5339,37 +5412,37 @@ msgstr "" "Remprospteaz afiarea\n" "Remprospteaz (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copie liniile selectate n memorie adugnd numerele de linie la nceputul fiecrei linii" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Remprospteaz elementele selectate" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Basculeaz semnul de carte" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Mergi la urmtorul semn de carte" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Mergi la precedentul semn de carte" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Cur toate semnele de carte" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5378,7 +5451,7 @@ msgstr "" "Afieaz elementele care sunt identice\n" "Arat elementele identice" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5387,7 +5460,7 @@ msgstr "" "Afieaz elementele care conin diferene\n" "Arat elementele cu diferene" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5396,7 +5469,7 @@ msgstr "" "Afieaz elementele care exist numai n partea stng\n" "Arat elementele care sunt numai n stnga" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5405,7 +5478,7 @@ msgstr "" "Afieaz elementele care exist numai n partea dreapt\n" "Arat elementele care sunt numai n dreapta" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5414,7 +5487,7 @@ msgstr "" "Afieaz fiierele binare\n" "Arat fiierele binare" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5423,7 +5496,7 @@ msgstr "" "Afieaz fiierele omise\n" "Arat fiierele omise" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5432,7 +5505,7 @@ msgstr "" "Selecteaz fontul pentru vizualizare\n" "Selecteaz fontul vizualizare" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5441,27 +5514,27 @@ msgstr "" "Revin la folosirea fontului implicit de sistem pentru vizualizare\n" "Font implicit" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Arat blancurile" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Basculeaz panoul de diferene" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panoul locaie arat o imagine cu locaia curent n contextul fiierelor" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Arat dialogul cu statisticile de comparare a directoarelor" -#: Merge.rc:2633 +#: Merge.rc:2677 #, fuzzy, c-format msgid "" "Select the current user interface language\n" @@ -5470,7 +5543,7 @@ msgstr "" "Selecteaz limba curent pentru interfa\n" "Limb" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5479,12 +5552,12 @@ msgstr "" "Arat diferenele n interiorul liniei utiliznd culori diferite\n" "Arat diferenele pe linie" -#: Merge.rc:2635 +#: Merge.rc:2679 #, fuzzy, c-format msgid "Swap the positions of the two panes" msgstr "Interschimb poziiile celor dou panouri" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5493,7 +5566,7 @@ msgstr "" "Arat numerele de linie\n" "Arat numerele de linie" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5502,7 +5575,7 @@ msgstr "" "Activeaz nfurarea liniilor lungi\n" "nfoar liniile" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5511,22 +5584,22 @@ msgstr "" "Arat marginile de selecie pentru ambele panouri\n" "Arat marginile de selecie" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Mrete dimensiunea textului" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Micoreaz dimensiunea textului" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Reseteaz dimensiunea textului la valoarea implicit" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5535,7 +5608,7 @@ msgstr "" "Desfoar la diferena anterioar\n" "Diferena anterioar (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5544,7 +5617,7 @@ msgstr "" "Desfoar la diferena urmtoare\n" "Diferena urmtoare (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5553,7 +5626,7 @@ msgstr "" "Desfoar la prima diferen\n" "Prima diferen (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5562,7 +5635,7 @@ msgstr "" "Desfoar la diferena curent\n" "Diferena curent (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5571,7 +5644,7 @@ msgstr "" "Desfoar la ultima diferen\n" "Ultima diferen (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5580,7 +5653,7 @@ msgstr "" "Copie textul selectat ctre fiierul din dreapta\n" "Copie la dreapta (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5589,7 +5662,7 @@ msgstr "" "Copie textul selectat ctre fiierul din stnga\n" "Copie la stnga (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5598,7 +5671,7 @@ msgstr "" "Copie diferena ctre dreapta i avanseaz la urmtoarea\n" "Copie la dreapta i avanseaz (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5607,7 +5680,7 @@ msgstr "" "Copie diferena ctre stnga i avanseaz la urmtoarea\n" "Copie la stnga i avanseaz (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5616,7 +5689,7 @@ msgstr "" "Copie toate diferenele ctre fiierul din dreapta\n" "Toate la dreapta" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5625,72 +5698,77 @@ msgstr "" "Copie toate diferenele ctre fiierul din stnga\n" "Toate la stnga" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "terge elementele selectate din ambele directoare" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compar elementele selectate (compar doar primul element dac mai multe elemente sunt selectate)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Selecteaz i reordoneaz coloanele pentru compararea de directoare" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Genereaz un fiier petic" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Selecteaz i modific filtre" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Genereaz un raport din rezultatele comparrii" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, fuzzy, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Utilizatorul selecteaz dezarhivatorul (nu este suportat dezarhivarea la compararea de directoare)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Dezarhivatorul potrivit este aplicat la ambele fiiere (este suficient ca doar un fiier s conin extensie)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Selectai un dezarhivator pentru a edita acest fiier" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Nu folosi predifereniatorul (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Plug-in-uri recomandate" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Alte plug-in-uri" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descarc toate plug-in-urile i le rencarc (pentru dezvoltatori)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5699,12 +5777,12 @@ msgstr "" "Activeaz urmtorul fiier vizibil\n" "Activeaz urmtorul fiier" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "nchide toate ferestrele deschise" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5713,22 +5791,22 @@ msgstr "" "Deschide documentaia WinMerge\n" "Documentaia WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Extrage versiunea curent i configuraia WinMerge ntr-un fiier text" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Afieaz Licena Public General GNU" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Numr de asamblare privat: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5737,7 +5815,7 @@ msgstr "" "Deschide documentul cu notele versiunii\n" "Notele Versiunii" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5746,262 +5824,267 @@ msgstr "" "Deschide saitul cu traduceri\n" "Traduceri" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Setri pentru plug-in-uri" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Nu folosi predifereniator" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Folosete predifereniator dac este posibil" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Nu s-a gsit WSH - scripurile .sct sunt dezactivate" -#: Merge.rc:2709 +#: Merge.rc:2754 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, fuzzy, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Deschide fiierul cu aplicaia nregistrat" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Deschide fiierul cu un editor extern" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Deschide fiierul cu un anume program" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Nu afia blocurile mutate" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Arat toate blocurile mutate" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Arat doar blocurile mutate din diferena curent" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Mergi la diferena din dreptul cursorului" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "&Mergi la diferena %1 din %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "&Mergi la linia %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Inactiv" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Din sistemul de fiiere" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Din lista de recent utilizate" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resurse" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Ascunde bara de unelte" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Arat bara de unelte format mic" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Arat bara de unelte format mare" diff --git a/Src/Languages/Russian.po b/Src/Languages/Russian.po index 24ede9a959d..c3a06b23d95 100644 --- a/Src/Languages/Russian.po +++ b/Src/Languages/Russian.po @@ -73,7 +73,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "&" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr " ..." @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr " " #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr " " #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr " ..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr " ..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr " ...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr " ..." @@ -162,1855 +164,1864 @@ msgid "Recent Projects" msgstr " " #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr " &..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr " &" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "& " #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "& " #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "& " #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "& " #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr " " #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "& ..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr " " -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr " " -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr " " -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "& " -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "& ..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "& " -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr " " -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr " &\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr " &" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr " &" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr " &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "& " -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr " & ..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "& WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr " & " -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr " & " -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr " " -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "& \tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr " " -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr " " -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr " " -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr " " -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr " &\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "& \tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "& \tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "& \tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "& \tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "& \tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr " & \tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr " & \tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "& ..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr " &..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr " &" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr " &..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr " &" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr " ..." -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr " " -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "& " -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr " \tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr " ..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr " \tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "&" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "& \tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "& \tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "& \tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "& " -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr " ...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr " " -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr " " -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "& " -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr " " -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr " " -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr " " -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr " " -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr " " -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "& " -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr " " -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr " \tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr " \tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "& " -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "& " -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr " " -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr " " -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr " ..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr " " -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr " ..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "& ..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "& ..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "&" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr " " -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr " " -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr " " -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr " & " -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr " &... (%1 %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr " " -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr " " -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr " " -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "& " -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "&" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr " &" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "& " -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "& " -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr ". & " -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr " WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "( )" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr " ." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr " WinMerge !" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr " ..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "& " -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr ":" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr " " -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr " :" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr ":" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr ":" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr ":" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr " VSS" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr " " -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr " " -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr " ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr " " -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "& :" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "& cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr " & " -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr " &" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "& ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr " " -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "& " -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr " " -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr " " -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "& :" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr " " -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr " &" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr " &" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge . , ." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr " :" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr " &" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr " &" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "& " -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "& " -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "&: " -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr " " -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr " &" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr " &" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "& " -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn checkout" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr " " -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr " " -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr " ( ):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr ":" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr " :" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr " :" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr ":" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr " :" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr " :" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr " :" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr " " -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr " " -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr " & " -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "& " -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr " " -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr " :" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr " " -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr " Temp" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr " :" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr " " -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr " 1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr " 2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr " " -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr ":" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr ":" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr ":" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr " " -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr " " -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr " " -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr " " -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "& " -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr " " -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr " " -#: Merge.rc:1072 +#: Merge.rc:1080 #, fuzzy, c-format msgid "Move &Up" msgstr "&" -#: Merge.rc:1073 +#: Merge.rc:1081 #, fuzzy, c-format msgid "Move &Down" msgstr "&" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr " " -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr " :" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr " , " -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr " :" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " " -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr " ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr ":" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr ":" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr " " -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr " &" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr " " -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr " & " -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr " & " -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr " &" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr " (Win/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr " & " -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr " " -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr " 3 " -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr " &:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "& " -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr " " -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr " " -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr " EOL" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr " &:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr " " -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr " " -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr " :" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr " " -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr " " -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr " " -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "& " -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "& " -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr " " -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "& " -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "& " -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr " " -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr " " -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr " " -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr " , -:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2019,56 +2030,56 @@ msgstr "" " : .html, .rc, .xml \n" " " -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr " " -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr " WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr " :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - " -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr " 7-Zip ( ?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr " 7-Zip 3.11 , WinMerge." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr " (Merge7z*.dll)" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr " 7-Zip" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2077,540 +2088,551 @@ msgstr "" " \n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr " 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr " 7-Zip :" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "." -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr " 7-Zip WinMerge:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr " :" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr " .\n( )" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr " " -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " " -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr " :" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr " :" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr ":" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr ":" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr ":" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr ":" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr ":" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr " 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr " 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr " " -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "& :" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr " " -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr " " -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr " ?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr " ( )" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr " ( )" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr " " -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr " 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr " 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "& " -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "& , 7-Zip" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "& 7-Zip WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "& / " -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr " " -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr ":" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr ":" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr ":" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr ":" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr ":" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr ":" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr ":" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr " :" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "()" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr " " -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr " :" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr " :" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr " " -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr " " -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr " ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr " :" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr " " -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr " " -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr ":" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr " :" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr " :" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr " " -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr " " -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr " " -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr " :" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr " :" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr " " -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr " :" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr " :" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "& .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr " " -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr " XXX ?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041904e3" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x419, 1251" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2619,7 +2641,7 @@ msgstr "" " \n" "New Documents (Ctrl-N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2628,7 +2650,7 @@ msgstr "" " \n" "Open (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2637,7 +2659,7 @@ msgstr "" " \n" "Close" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2646,7 +2668,7 @@ msgstr "" " \n" "Save (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2655,7 +2677,7 @@ msgstr "" " \n" "Save As" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2664,7 +2686,7 @@ msgstr "" " \n" "Page Setup" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2673,7 +2695,7 @@ msgstr "" " \n" "Print Setup" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2682,7 +2704,7 @@ msgstr "" " \n" "Print" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2691,12 +2713,12 @@ msgstr "" " \n" "Print Preview" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr " " -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2705,32 +2727,32 @@ msgstr "" " \n" " (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr " " -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr " " -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr " " -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr " ." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr " ." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2739,7 +2761,7 @@ msgstr "" " \n" " " -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2748,7 +2770,7 @@ msgstr "" " , \n" "About" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2757,27 +2779,27 @@ msgstr "" " ; \n" "Exit" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr " " -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2786,7 +2808,7 @@ msgstr "" " \n" "Next Pane" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2795,7 +2817,7 @@ msgstr "" " \n" "Previous Pane" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2804,7 +2826,7 @@ msgstr "" " \n" "Cascade Windows" -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2813,7 +2835,7 @@ msgstr "" " \n" "Tile Windows" -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2822,7 +2844,7 @@ msgstr "" " \n" "Tile Windows" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2831,7 +2853,7 @@ msgstr "" " \n" "Copy" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2840,7 +2862,7 @@ msgstr "" " \n" "Cut" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2849,7 +2871,7 @@ msgstr "" " \n" "Find" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2858,7 +2880,7 @@ msgstr "" " \n" "Paste" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2867,7 +2889,7 @@ msgstr "" " \n" "Repeat" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2876,7 +2898,7 @@ msgstr "" " \n" "Replace" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2885,7 +2907,7 @@ msgstr "" " \n" "Select All" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2894,7 +2916,7 @@ msgstr "" " \n" "Undo" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2903,7 +2925,7 @@ msgstr "" " \n" "Redo" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2912,7 +2934,7 @@ msgstr "" " \n" "Toggle ToolBar" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2921,7 +2943,7 @@ msgstr "" " \n" "Toggle StatusBar" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2930,62 +2952,62 @@ msgstr "" " \n" "Toggle TabBar" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr " \n " -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr " " -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr " " -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr " " -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr " " -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr " " -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr " " -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr " " -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr " " -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr " " -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr " " -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2994,183 +3016,183 @@ msgstr "" " \n" "Cancel Preview" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge " -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge " -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr " EOL" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr " " -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr " , " -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr ":\n (Dean Grimm), (Christian List), (Kimmo Varis), (Jochen Tucht), (Tim Gerundt), (Takashi Sawanaki), (Gal Hammer), (Alexander Skinner)" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge - . ; GNU General Public License ." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Ok" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr " &" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "& " -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr " & " -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "& " -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr " & " -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr " & " -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr " " -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr " " -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr " " -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr ":" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr ":" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr ":" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr ":" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr ":" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr " %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr " (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr " " -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr " . ." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr " ." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3181,7 +3203,7 @@ msgstr "" "\n" " 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3192,127 +3214,129 @@ msgstr "" "\n" " WinMerge ." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "|*.exe;*.bat;*.cmd| (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr " (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr " WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " (*.ini)|*.ini| (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr " (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt| (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr " HTML (*.htm,*.html)|*.htm;*.html| (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr " XML (*.xml)|*.xml| (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr " " -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr " " -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr " " -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr " " -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr " " -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr " " -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " (*.flt)|*.flt| (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3325,7 +3349,7 @@ msgstr "" " %1 :\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3338,7 +3362,7 @@ msgstr "" "\n" ", ." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3349,7 +3373,7 @@ msgstr "" "\n" " ." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3362,12 +3386,12 @@ msgstr "" "\n" " ." -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr " " -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3378,208 +3402,223 @@ msgstr "" "\n" " ." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr " . ?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr " " -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "& cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "& SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr " " -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr " " -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr " " -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr " " -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr " " -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr " " -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr " ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr " " -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr " " -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr " " -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr " " -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr " " -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr " ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr " ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr " ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr " ..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr ": %s : %d/%d : %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr ": %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr ": %s : %d/%d : %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr " %1 %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 " -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr " " #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr " %1 %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr ": %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr " " -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr " " -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr " " -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr " " -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr " " -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr " " -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " , " -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr " !" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr " : %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr " : %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3592,42 +3631,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr " " -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "\n%1\n " -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr " ..." -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr " %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 . ? ( )" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr " " -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr " " -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3640,7 +3679,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3657,7 +3696,7 @@ msgstr "" "\t- ( Ok)\n" "\t- ( )?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3672,7 +3711,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3687,7 +3726,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3702,14 +3741,14 @@ msgstr "" "\n" " ?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 . ?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3724,17 +3763,17 @@ msgstr "" "\n" " , ." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr " ..." -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr " ..." -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3745,42 +3784,42 @@ msgstr "" "\n" " ." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " , SourceSafe (: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr " VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr " . ..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr " ." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr " VSS . ?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr " VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr " VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3791,7 +3830,7 @@ msgstr "" " .\n" " ?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3800,170 +3839,169 @@ msgstr "" "VSS .\n" " . " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (, 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 )" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr " " -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr " " -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr " " -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr " " -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr " " -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr " " -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr " " -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr " ( )" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr " " -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr " %1 %2 " -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr " %1 %2 " -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr " ... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr " ... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr " ... (%1 %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr " ... (%1 %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr " %1 %2 " -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " %1 %2 " -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr " " -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - :" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr " - :" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 )" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 %2 )" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3974,17 +4012,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr " , :" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " , %d :" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4003,458 +4041,473 @@ msgstr "" "\n" " ." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr " " -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr " " -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr " ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr " " -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr " " -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr " ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr " %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr " : %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr " " -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr " " -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr " " -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr " " -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr " " -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr " " -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr " " -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr " " -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr " " -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr " " -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr " " -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr " " -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr " " -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr " " -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr " " -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr " " -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr " " -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr " (.)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr " (.)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr " " -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr " " -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr " " -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr " " -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr " " -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr " " -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr " " -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr " " -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr " EOL" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr " EOL" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr " " -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr " " -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr ". " -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr " " -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr " " -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr " " -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr " " -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr " : %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr " : %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr " " -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr " " -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr " " -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr " " -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr " " -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr " : %ld " -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr " 1 " -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr " : %1" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr " " -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr " , " -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr " , ." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr " " -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr " " -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr " " -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr " " -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr " " -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr " (.)" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr " (.)" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr " " -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr " " -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr " " -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr " " -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr " " -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr " " -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr " " -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr " " -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr " " -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr " " -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr " . WinMerge ." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr " . ." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " (*) ." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr " %1 %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr " " -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr " " -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr " HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr " XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " . ??" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4463,32 +4516,32 @@ msgstr "" " :\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr " " -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr " " -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr " " -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr " ." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " . " -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4503,32 +4556,32 @@ msgstr "" "\n" ": EOL, ' EOL' ." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 " (EOL) (Windows/Unix/Mac) '%1'.\n .\n , EOL , ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr " prediffer '%2' '%1'. prediffer ." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr " ." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr " ." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 " .\n\n :\n%1\n ?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4539,132 +4592,132 @@ msgstr "" " , .\n" " ()?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr ": , =%s, =%s. ." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " - : " -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr " - : " -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr " - : " -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr " " -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr " " -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr " %1 ." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr " \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr " " -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr " " -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr " ." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. " -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. " -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " . ?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 ]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr " %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " : %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr " " -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr " " -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr " " -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4675,17 +4728,17 @@ msgstr "" "\n" " " -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr " " -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr " ." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4697,7 +4750,7 @@ msgstr "" " (7-zip / Merge7z*.dll) . \n" " , ." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4706,7 +4759,7 @@ msgstr "" "\n" ": 7-Zip WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4715,37 +4768,37 @@ msgstr "" "\n" ": 7-Zip." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr " " -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr " " -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr ", ." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr ", ." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr " ." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr " ." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4756,473 +4809,493 @@ msgstr "" "\n" "?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr " " -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr " " -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr " " -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr " " -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr " " -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr " " -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr " " -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr " [ [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr " ( \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr " \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr " \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr " " -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr " " -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr " " -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr " " -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr " " -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr " ) \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "-" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "-" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "-" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "- & - " -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "-" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr " " -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr " ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr " ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr " ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr " ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr " ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " " -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr " " -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr " " -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr " ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr " ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr " ' ' / " +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr " ' ' / " +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr " EOL Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr " EOL Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr " EOL Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr " " -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5231,12 +5304,12 @@ msgstr "" " \n" "File encoding properties" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr " " -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5245,7 +5318,7 @@ msgstr "" " \n" "Difference in the Current Line" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5254,7 +5327,7 @@ msgstr "" " \n" "Go to (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5263,7 +5336,7 @@ msgstr "" " \n" "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5272,37 +5345,37 @@ msgstr "" " \n" "Refresh (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr " , " -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr " " -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr " " -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr " " -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr " " -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5311,7 +5384,7 @@ msgstr "" " \n" "Show Identical Items" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5320,7 +5393,7 @@ msgstr "" " \n" "Show Different Items" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5329,7 +5402,7 @@ msgstr "" " \n" "Show Left Unique Items" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5338,7 +5411,7 @@ msgstr "" " \n" "Show Right Unique Items" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5347,7 +5420,7 @@ msgstr "" " \n" "Show Binary Files" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5356,7 +5429,7 @@ msgstr "" " \n" "Show Skipped Items" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5365,7 +5438,7 @@ msgstr "" " \n" "Select Diff Font" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5374,42 +5447,42 @@ msgstr "" " \n" "Default Font" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr " " -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr " " -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr " " -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr " " -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr " \n" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr " \n " -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr " " -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5418,7 +5491,7 @@ msgstr "" " \n" "Show Line Numbers" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5427,7 +5500,7 @@ msgstr "" " \n" "Wrap Lines" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5436,47 +5509,47 @@ msgstr "" " \n" "Show Selection Margins" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr " " -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr " " -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr " " -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr " \n (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr " \n (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr " \n (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr " \n (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr " \n (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5485,7 +5558,7 @@ msgstr "" " \n" "Copy Right (Alt Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5494,7 +5567,7 @@ msgstr "" " \n" "Copy Left (Alt Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5503,7 +5576,7 @@ msgstr "" " \n" "Copy Right and advance (Ctrl Alt Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5512,7 +5585,7 @@ msgstr "" " \n" "Copy Left and advance (Ctrl Alt Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5521,7 +5594,7 @@ msgstr "" " \n" "All Right" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5530,367 +5603,377 @@ msgstr "" " \n" "All Left" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr " " -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr " ( -, )" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr " " -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr " " -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr " " -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr " " -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr " ( )" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ( )" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr " " -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr " (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr " " -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr " " -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr " ( )" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr " \n " -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr " " -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr " WinMerge\n WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr " WinMerge " -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr " GNU General Public License" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr " : %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr " \n " -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr " \n" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr " " -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr " " -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr " , " -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH - .sct " -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr " " -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr " " -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr " " -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr " " -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr " " -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr " " -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr " " -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr " & %1 %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr " & %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr " " -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr " " -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr " " -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr " " -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr " " diff --git a/Src/Languages/Slovak.po b/Src/Languages/Slovak.po index a1565648a8f..615af8bc32a 100644 --- a/Src/Languages/Slovak.po +++ b/Src/Languages/Slovak.po @@ -72,7 +72,7 @@ msgstr "V&ystrihn #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Koprova" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "V&loi" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&Prejs na..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "&Otvori" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "®istrovanou aplikciou" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "&externm editorom" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&m..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Sbor" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nov\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Otvori...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "&Otvori konfliktn sbor..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "O&tvori projekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Uloi &projekt..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "Posledn projekty" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Koniec" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "pr&avy" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Nastavenia" #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Pohad" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "&Zvoli psmo..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Poui zkladn psm&o" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Panel nstrojov" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&iadny" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Mal" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Vek" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&Stavov riadok" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Panel &zloiek" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Jazyk..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Nstroje" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtre..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Vytvori zplatu..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Zsuvn moduly" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Manulne rozbalenie" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatick rozbalenie" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Upravova rozbaovacm programom" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Znovu nata zsuvn moduly" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Ladi" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Nahra konfigurciu..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Resetova monosti" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Okno" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Zatvori" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Zatvori &vetky" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Zmeni &panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Dladice &vodorovne" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Dladice &zvisle" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Kaskda" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "Po&moc" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "Pomocnk &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "&Poznmky k vydaniu" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Preklady" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Podpora a&rchvov vypnut..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&O aplikcii..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "&av len na tanie" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "&Prav len na tanie" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Kdovanie sboru" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vybr&a vetko\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Zobrazi &identick poloky" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Zobrazi &rozdielne poloky" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Zobrazi poloky jedinen &vavo" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Zobrazi poloky jedinen vp&ravo" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Zobrazi pres&koen poloky" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Z&obrazi binrne sbory" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Zobrazi &skryt poloky" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "tatistika po&rovnania" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Obnovi\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "O&bnovi vybran\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Zli" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Po&rovna\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nasledujci rozdiel\tTAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Predchdzajci rozdiel\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "Pr&v rozdiel\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuny rozdiel\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "Posledn &rozdiel\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Skoprova v&pravo\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Skoprova &vavo\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Zmaza\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Prispsobi stpce..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Vystvori &sprvu..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Uloi\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Uloi &av" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Uloi" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Uloi &ako..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Uloi &prav" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Tlai..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Nastavenie s&trnky" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Nhad p&red tlaou" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Konvertova konce riadkov na" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Zluovac reim\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "&Kdovanie sboru..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Vrti\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Opakova\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "V&ystrihn\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Koprova\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "V&loi\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Oznai roz&diel v riadku\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Hada...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Nahradi...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Skripty" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Przdne >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Rozren" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Koprova s slami riadkov\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Zloky" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Prepn zloku\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&alia zloka\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Predol zloka\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Zmaza vetky zloky" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Prejs na...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Priblenie" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "&Pribli\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "&Oddiali\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normlna vekos\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Zvrazovanie syntaxe" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "&Zamkn panely" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Zobrazi przdne miesto" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Zobraz&i rozdiely riadkov" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Zobrazi sla &riadkov" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Zobrazi &okraje" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "&Zalamova riadky" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "&Vymeni panely" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "&Panel s rozdielom" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "&Lokan panel" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Koprova vpravo a s alej\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Koprova vavo a s alej\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Koprova vetko vpravo" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Koprova vetko vavo" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Predspracovanie" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Porovn&a" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "&Porovna pecilne" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&av s pravm" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "a&v s..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Prav s avm" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "P&av s..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Presun" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&av do..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Prav do..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Zmaza" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&av" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Prav" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Oba" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Preme&nova" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Skry poloky" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&Otvori av" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "O&tvori prav" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Skoprova nzvy &ciest" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&av (%1 z %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&prav (%1 z %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Oba (%1 z %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Skoprova nzvy &sborov" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zipova" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&av... (%1 of %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&prav... (%1 of %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Oba... (%1 of %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Rozdiely... (%1 of %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Obnovi" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Koprova pln cestu" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Koprova nzov &sboru" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Nastavenia preprocesora" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Bez preprocesora" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "&Auto preprocesor" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Ch&o na rozdiel" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Bez presunutch blokov" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Vetky presunut bloky" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Presunut blok pre &aktulny rozdiel" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "O aplikcii" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Skromn zostavenie)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Vetky prva vyhraden." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Navtvte www strnku programu WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Prispievatelia" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Vber sborov a adresrov..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&av:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Prechdza..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "P&rav:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&Prechdza..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "Pr&pony:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "&Vybra..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Rozbaovac program:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Vybra..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Zahrn podadresre" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Stav:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Zrui" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Pomoc" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Sbory alebo adresre pre porovnanie" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Databza:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Pouvate:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Heslo:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Odkaz na Cieov VSS projekt" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Poui na vetky poloky" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Uloi ako..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Systm pre spvu verzi" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "Systm pre sprvu &verzi:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Cesta ku cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Hlavn nastavenia" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Automatick &skok na prv rozdiel" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Nezobrazova spac banner" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zat&vra okn klvesom ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Automaticky overova cestu v dialgu Otvori" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Um&oni beh iba jednej intancie" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "&Pta sa pred zatvorenm viacerch okien" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "&Zachovva as sboru pri porovnan" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&utomatick dopanie v dialgu Otvori:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Povoli viacer okn pre porovnanie" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Porovnvanie &adresrov" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Porovnvanie &sborov" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge umouje zamedzi zobrazovaniu bench sprv. Stlaenm tlaidla Reset sa znova sprvy zobrazia." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Reset" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Jazyk" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Dostupn jazyky:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Hada" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Hada:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Iba cel &slov" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Rozliuj &vek/mal" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Regulrny vraz" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "&Nezalamova koniec sboru" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "S&mer hadania" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Nahor" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "Na&dol" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Njdi al" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Nahradi" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Nahradi:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Nezalamova koniec sboru" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Nahradi vo" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "Vbere" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "Celom sbore" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "Nahrai" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Nahrai vetko" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Komentre" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Check in po checkout-e" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Riadkov filtre" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Zapn riadkov filtre" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Regulrne vrazy (jeden na riadok):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Uloi" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nov" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Upravi" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Odstrni" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Farby" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Rozdiel:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Rozdiel vo vbere:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Pozadie" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Zmazan" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Ignorovan rozdiel:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Presunut:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Vber presunut:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Rozdiel v slove:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Rozdiel vo vybranom slove:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Predvolen" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialg" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Systm" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Posiela zmazan sbory do koa" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integrcia" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Prida do kontextovej ponuky Prieskumnka" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Zap&n rozren ponuku" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Za&ha tandardne aj podadresre" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Extern editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "Adresr s &filtrami:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Prehadva" -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Genertor zplat" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Sbor&1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Sbor&2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Vymeni navzjom" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Rozri existujci sbor" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Vsledok:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formt" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "&tl:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Kontext:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Netlaiten znaky:" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&Porovna" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnorova zmeny" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&norova vetko" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignor&ova przdne riadky" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Zohadova vekos psmen" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Zahrn prkazov ria&dok" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Otvori v e&xternom editore" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Zobrazova stpce" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Presun &hore" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Presun &dolu" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Vyber rozbaovac program" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Rozbaovac program:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Zobrazi vetky rozbaovacie programy, nekontrolova prponu" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Zoznam prpon:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Popis:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Priebeh porovnania adresrov" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Zastavi" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Porovnvam poloky..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Porovnanch poloiek:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Poloiek celkom:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Prejs na" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Ch&o na:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Sbor" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Prejs na..." -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Riad&ok" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Rozdiel" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&Prejs na" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Porovnvanie" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Netlaiten znaky" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Porovnva &netlaiten znaky" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "Ignorova &zmeny v przdnom mieste" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignorova &cel przdne miesto" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorova przdne riad&ky" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorova m&al/VEK" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Zapn &detekciu pohyblivho bloku" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Podobn riadky ako zhodn" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orova asov rozdiely menie ako 3 sekundy" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Me&tda porovnvania sborov:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Stop po prvom rozdiele" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtrova komentre" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Zvrazovanie syntaxe" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automatick p&reskenovanie" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Zachovva pvodn zakonenie riadkov" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabultory" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Nastavenie tabultorov:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Vklada tabultory" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Vklada medzery" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Farebn odlenie riadkovch rozdielov" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Zobrazova riadkov rozdiely" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "rove &znaku" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "rove &slova:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtre sborov" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testova" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Intalova..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Nov..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Upravova..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Zmaza..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Uloi zmenen sbory?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Sbor na avej strane" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Uloi zmeny" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Zahodi zmeny" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Sbor na pravej strane" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "U&loi zmeny" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Z&ahodi zmeny" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Zahodi vetky" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Kdov strnka" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Predvolen kdov strnka" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Zvote predvolen kdov strnku, ktor sa pouije pri natan ne-Unicode sborov:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,32 +2029,32 @@ msgstr "" "Detekova informciu o kdovej strnke pri tchto sboroch: .html, .rc, .xml \n" "je potrebn retartova program" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Systmov kdov strnka" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Poda pouvateskho rozhrania WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Vlastn kdov strnka:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - podpora archvov vypnut" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Nedetekoval som verziu 7-Zip (nie je naintalovan?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2052,12 +2063,12 @@ msgstr "" "Podpora archvov vyaduje, aby bol naintalovan 7-Zip 3.11 alebo neskor m inaks\n" "jeho dleit komponenty bud prekoprovan do adresra pre samostatn (stanalone) prevdzku." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Mus by aj sprvny zsuvn modul rozhrania (Merge7z*.dll) v ceste." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2066,12 +2077,12 @@ msgstr "" "Prosm, pouvajte niie odporan verziu 7-Zip km nebud dostupn zsuvn moduly rozhrania\n" "pre neskorie verzie." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Verzia" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2080,540 +2091,551 @@ msgstr "" "Poaduje sa zsuvn modul\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Odporan verzia 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "prtomn" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip softvr naintalovan na vaom potai:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "iadny" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "chba" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "samostatn (standalone) komponenty 7-Zip:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "zastaral" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Zsuvn moduly v ceste:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Stiahnutie zsuvnho modulu" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Nastavenia" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategrie" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importova..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportova..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Kov slov:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nzvy funkci:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Komentre:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "sla:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Opertory:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Reazce:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocesor:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Pouvate 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Pouvate 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Hrubo" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Sprva o porovnan adresrov" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "&Sbor sprvy:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Prehadva..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&tl:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Koprova do schrnky" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Zdiean alebo skromn filter" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Ak typ filtra chcete vytvori?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Zdiean filter (pre vetkch pouvateov tohoto potaa)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Skromn filter (len pre aktulneho pouvatea)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Podpora archvov" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Podpora archvov vyaduje naintalovan zsuvn modul 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Stiahnu zsuvn modul 7-Zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Zapn podporu archvov" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Poui samostatn (standalone) 7-Zip ak sa d" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "P&oui loklny 7-Zip z adresra WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detekova typ archvu z hlaviky sboru" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "tatistika porovnania" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Adresre:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Sbory:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Odlin" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binrne:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Jedinen" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Vavo:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Vpravo:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identick" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Celkom:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Zatvori" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Ovplyvuje" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Ovplyvuje)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Zvote kdov strnku pre" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Natanie sboru:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "&Ukladanie sboru:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Poui pre obe rovnak kdov strnku" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Poui" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Zrui" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Test filtra" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testujem filter ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Zadajte testovac reazec:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nzov adresra" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Vsledok:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Testova" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Zatvori" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Pouva tandardn farby textu" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Vlastn farby textu" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Netlaiten znaky:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Ben text:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Vber:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Cesty" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "&Len na tanie" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Len na t&anie" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Otvori..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Uloi..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Zlon sbory" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Vytvra zlon sbory v:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Vytvra zlon sbory do:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Adresr &originlneho sboru" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Globlny adresr pre zlohy:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nzov zlonho sboru:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Prida rozrenie .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "P&rida asov znmku" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Potvrdi koprovanie" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Ste si ist, e chcete skoprova XXX poloiek?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Zava" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Doprava" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "no" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Nie" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041b04e2" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x41b, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Pripraven" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "ROZ" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAPS" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "CEZ" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "ZZN" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2622,7 +2644,7 @@ msgstr "" "Vytvor przdny dokument\n" "Nov dokumenty (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2631,7 +2653,7 @@ msgstr "" "Otvor existujci dokument\n" "Otvor" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" "Zatvor aktvny dokument\n" "Zatvor" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2649,7 +2671,7 @@ msgstr "" "Ulo aktvny dokument\n" "Ulo" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2658,7 +2680,7 @@ msgstr "" "Ulo aktvny dokument pod novm menom\n" "Ulo ako" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" "Zmen parametre tlae\n" "Nastavenie tlae" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2676,7 +2698,7 @@ msgstr "" "Zmen tlaiare a parametre tlae\n" "Nastavenie tlaiarne" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2685,7 +2707,7 @@ msgstr "" "Vytla aktvny dokument\n" "Tla" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2694,12 +2716,12 @@ msgstr "" "Zobraz nhad pred tlaou\n" "Nhad pred tlaou" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Zviditeni vetky skryt poloky" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2708,32 +2730,32 @@ msgstr "" "Otvor sbor projektu\n" "Sbor sprojektu (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznma chyba pri pokuse otvori sbor projektu" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznma chyba pri pokuse uloi sbor projektu" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Sbor projektu" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Sbor projektu spene natan." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Sbor projektu spene uloen." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2742,7 +2764,7 @@ msgstr "" "Ulo aktulne nastavenia a cesty do sboru projektu\n" "Uloi Sbor projektu" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2751,7 +2773,7 @@ msgstr "" "Zobraz informcie o programe\n" "O programe" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2760,27 +2782,27 @@ msgstr "" "Ukon program s otzkou na uloenie sborov\n" "Koniec" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Otvor dokument" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" "Prepne na alie okno\n" "alie okno" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2798,7 +2820,7 @@ msgstr "" "Prepne na predchdzajce okno\n" "Predchdzajce okno" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2807,7 +2829,7 @@ msgstr "" "Usporiada otvoren okn kaskdovito\n" "Kaskda" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2816,7 +2838,7 @@ msgstr "" "Rozloenie okien ako neprelnajce sa dladice vodorovne\n" "Dldi okn vodorovne" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2825,7 +2847,7 @@ msgstr "" "Rozloenie okien ako neprelnajce sa dladice zvisle\n" "Dldi okn zvisle" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" "Skopruje oznaen do schrnky\n" "Koprova" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2843,7 +2865,7 @@ msgstr "" "Presununie oznaen do schrnky\n" "Vystrihn" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2852,7 +2874,7 @@ msgstr "" "Vyhad text\n" "Njdi" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2861,7 +2883,7 @@ msgstr "" "Vlo obsah schrnky\n" "Vloi" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2870,7 +2892,7 @@ msgstr "" "Zopakuje posledn akciu\n" "Opakuj" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2879,7 +2901,7 @@ msgstr "" "Nahrad text\n" "Nahradi" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2888,7 +2910,7 @@ msgstr "" "Ozna vetko\n" "Oznai vetko" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2897,7 +2919,7 @@ msgstr "" "Vrti posledn innos\n" "Vrti" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2906,7 +2928,7 @@ msgstr "" "Zopakuje posledn vrten innos\n" "Opakova" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2915,7 +2937,7 @@ msgstr "" "Zobraz alebo skryje panel nstrojov\n" "Panel nstrojov" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2924,7 +2946,7 @@ msgstr "" "Zobraz alebo skryje stavov riadok\n" "Stavov riadok" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2933,7 +2955,7 @@ msgstr "" "Zobraz alebo skryje panel zloiek\n" "Panel zloiek" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2942,57 +2964,57 @@ msgstr "" "Automaticky meni vekos panelov\n" "Zamkn panely" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Zmeni vekos okna" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Zmeni pozciu okna" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Minimalizova okno" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Zvi okno na pvodn vekos" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Prepn na alie okno" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Prepn na predchdzajce okno" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zatvori aktvne okno s monosou uloenia dokumentov" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Obnovi okn" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Aktivova zoznam loh" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktivova toto okno" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3001,7 +3023,7 @@ msgstr "" "Zatvor nhad tlae\n" "Zru nhad" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3013,7 +3035,7 @@ msgid "" "WinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3025,173 +3047,173 @@ msgid "" "WinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Zachova pvodn zakonenia riadkov" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Stlate ubovon klves" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Cestu skoprujete po kliknut pravm tlaidlom" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Zrui" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Znova" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorova" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignorova &vetky" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&no" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "no &pre vetky" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nie" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nie pre &vetky" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "Po&kraova" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "Pre&skoi" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Preskoi v&etky" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "U tto sprvu nezobrazova." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "U sa tto otzku nepta." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Farby syntaxe" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Farby textu" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Kontrola verzi" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Zava:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Doava:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Sprava:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Doava:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Verzia %1 - Slovensk preklad" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Vlastnosti (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Znova sa zobrazuj vetky okn so sprvami." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Nastali zmeny v aktulnom sbore. Niektor nastavenia sa neuplatnia, pokia porovnanie aktulneho sboru sa nezane odznova." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Zvolen zmena psma sa neprejav v prve zobrazench paneloch." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3202,7 +3224,7 @@ msgstr "" "\n" "Pouite hodnoty 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3213,127 +3235,129 @@ msgstr "" "\n" "prosm, po resetovan retartujte WinMerge." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Otvori" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programy|*.exe;*.bat;*.cmd|Vetky sbory (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Vetky sbory (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge projekty (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Sbory s nastavenm (*.ini)|*.ini|Vetky sbory (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Textov sbory (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Vetky sbory (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML sbory (*.htm,*.html)|*.htm;*.html|Vetky sbory (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML sbory (*.xml)|*.xml|Vetky sbory (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Pln obsah" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Rchly obsah" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Dtum zmeny" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Dtum zmeny a vekos" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Vekos" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nzov" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Umiestnenie" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtre" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Popis" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Zvote nzov sboru pre nov filter" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filtre sborov (*.flt)|*.flt|Vetky sbory (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3346,7 +3370,7 @@ msgstr "" "Prosm, skoprujte sbor %1 do adresra WinMerge/Filters :\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3359,7 +3383,7 @@ msgstr "" "\n" "Prosm, uistite sa, e adresr existuje a d sa doho zapisova." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3370,7 +3394,7 @@ msgstr "" "\n" "Prosm, vyberte adresr pre filtre v dialgu Nastavienia/Systm." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3383,12 +3407,12 @@ msgstr "" "\n" "Mono je filter len na tanie?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Njs sbor filtra, ktor sa naintaluje" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3399,208 +3423,223 @@ msgstr "" "\n" "Nepodarilo sa skoprova nov sbor do adresra s filtrami." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter u existuje. Prepsa existujci filter?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Regulrny vraz" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Cesta ku cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Cesta ku SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Vsledok porovnania adresrov" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Porovnvanie sborov" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Nepomenovan av" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Nepomenovan prav" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Ich sbor" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Mj sbor" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Prehadvam sbory..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Otvranie vberu" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Koprujem av do pravho" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Koprujem prav do avho" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Koprujem vetko do avho" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Koprujem vetko do pravho" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Koprujem sbory..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Maem sbory..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Presvam sbory..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Vytvram sprvu..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Riad: %s St: %d/%d Zn: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Riadok: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Riad: %s St: %d/%d Zn: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Zli" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Rozdiel %1 z %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "njdench %1 rozdielov" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "njden jeden rozdiel" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "na tanie" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Poloka %1 of %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Poloky: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vyberte 2 existujce sbory alebo adresre na porovnanie" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Vber adresra" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Vyberte dva adresre na porovnanie." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "av cesta je neplatn!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Prav cesta je neplatn!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Obe cesty s neplatn!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Zvote si dva sbory pre zapnutie rozbaovaa sborov." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Nemem porovna sbor a adresr!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Sbor nenjden: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Sbor nerozbalen: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3613,12 +3652,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Nepodarilo sa spracova sbor konfliktov." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3629,32 +3668,32 @@ msgstr "" "%1\n" "nie je sbor konfliktov." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Uloi ako" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Uloi zmeny do %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je oznaen len na tanie. Chcete aj tak prepsa sbor len na tanie? (Stlate Nie ak ho chcete zapsa po novm nzvom.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Chyba pri zisovan monosti zpisu" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Chyba pri zlohovan sboru" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3667,7 +3706,7 @@ msgstr "" "\n" "Pokraova napriek tomu?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3684,7 +3723,7 @@ msgstr "" "\t-poui in nzov sbory (Stlate Ok)\n" "\t-zrui prebiehajcu operciu (Stlate Zrui)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3699,7 +3738,7 @@ msgstr "" "\n" "elte si uloi rozbalen verziu do inho sboru?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3714,7 +3753,7 @@ msgstr "" "\n" "elte si uloi rozbalen verziu do inho sboru?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3729,7 +3768,7 @@ msgstr "" "\n" "Prepsa zmenen sbor?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3738,7 +3777,7 @@ msgstr "" "%1\n" "je oznaen len na tanie. elte si prepsa poloku len na tanie?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3753,17 +3792,17 @@ msgstr "" "\n" "Ak chcete obnovi sbory, zatvorte aktulne porovnvanie sborov a znova natajte sbory." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Uloi av sbor ako" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Uloi prav sbor ako" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3774,42 +3813,42 @@ msgstr "" "\n" "Obnovte dokumenty, ne budete pokraova." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Muste nastavi cestu k projektu SourceSafe (napr.: $/MojProjekt)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Checkout sborov z VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "SourceSafe vrtil chybu pri pokuse skontrolova sbor. Nemono pokraova..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Chyba pri span prkazu zo Systmu Verzi (CVS a pod)." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "pracovn adresr VSS Working Folder a umiestnenie aktulneho sboru sa nezhoduj. Pokraova?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Nebola njden databza VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Chyba VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3820,7 +3859,7 @@ msgstr "" " Prosm, skontrolujte konfigurciu zvolenho pohadu.\n" " Vrti operciu checkout?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3829,170 +3868,169 @@ msgstr "" "Systm pre sprvu verzi vrtil chybu pri pokuse vrti (checkout) sbor.\n" " Prosm, skontrolujte konfigurciu zvolenho pohadu. " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "iadny" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menie ako 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 a vyie)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Prerui na netlaitenom znaku" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Prerui na netlaitenom znaku alebo vetnej diakritike" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Koprova oznaen poloku do pomenovanho adresra" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Koprova oznaen poloku do vlastnho adresra" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Zma oznaen poloky vavo" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Zma oznaen poloky vpravo" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Zma oznaen poloky na oboch stranch" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skry oznaen poloky (filter poas behu)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Premenova oznaen poloku na oboch stranch" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Kopruj do avej strany %1 z %2 vybranch poloiek" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Kopruj do pravej strany %1 z %2 vybranch poloiek" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Sprava doava (%1 z %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Zava doprava (%1 z %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Zava... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Sprava... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Zava... (%1 z %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Sprava... (%1 z %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "av (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Zma %1 z %2 vybranch poloiek z pravej strany" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Zmaza z oboch strn %1 z %2 vybranch poloiek" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "av (%1 z %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Prav (%1 z %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Oba (%1 z %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Vyberte cieov adresr" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "av strana - vyberte cieov adresr:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Prav strana - vyberte cieov adresr:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 ovplyvnench sborov)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 ovplyvnench sborov z %2)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4003,17 +4041,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Naozaj chcete skoprova:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Naozaj chcete skoprova %d poloiek:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4032,458 +4070,473 @@ msgstr "" "\n" "Prosm, obnovte porovnanie." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Otvori av sbor" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Otvori sbor vavo v externom editore" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Otvori av sbor s..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Otvori prav sbor" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Otvori prav sbor v externom editore" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Otvori prav sbor s..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Nepodarilo sa spusti extern editor: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Neznma prpona (external editor): %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Skoprova nzvy sborov do schrnky" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Skoprova nzvy cesty na avej strane do schrnky" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Skoprova nzvy cesty na pravej strane do schrnky" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Skoprova nzvy ciest z oboch strn do schrnky" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Neznmy formt archvu" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Prida poloky z avej strany do archvu" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Prida poloky z pravej strany do archvu" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Prida poloky z oboch strn do archvu" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Prida rozdielne poloky do archvu (obe strany)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Presun vybran sbor na avej strane do adresra, ktor zadm" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Presun vybran sbor na pravej strane do adresra, ktor zadm" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nzov sboru" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Adresr" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Vsledok porovnania" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Dtum vavo" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Dtum vpravo" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Prpona" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Vekos vavo" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Vekos vpravo" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Vekos vpravo (krtka)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Vekos vavo (krtka)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "as vzniku vavo" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "as vzniku vpravo" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Nov sbor" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Verzia sboru vavo" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Verzia sboru vpravo" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Krtky vsledok" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atribty vavo" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atribty vpravo" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Konce riadkov vavo" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Konce riadkov vpravo" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Kdovanie vavo" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Kdovanie vpravo" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Ignorovan rozdiel" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Rozdiely" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binrny" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Nemono porovna sbory" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Poloka zruen" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Sbor preskoen" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Adresr preskoen" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Iba vavo: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Iba vpravo: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binrne sbory s identick" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binrne sbory s rozdielne" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Sbory s rozdielne" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Iba vavo" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Iba vpravo" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Chyba" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Uplynul as: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "jedna vybran poloka" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 vybranch poloiek" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nzov sboru alebo adresra." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nzov podadresra, ke obsahuje aj podadresre." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Vsledok porovnania, dlh tvar." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Dtum poslednej zmeny na avej strane." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Dtum poslednej zmeny na pravej strane." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Prpona sboru." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Vekos sboru na avej strane v bajtoch." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Vekos sboru na pravej strane v bajtoch." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Vekos sboru na avej strane skrten." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Vekos sboru na pravej strane skrten." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Dtum vytvorenia na avej strane." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Dtum vytvorenia na pravej strane." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "ktor zo sborov m nov as poslednej zmeny." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzia sboru na avej strane, iba pre rovnek typ sboru." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzia sboru na pravej strane, iba pre rovnek typ sboru." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Krtky vsledok porovnania." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atribty na avej strane." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atribty na pravej strane." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Typ zakonenia riadka sboru na avej strane" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Typ zakonenia riadka sboru na pravej strane" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Kdovanie na avej strane." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Kdovanie na pravej strane." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Poet ignorovanch rozdielov v sbore. Tieto rozdiely WinMerge ignoruje a nie je schopn ich zli." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Poet rozdielov v sbore. V tomto sle nie s zahrnut ignorovan rozdiely." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Zobraz hviezdiku (*) ak je sbor binrny." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Porovna %1 s %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Zoznam oddelen iarkami" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Zoznam oddelen tabultormi" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Jednoduch HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Jednoduch XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Sbor so sprvou u existuje. Chcete prepsa existujci sbor?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4492,32 +4545,32 @@ msgstr "" "Chyba pri vytvran sprvy:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Sprva bola spene vytvoren." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Rovnak sbor je otvoren v boch paneloch." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Vybran sbory s rovnak." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Poas porovnvania sa vyskytla chyba." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Doasn sobry nebolo mon vytvori. Skontrolujte nastavenie odkladacieho adresra." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4532,27 +4585,27 @@ msgstr "" "\n" "Pozn.: Ak chcete, aby som vdy povaoval vetky zakonenia riadkov za ekvivalentn, nastavte vobu 'Ignorova rozdiely zakonenia riadkov..' v zloke Porovnvanie dialgu Nastavenia (njdete v pravy/Nastavenia)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Poas predspracovana sboru '%1' zsuvnm modulom '%2' sa vyskytla chyba. Predspracovanie sa u nepouije." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Zvolen adresr je neplatn." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Nemem otvori binrny sbor v editore." -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4567,7 +4620,7 @@ msgstr "" "%1\n" "na druhej strane a otvori tieto adresre?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4578,132 +4631,132 @@ msgstr "" "Zobrazenie kadho sboru v jeho kdovej strnke lepie zobrazuje, ale zluovanie/koprovanie bude nebezpen.\n" "Chcete precova s oboma strnkami akoby boli v predvolenej kdovej strnke Windows (odpora sa)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Varovanie: Sbory pouvaj rozlin kdovania, av=%s a prav=%s, a zlenie me vies ku strate informci." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informcie sa stratili kvli chybm v kdovan: oba sbory" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informcie sa stratili kvli chybm v kdovan: prav subor" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informcie sa stratili kvli chybm v kdovan: av subor" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Bez rozdielu" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Rozdiely v riadkoch" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Nahradench %1 reazcov." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Nemem njs reazec \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Koprova pln cestu" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Koprova nzov sboru" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Lokan panel" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Panel rozdielu" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Sbor so zplatou bol spene zapsan." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. poloka nenjden alebo je to adresr!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. poloka nenjden alebo je to adresr!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Sbor so zplatou u existuje. Chcete ho prepsa?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 sbor zvolen]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normlny" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Kontextov" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Zjednoten" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Nedalo sa zapisova do sboru %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Uveden vstupn cesta nie je absoltna cesta: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "uvete vstupn sbor" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Nemohol som vytvori sbor so zplatou z binrnych sborov." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Nemohol som vytvori sbor so zplatou z adresrov." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4714,17 +4767,17 @@ msgstr "" "\n" "vytvorenie zplaty vyaduje, aby v sboroch neboli neuloen zmeny." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Adresr neexistuje." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Aktulne vsledky porovnania adresrov bud zmazan." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4735,7 +4788,7 @@ msgstr "" "Niektor z komponentov (7-zip a/alebo Merge7z*.dll) potrebnch pre podporu archvov neboli njden.\n" "Pozri viac informci o podpore archvov a ako ju zapn v Prruke." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4744,7 +4797,7 @@ msgstr "" "\n" "Pozn.: integrcia 7-Zip je vyonut v Nastaveniach WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4753,37 +4806,37 @@ msgstr "" "\n" "Pozn.: integrcia 7-Zip je obmedzen na samostatn (standalone) prevdzku v Nastaveniach WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Vyberte sbor pre export" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Vyberte sbor pre import" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Nastavenia importovan zo sboru." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Options exportovan do sboru." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Nepodarilo sa importova nastavenia zo sboru." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Nepodarilo sa zapsa nastavenia do sboru." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4794,473 +4847,493 @@ msgstr "" "\n" "Chcete pokraova?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Chyba regulrneho vrazu" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Bez zhody" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Neplatn regulrny vraz" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Neplatn znak porovnvania" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Neplatn nzov triedy znakov" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Sptn lomka na konci" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Neplatn sptn odkaz" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "[ alebo [^ bez nprotivku" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "( alebo \\( bez nprotivku" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "\\{ bez nprotivku" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Neplatn obsah \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "neplatn koniec rozsahu" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "nedostatok pamte" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Neplatn predchdzajci regulrny vraz" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Predasn koniec regulrneho vrazu" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Regulrny vraz je prli vek" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr ") alebo \\) bez nprotivku" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "zpadoeurpske" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "vchodoeurpske" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "vchodozijsk" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "juhovchodn a juhozpadn zia" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "stredn vchod" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "in" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS latinka US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS arabsk" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS grcka" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS baltsk" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS latinka 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS grcka 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS latinka 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS azbuka" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS tureck" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS portugalsk" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS islandsk" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS hebrejsk" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS franczska Kanada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS nordick" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS azbuka CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS grcka 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows thajsk" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows japonsk" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows zjednoduen ntina" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows krejsk" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows tradin ntina" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows latinka 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows azbuka (slovansk)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows latinka 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows grcka" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows latinka 5 (tureck)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows hebrejsk" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows arabsk" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows baltsk" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows vietnamsk" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh rumunsk" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh grcka" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh azbuka" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh stredn Eurpa" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh tureck" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Approximuje ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Approximuje ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Approximuje ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Approximuje ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Approximuje ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Zmiean" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Ulo sbor vavo" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Ulo sbor vpravo" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Ulo av sbor pod nzvom..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Ulo prav sbor pod nzvom..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Zmen stav avho len na tanie sboru/adresra" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Zmen stav pravho len na tanie sboru/adresra" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Prepne medzi reimami upravovania a spjania" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5269,12 +5342,12 @@ msgstr "" "Zobraz a nastav vlastnosti kdovania sborov\n" "Vlastnosti kdovania sborov" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Otvori a vyriei sbor konfliktov" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5283,7 +5356,7 @@ msgstr "" "Vyberie oblas rozdielu na aktulnom riadku\n" "Rozdiel na aktulnom riadku" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5292,7 +5365,7 @@ msgstr "" "Prejde na riadok alebo rozdiel\n" "Prejs na (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5301,7 +5374,7 @@ msgstr "" "Nastav monosti programu\n" "Monosti" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5310,37 +5383,37 @@ msgstr "" "Obnov zobrazenie\n" "Obnovi (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Skopruje vybran riadky do schrnky s pridanm slom riadka na zaiatok" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Obnov zvolen poloky" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Prepne zloku" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Ide na aliu zloku" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Ide na predol zloku" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Vymae vetky zloky" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5349,7 +5422,7 @@ msgstr "" "Zobraz poloky, ktor s presne rovnak\n" "Zobrazi identick poloky" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5358,7 +5431,7 @@ msgstr "" "Zobraz poloky, ktor maj rozdiely\n" "Zobrazi rozdielne poloky" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5367,7 +5440,7 @@ msgstr "" "Zobraz poloky, ktor existuj iba na avej strane\n" "Zobrazi poloky jedinen vavo" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5376,7 +5449,7 @@ msgstr "" "Zobraz poloky, ktor existuj iba na pravej strane\n" "Zobrazi poloky jedinen vpravo" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5385,7 +5458,7 @@ msgstr "" "Zobraz binrne sbory\n" "Zobrazi binrne sbory" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5394,7 +5467,7 @@ msgstr "" "Zobraz preskoen poloky\n" "Zobrazi preskoen poloky" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5403,7 +5476,7 @@ msgstr "" "Vyberie font pre zobrazenie\n" "Font pre zobrazenie" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5412,42 +5485,42 @@ msgstr "" "Vrti sa k pouvaniu predvolenho systmovho fontu pre zobrazenie\n" "Predvolen font" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Zobraz przdne znaky" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Prepne panel rozdielov" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Lokan panel zobraz celkov obraz sborov" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Zobraz dialg tatistika porovnania adresrov" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Vymen polohu dvoch panelov" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5456,7 +5529,7 @@ msgstr "" "Zobraz sla riadkov\n" "Zobrazi sla riadkov" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5465,7 +5538,7 @@ msgstr "" "Zapne zalamovanie riadkov na hranici slov\n" "Zalamova riadky" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5474,47 +5547,47 @@ msgstr "" "Zobraz okraje vberu v oboch paneloch\n" "Zobrazi okraje vberu" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Zvi vekos psma" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Zmeni vekos psma" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Nastavi psmo na tandardn vekos" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5523,7 +5596,7 @@ msgstr "" "Skopruje vybran text do sboru vpravo\n" "Koprova vpravo (->)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5532,7 +5605,7 @@ msgstr "" "Skopruje vybran text do sboru vavo\n" "Koprova vavo (<-)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5541,7 +5614,7 @@ msgstr "" "Skopruje rozdiel napravo a prejde na al\n" "Skoprova doprava a na al (Ctrl+Alt+vpravo)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5550,7 +5623,7 @@ msgstr "" "Skopruje rozdiel naavo a prejde na al\n" "Skoprova doava a na al (Ctrl+Alt+vavo)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5559,7 +5632,7 @@ msgstr "" "Skopruje vetky rozdiely do sboru vpravo\n" "Vetko vpravo" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5568,102 +5641,107 @@ msgstr "" "Skoprujde vetky rozdiely do sboru vavo\n" "Vetko vavo" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Zmae vybran poloky z oboch adresrov" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Porovn vybran poloky (ak s zvolen viacer poloky, porovn prv poloku)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vyberie a zmen poradie stpcov pre porovnanie adresrov" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Vytvor sbor so zplatou" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Vyberie a modifikuje filtre" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Vytvor sprvu z vsledkov porovnania" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Pouvate zvol rozbaovac program (bez rozbaovania, ke sa otvra adresr)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Rozbaovac program sa pouije na oba sbory (pri jednom sbore sta prpona)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Zvote rozbaovac program, ktorm sa bude upravova tento sbor" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Bez predspracovania (ben)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Odporan zsuvn moduly" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "In zsuvn moduly" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Odoberie z pamte vetky zsuvn moduly a znovu ich nata (pre vvojrov)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Zatvor vetky otvoren okn" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Vype aktulne informcie o verzii a konfigurcii WinMerge do textovho sboru" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Skromn zostavenie: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5672,7 +5750,7 @@ msgstr "" "Otvor dokument Poznmky k vydaniu\n" "Poznmky k vydaniu" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5681,262 +5759,267 @@ msgstr "" "Otvor webstrnku prekladov\n" "Preklady" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Nastavenia zsuvnch modulov" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Bez preprocesora" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Preprocessing, ak sa d" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH nenjden - .sct skripty vypnut" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Otvor sbor registrovanou aplikciou" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Otvor sbor externm editorom" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Otvor sbor konkrtnym programom" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Nezobrazuje presunut bloky" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Zobraz vetky posunut bloky" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Zobrazuje presunut bloky iba z aktulneho rozdielu" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ide na rozdiel, ktor je pod kurzorom" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ch&o na rozdiel %1 z %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Ch&o na riadok %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Vypnut" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Zo sborovho systmu" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Zo zoznamu nedvno pouitch" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Dvkov" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Zdroje" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Skry panel nstrojov" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Zobrazi mal panel nstrojov" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Zobrazi vek panel nstrojov" diff --git a/Src/Languages/Slovenian.po b/Src/Languages/Slovenian.po index f90077a4dc0..fbfee026cfd 100644 --- a/Src/Languages/Slovenian.po +++ b/Src/Languages/Slovenian.po @@ -73,7 +73,7 @@ msgstr "Izre #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Kopiraj" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "&Prilepi" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "Pojdi &na..." @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "&Odpri" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "Z re&gistrirano aplikacijo" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "Z &zunanjim urejevalnikom" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&z..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Datoteka" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nova\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Odpri...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Od&pri konfliktno datoteko..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Odpri pro&jekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "S&hrani projekt..." @@ -162,1857 +164,1866 @@ msgid "Recent Projects" msgstr "Nedavni projekti" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "I&zhod" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Uredi" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Monosti..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Pogled" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Izberite &pisavo..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Uporabite privzeto pi&savo" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Orodna vrstica" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Ni" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Male ikone" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Velike ikone" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "&Statusna vrstica" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Ta&bulatorska vrstica" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Jezik..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Orodja" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtri..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Generiraj paket..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Raziritve" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Rono razpakiranje" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Samodejno razpakiranje" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Uredi v arhiverju" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Ponovno naloi raziritve" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Razhroevanje" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Naloi nastavitev..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Ponastavi nastavitve" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&Okna" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "Z&apri" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Zapri &vse" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Zamenjaj &panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Vodoravna &okna" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Navpina &okna" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "Kaskadna &okna" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Pomo" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge pomo\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "&Opomba o izdaji" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Prevodi..." -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&Nastavitve" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Podpora arhiviranju onemogoena" -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU Javna licenca" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&O orodju WinMerge" -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "L&evo samo za branje" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "De&sno samo za branje" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Kodiranje datoteke" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Oznai &vse\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Prikai &identiene predmete" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Prikai &razline predmete" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Prikai l&eve unikatne predmete" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Prikai d&esne unikatne predmete" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Prikai &preskoeene predmete" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Prikai &binarne datoteke" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Prikai skri&te predmete" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Primerjaj &statistiko" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Osv&ei\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Osvei izbrano\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "Z&drui" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Pr&imerjaj\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Naslednja razlika\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Predhodna razlika\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Prva razlika\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Trenutna razlika\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Zadnja razlika\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiraj &desno\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiraj &levo\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Izbrii\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Prilagodi stolpce..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Izdelaj &poroilo" -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Shrani\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Shrani &levo datoteko" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Shrani" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Shrani &kot..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Shrani &desno" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Natisni" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Nastavitev &strani" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "&Predogled tiskanja" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Pretvori konec vrstice v" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Okna (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Zdruevalni nain\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "De&kodiranje datoteke..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Razveljavi\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Uveljavi\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Od&rei\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Kopiraj\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Prilepi\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Izberite vrstilno &razliko\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Najdi...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "Zamen&jaj...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Skripte" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Prazno >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Napredno" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiraj z tevilkami vrstic\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Zaznamki" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Zamenjaj zaznamke\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Naslednji zaznamek\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Prejnji zaznamek\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Zbrii vse zaznamke" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "Pojdi &na...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "Po&veaj" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Po&veaj\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Poman&jaj\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Izvorna velikost\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Oznaevanje sintakse" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "Za&kleni panele" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Preglej prazne prostore" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Prikai razl&ike vrstic" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Prikai tevilke &vrstic" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Prikai &robove" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "Pr&elomi vrstice" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "Zam&enjaj panele" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Panel &razlika" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Panel &poloaja" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Kopiraj de&sno in nadaljuj..\tAlt+Ctrl+desno" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiraj le&vo in nadaljuj\tAlt+Ctrl+levo" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Kopiraj vse v des&no" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Kopiraj vse v &lev&o" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&dodatki" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Prime&rjaj" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Primer&jaj posebno" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Iz leve na desno" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "Z l&evo na..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Od Desne na levo" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "Z d&esni na..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Pre&makni" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Z levi na..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Z desne na..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Izbrii" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Levo" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Desno" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Oboje" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "P&reimenuj" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Skrij predmete" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&Odpri levo" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Odpri desno" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Kopiraj &imena poti" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Levo (%1 od %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Desno (%1 od %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Oba (%1 od %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Kopiraj &imena datotek" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Levo... (%1 od %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Desno...(%1 od %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Oba...(%1 od %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Razlike... (%1 od %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Osvei" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Kopiraj polno pot" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopiraj &ime datoteke" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Pred-nastavljene nastavitve" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Brez pred-nastavitev" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Samodejne pred-nastavitve" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Pojdi &na razliko" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "Ne premikaj blokov" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Vsi premaknjeni bloki" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Premakni blok &za izbrano razliko" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "O orodju WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Zasebna gradnja)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Vse pravice pridrane" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Obii WinMergino domao stran" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "Vredu" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Donatorji" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Izberite datoteke ali mape" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Levo" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Brskaj..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Desni panel:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&Brskaj..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Iz&beri..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Arhiver:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Izberi..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Vkljui podmape" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Preklii" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Pomo" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Datoteke ali mape za primerjavo" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Vizualni izvorna varnost" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Podatkovna baza:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Uporabnik:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Geslo:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Povei z ciljem VSS projekta" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Uporabi na vseh predmetih" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Preveri" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Shrani kot..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Izbor programa:" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Izbor programa:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Pot do cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Splono" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Samodejno &pojdi na prvo razliko" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Onemogoi uvodni zaslon" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "Zapri okno z tipko &ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "&Samodejno preveri pot v odprtem dialogu" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Dovoli &samo en primer za izvajanje" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "&Upraaj predno zapre vekratna okna" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "&Zadri as datoteke v primerjavi datoteke" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "Odpri dialog samodejne &dovritve" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Omogoi vekratno primerjanje oken za" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Primerjava &map" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Primerjva &datotek" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" "WinMerge omogoa skrivanje skupnih sporoilnih okvirjev.\n" "Pritisnite gumb za ponovni zagon, da bodo postala vsa sporoilna okna vidna." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Ponastavi" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Jezik" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Razpololjivi jeziki" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Najdi" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Kaj naj iem:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Ujemanje samo &celih besed" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Ujemanje z primerom" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Stalen izraz" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "Ne prelomi konec datoteke" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Smer" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Gor" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Dol" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Najdi naslednje" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Zamenjaj" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Zamenjaj z:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Brez preloma konca datoteke" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Zamenjaj v" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Izbor" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "&Cela datoteka" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Zamenjaj" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Zamenjaj &vse" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Racionalno jasen primer" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Preveri" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Komentarji" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Ponovno preveri" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Vrstini filtri" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Omogoi vrstine filtre" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Pravilni izrazi(eden na vrstico): " -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Shrani" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nova" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Uredi" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Odstrani" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Barve" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Razlike" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Izbrane razlike" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Ozadje" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Izbrisano" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Besedilo" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Zanemarjene razlike:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Premaknjeno:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Izbrano premaknjeno:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Besedna razlika" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Izbrane razlike besed:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Privzeto" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistem" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Premakni izbrisane datoteke v ko" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integracija" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Dodaj v Explorerjev kontekstni meni." -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Omogoi &napredni meni" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "Privzeto vkljui podmape" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "&Zunanji urejevalnik:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filter mape:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "B&rskaj.." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Zaasna datotena mapa" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "S&istemska zaasna mapa:" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Mapa po meri" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Br&skaj" -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Generator paketov" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Datoteka&1" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Datoteka&2" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Zamenjaj" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Dodaj k obstojei datoteki" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Rezultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "St&il" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Vsebina" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Praznine" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&Primerjaj" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Zanemari &spremembe" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ignoriraj &vse" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "&Ignoriraj prazne vrstice" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "&Razlikuj m/v rke" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "&Vkljui glavno vrstico" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Odpri v zunanjem urejevalniku" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Prikai kolone" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Premakni &gor" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Premakni &navzdol" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Izberite orodje za odpakiranje" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Arhiver datoteke:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Prikai vsa orodja za stiskanje, ne preverjaj ekstenzije" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Popis ekstenzij" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Opis:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Napredek primerjanja map" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Ustavi" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Primerjanje predmetov..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Predmeti primerjani:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Predmeti skupaj:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Pojdi na" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Pojdi &na:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Datoteka" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "V datoteki" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&Vrstica" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Razlika" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "Pojdi &na" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Primerjaj" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Presledki" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Primerjaj" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignoriraj spremembe" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ig&noriraj vse" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignoriraj prazne &vrstice" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Zanemari &primere" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "&Zanemari razlinost vrnitev oznak zakljuka (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Omogoi &razlikovanje premaknjenih blokov" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Oznai enake vrstice" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "&Zanemari razlike manje od 3 sekund" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Metoda za primerjanje dototek:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Ustavi na prvi razliki" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtriraj komentarje" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Urejevanlnik" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Poudari skladnjo" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Samodejno ponovno iskanje" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Obdri izvorni nain oznaevanje" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulatorji" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Velikost tabel" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Vstavi tabele" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&Vstavi presledeke" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Obarvaj razlike v vrstici" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Poglej vrstiene razlike" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&Znaajski nivo" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&Nivo besede" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Datoteni filtri" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Test" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Namesti..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Nova..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Uredi..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Izbrii..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Shrani spremenjene datoteke?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Leva stran datoteke" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Shrani spremembe" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Zavri spremembe" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Desna stran datoteke" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Shrani spremembe" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Zavri spremembe" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Zavri vse" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Kodna tabela" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Standartna kodna tabela" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Izberi splono kodno tabelo ko se nalagajo non-Unicode datoteke:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2021,45 +2032,45 @@ msgstr "" "Zaznaj kodno tabelo za te dateteke: .html, .rc, .xml \n" "Potreben je ponoven zagon seje " -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Sistemska kodna tabela" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Po mnenju WinMerge uporabnikega vmesnika" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Po meri narejena kodna tabela" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Arhivna podpora onemogoena" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Ni mogoe zaznati 7-zip verzijo (ni nameena?)" # Removed \n because of lack of space! -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "Delo z arhivi zahteva program 7-Zip 3.11 ali njegovo novejo razliico nameeno na vaem raunalniku" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Nameeni morajo biti tudi pravi vmesniki (Merge7z*.dll) na poti do njega" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2068,12 +2079,12 @@ msgstr "" "Prosim, uporabite razliico programa 7-Zip nijo verzijo, dokler ne bodo dostopne nove raziritve\n" "razliice postanejo razpololjive" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Verzija" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2082,54 +2093,54 @@ msgstr "" "Potreben vtinik\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Priporoljiva verzija 7-zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "Predstavlja" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Zdrui 7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip programska oprema je nameena na raunalniku:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "Ni" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "pogrean" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponente za samostojno delovanje:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "Zastarelo" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Pot do vmesnikov" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2138,488 +2149,499 @@ msgstr "" "Ne prikai ponovno tega sporoila.\n" "(Vedno lahko dostopate do tega sporoila iz menija pomo.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Prenos vtinikov" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Opcije" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategorije" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Uvozi..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Izvozi..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Kljune Besede:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Imena funkcij:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Komentarji" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "tevilke:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatorji" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Nizi" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocesirano" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Uporabnik 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Uporabnik 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Odebeljeno" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Poroilo primerjanja datotek" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Poroilo &datoteke:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Brskaj..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiraj v medpomnilnik" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Skupni ali privatni filter" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Kateri tip filtra elite ustvariti" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Deljen filter (za vse uporabnike na tem raunalniku)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Zasebni filter (samo za doloene uporabnike)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Podpora arhivom" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Arhivna podpora zahteva 7-zip nameen vtinik:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Prenosi 7-zip vtinik" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Omogui delo z &arhivi" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Uporabi standardni 7-zip e je razpololjiv" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "&Uporabi lokalni 7-zip iz WinMerge mape" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Razberi tip arhiva iz podpisa datoteke" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Preimerjaj statistiko" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Mape:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Datoteke:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Razlika" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Besedilo:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binarno:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unikat" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Levo:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Desno:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identino" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Celotno:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Zapri" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Spremembe" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(spremembe)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Izberi kodno tabelo za" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Nalaganje datoteke:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Shranjevanje &datoteke:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Uporabi enako kodno tabelo za oba" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Uporabi" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Preklii" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testni filter" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testiranje filtra..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Vnos besedila za testiranje:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Ime mape" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Rezultat:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Test" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Zapri" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Uporabi izbrane barve besedila" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Izbrane barve besedila" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Skriti znaki in razmaki:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Stalno besedilo" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Izbira:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Poti" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Samo za branje" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Samo za branje" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Odpri.." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Shrani" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Varnostne datoteke" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Ustvari varnostne datoteke v:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Ustvari varnostne datoteke v:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Izvorna datotena mapa" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Globalna varnostna mapa:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Naziv varnostne datoteke" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Dodaj .bak ekstenzijo" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "&Dodaj datum in as " -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Potrdi klopiranje" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Ali ste prepriani, da elite kopirati XXX predmete?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Z leve" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Na desno" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Da" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Ne" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040904e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x407, 1250" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Pripravljen" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2628,7 +2650,7 @@ msgstr "" "Ustvari prazne dokumente\n" "Novi dokumenti (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2637,7 +2659,7 @@ msgstr "" "Odpri obstoji dokument\n" "Odpri (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2646,7 +2668,7 @@ msgstr "" "Zapri aktiven dokument\n" "Zapri" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2655,7 +2677,7 @@ msgstr "" "Shrani aktivni dokument\n" "Shrani (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2664,7 +2686,7 @@ msgstr "" "Shrani aktivni dokument pod novim imenom\n" "Shrani kot" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2673,7 +2695,7 @@ msgstr "" "Spremeni nastavitve tiskanja\n" "Nastavitev strani" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2682,7 +2704,7 @@ msgstr "" "Zamenjajte tiskalnik in tiskalnike nastavitve\n" "Nastavitve tiskanja" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2691,7 +2713,7 @@ msgstr "" "Natisni aktivni dokument\n" "Natisni" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2700,12 +2722,12 @@ msgstr "" "Prikai vse strani\n" "Predogledled tiskanja" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Naredi vse skrite predmete ponovno vidne" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2714,32 +2736,32 @@ msgstr "" "Odpri datoteko projekta\n" "Datoteka projekta (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Neznana napaka pri odpiranju datoteke projekta" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Neznana napaka pri shranjevanju datoteke projekta" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Datoteka projekta" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Projektna datoteka uspeno naloena" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Projektna datoteka uspeno shranjena" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2748,7 +2770,7 @@ msgstr "" "Shrani izbrano pot in monosti v projektno datoteko\n" "Shrani projektno datoteko" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2757,7 +2779,7 @@ msgstr "" "Prikai informacije o programu, verziji in avtorske pravice\n" "O programu" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2766,27 +2788,27 @@ msgstr "" "Zapri aplikacijo; opozori shranjevanje dokumentov\n" "Izhod" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Odpri to datoteko" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2795,7 +2817,7 @@ msgstr "" "Preklopi na naslednji okenski panel\n" "Naslednji panel" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2804,7 +2826,7 @@ msgstr "" "Preklopi nazaj na predhodni okenski panel\n" "Predhodni panel" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2813,7 +2835,7 @@ msgstr "" "Zarvrsti okna kaskadno\n" "Kaskadno" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2822,7 +2844,7 @@ msgstr "" "Uredi okna vodoravno, brez prekrivanja\n" "Okna vodoravno" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2831,7 +2853,7 @@ msgstr "" "Uredi okna vertikalno, bez prekrivanja\n" "Okna vertikalno" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2840,7 +2862,7 @@ msgstr "" "Kopiraj izbrano in odloi na odloie\n" "Kopiraj" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2849,7 +2871,7 @@ msgstr "" "Izrei izbrano in odloi na odloie\n" "Izrei" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2858,7 +2880,7 @@ msgstr "" "Najdi specifino besedilo\n" "Najdi" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2867,7 +2889,7 @@ msgstr "" "Vstavi vsebino odloia\n" "Prilepi" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2876,7 +2898,7 @@ msgstr "" "Ponovi zadnjo operacijo\n" "Ponovi" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2885,7 +2907,7 @@ msgstr "" "Zamenjaj specifieeno besedilo z druganim besedilom\n" "Zamenjaj" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2894,7 +2916,7 @@ msgstr "" "Izberi celotni dokument\n" "Oznai vse" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2903,7 +2925,7 @@ msgstr "" "Razveljavi zadno operacijo\n" "Razveljavi (Ctrl+Z)" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2912,7 +2934,7 @@ msgstr "" "Ponovi prejnjo neizvedeno akcijo\n" "Ponovi(Ctrl+Y)" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2921,7 +2943,7 @@ msgstr "" "Skrij ali prikai orodno vrstico\n" "Orodna vrstica" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2930,7 +2952,7 @@ msgstr "" "Skrij ali prikai statusno vrstico\n" "Statusna vrstica" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2939,7 +2961,7 @@ msgstr "" "Skrij ali prikai tabulatorsko vrstico\n" "Tabulatorska vrstica" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2948,57 +2970,57 @@ msgstr "" "Samodejno poveaj panel\n" "Zakleni panel" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Spremeni velikost okna" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Spremeni pozicijo okena" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Zmanjaj okno na velikost ikone" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Poveaj okno v najvejo velikost" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Preklopi na naslednjo okno dokumenta" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Preklopi na prejnje okno dokumenta" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Zapri vsa aktivna okna in opozori na shranjevanje dokumenta" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Vrni okno na normalno velikost" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Aktivni list opravil" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktiviraj to okno" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3007,7 +3029,7 @@ msgstr "" "Zapri monost predogleda tiskanja\n" "Zapri predogled" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3026,7 +3048,7 @@ msgstr "" "WinMerge.Primerjava datotek\n" "WinMerge primerjava datoteke" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3045,23 +3067,23 @@ msgstr "" "WinMerge.Primerjava map\n" "WinMerge primerjalna mapa" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Zadri izvorne znake EOL" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Pritisni poljubno tipko" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Desni klik na pot za kopiranje" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "" "Developers:\n" @@ -3070,152 +3092,152 @@ msgstr "" "Razvijalci:\n" "Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge je program brez GARANCIJE. To je brezplana programska oprema, izdana pod GNU licenco.Ve podatkov najdete v meniju pomo." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Vredu" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Prekini" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Poskusi ponovno" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Prezri" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Prezri &vse" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Da" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Da za &vse" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Ne" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Ne za &vse" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Nadaljuj" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Preskoi" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Preskoei &vse" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Tega sporoila ne kai ve." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Ne vpraaj ve tega." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Barve sintakse" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Barve besedila" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Razliica nadzora" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Do:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Iz leve:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Na levo:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Iz desne:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Na desno:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Razliica %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Monosti (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Vsa sporoilna okna so sedaj ponovno prikazana " -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "Ta izbrana sprememba pisave ne bo uporabljena na katerikoli vidni spremembi" -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3226,7 +3248,7 @@ msgstr "" "\n" "Prosimo koristite vrednosti 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3237,127 +3259,129 @@ msgstr "" "\n" "Prosim ponovno zaenite WinMerge po ponastavitvi" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Odpri" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programi|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Vse datoteke (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Datoteke WinMerge projekta(*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Mone datoteke (*.ini)|*.ini|All Files (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Besedilne datotke (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML datoteke (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML datoteke (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Popolna vsebina" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Hitra vsebina" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Datum spemembe" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Sprememba datuma in velikosti" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Velikost" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Ime" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Lokacija" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtri" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Opis" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Izberi ime datoteke za nov filter" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Datoteke filtrov (*.flt)|*.flt|Sve datoteke (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3370,7 +3394,7 @@ msgstr "" "Prosimo, kopirajte datoteko %1 v WinMerge/Filters -mapo:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3383,7 +3407,7 @@ msgstr "" "\n" "Preverite e mapa obstaja in je zapisljiva." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3394,7 +3418,7 @@ msgstr "" "\n" "Prosim izberite filter mape v monosti/Sistem." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3407,12 +3431,12 @@ msgstr "" "\n" "Morda je datoteka zaitena - samo za brananje." -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Lociraj filter datoteko za nameanje" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3423,208 +3447,223 @@ msgstr "" "\n" "Ni mogoe kopirati nove filter datoteke v filter mapo." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filter datoteka e obstaja. Prepiem obstojei filter." -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Reden izraz" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Pot do cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Pot do SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Rezultati primerjanja map" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Primerjanje map" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Levi neimanovan" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Desni neimenovan" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Njihova datoteka" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Moja datoteka" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Preii datoteko..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Odpiranje izbranega" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopiraj z leve na desno" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopiraj iz desne na levo" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopiraj vse na levo" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopiraj vse na desno" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopiranje datotek..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Brisanje datotek..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Premikanje datotek..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Izdelava poroila..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Vr: %s St: %d/%d znak: %d/%d mesto: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Vrstica: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Vr: %s St: %d/%d Zn: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Zdrui" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Razlika %1 od %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "Najdena razlika: %1" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "Najdena razlika: 1" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Predmet %1 od %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Predmet: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Izberi dve obstojei mapi ali datoteki za primerjavo" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Izbira map" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Izberi dve mapi ali dve datoteki za primerjavo." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Leva pot je neveljavna" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Desna pot je neveljavna" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Obe poti sta neveljavni" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Izberi dve datoteki,da boste omogoili izbiro arhiverja" -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Ni mogoe primerjati datoteke in mape!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Datoteka ni najdena: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Datoteka ni razpakirana: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3637,12 +3676,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Spodletelo razlenjevanje konfliktne datoteke." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3653,32 +3692,32 @@ msgstr "" "%1\n" "ni konfliktna datoteka." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Shrani kot" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Shrani spremembe v %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 je samo za branje. Ali elite prepisati to datoteko? ( Ne za shranjevanje pod novim imenom)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Napaka pri preverjanju cilja monosti zapisovanja" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Napaka pri shranjevanju arhive" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3691,7 +3730,7 @@ msgstr "" "\n" "Vseeno nadaljujem?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3708,7 +3747,7 @@ msgstr "" "\t- uporabiti razlino ime datoteke (pritisnite Vredu)\n" "\t- preklicati trenutno operacijo (pritisnite Preklii)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3723,7 +3762,7 @@ msgstr "" "\n" "Ali elite shraniti nezapakirano razliico v drugo datoteko?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3738,7 +3777,7 @@ msgstr "" "\n" "Ali elite shraniti nezapakirano razliico v drugo datoteko?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3753,7 +3792,7 @@ msgstr "" "\n" "Prepii spremenjeno datoteko?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3762,7 +3801,7 @@ msgstr "" "%1\n" "je oznaena samo za branje.elite prepisati predmet samo za branje?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3777,17 +3816,17 @@ msgstr "" "\n" "e elite posodobiti datoteko, zaprite trenutno datoteko za primerjavo in jo ponovno naloite." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Shrani levo datoteko kot" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Shrani desno datoteko kot" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3798,42 +3837,42 @@ msgstr "" "\n" "Osveite dokumente predno nadaljujete." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Navesti morate pot SourceSafe projekta e elite nadaljevati (ie: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Preveri datoteke iz VSS ..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versioning System je vrnil napako medtem ko je poskual preveriti datoteko. Ni mogoe nadaljevati..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Napaka pri izvrevanju sistemskega ukaza." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS delovna mapa in lokacija izbrane mape se ne ujemata. Nadaljujem?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "VSS podatkovna baza ni najdena!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Napaka od VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3844,7 +3883,7 @@ msgstr "" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda.\n" " Zavrzi pregledno operacijo?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3853,170 +3892,169 @@ msgstr "" "Versioninh System vraa napako med preverjanjem datoteke.\n" "Prosim preverite nastavitvene specifikacije uporabljenega pogleda" -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Prazno" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (manji od 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 in viji)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Prelomi na praznini" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Prelomi na praznini ali loilu" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiraj izbran predmet v imenovano mapo" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiraj izbran predmet v izbrano mapo" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Izbrii izbran predmet na levi" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Izbrii izbran predmet na desni" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Izbrii izran predmet na obeh straneh" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Skrij izbran predmet(e) (na filtru)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Preimenuj izbran predmet na obeh straneh" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Od desne proti levi (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Od leve proti desni (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Od desne proti levi (%1 od %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Od leve proti desni (%1 od %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Leva do...(%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Desna do...(%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Leva do...(%1 od%2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Desna do...(%1 od%2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Leva (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Desna (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Obe (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Leva (%1 of %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Desna (%1 of %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Obe (%1 of %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Izberi ciljno mapo" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Leva stran- izberi ciljno mapo:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Desna stran- izberi ciljno mapo:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Datoteke simulirano)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 of %2 datotek simulirano)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4028,17 +4066,17 @@ msgstr "" "%1\n" "Izbrisati?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Ali ste prepriani da elite kopirati:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Ali ste prepriani da elite kopirati %d predmetov:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4057,458 +4095,473 @@ msgstr "" "\n" "Osveite primerjavo." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Odpri levo datoteko" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Odpri levo datoteko v zunanjem urejevalniku" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Odpri levo datoteko z..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Odpri desno datoteko" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Odpri desno datoteko v zunanjem urejevalniku" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Odpri desno datoteko z .." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Ni bilo mogoe zagnati zunanjega urejevalnika: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Nepoznana ekstenzija na zunanjem urejevalniku: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiraj imena datotek v odloie" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiraj levo stran poti v odloie" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiraj desno stran poti v odloie" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiraj pot obeh strani v odloie" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Nepoznan format arhiva" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Dodaj predmete iz leve strani v arhiv" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Dodaj predmete iz desne strni v arhiv" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Dodaj predmete obeh strani v arhiv" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Dodaj razline predmete v arhiv ( obe strani)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Premakni izbrano datoteko na levi v izbrano mapo" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Premakni izbrano datoteko na desni v izbrano mapo " -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Ime datoteke" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Mapa" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Rezultat primerjave" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Levi datum" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Desni datum" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Raziritev" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Leva velikost" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Desna velikost" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Desna velikost (kratko)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Leva velikost (kratko)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Datum nastanka leve datoteke" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Datum nastanka desne datoteke" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Noveja datoteka" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Verzija leve datoteke" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Verzija desne datoteke" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Kratek rezultat" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Levi atributi" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Desni atributi" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Konec dela levo" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Konec dela desno" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Kodiranje levo" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Kodiranje desno" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Zanemari razlike" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Razlike" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binarno" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Ni mogoe primerjati datotek" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Predmet prekinjen" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Preskoena datoteka" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Skrajaana map" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Samo leva: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Samo desna: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Binarni datoteki sta identini" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Binarni datoteki sta razlini" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Datoteki sta razlini" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Samo leva" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Samo desna" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Napaka" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Potekel as: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 predmet oznaen" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 predmetov oznaenih" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Ime datoteke ali mape" -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Imena podmap kadar so vkljuene podmape" -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Rezultat primerjave, dolga oblika" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Leva stran datum spremembe" -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Desna stran datum spremembe" -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Datotene raziritve" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Velikost leve datoteke v bajtih" -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Velikost desne datoteke v bajtih" -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Skrajaana leva datoteka" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Skrajana desna datoteka" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Leva stran datum nastanka" -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Desna stran datum nastanka" -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Pove katera stran ni e nikoli modificirala datuma" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Verzija leve datoteke, samo za nekatere datotene tipe." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Verzija desne datoteke, samo za nekatere datotene tipe" -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Rezultat kratke primerjave" -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Atributi leve strani" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Atributi desne strani" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Leva stran datoteke EOL tipa" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Desna stran datoteke EOL tipa" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Kodirana leva stran" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Kodirana desna stran" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "tevilo ignoriranih razlik v datoteki. Te razlike so ignorirane iz strani WinMerge-a in ne morejo biti zdruene" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "tevilo razlik v datoteki. Ta tevilka na vsebuje ignoriranih razlik" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Prikae zvezdico (*) e je datoteka binarna" -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Primerjaj %1 z %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Seznam loen z vejico" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Seznam loen s tabulatorjem" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Enostavni HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Enostavni XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Poroilo datoteke e obstaja. Ali elite prepisati obstojeo datoteko?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4517,32 +4570,32 @@ msgstr "" "Napaka med ustvarjanjem poroila:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Poroilo je bilo uspeno izdelano." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Ista datoteka je odprta v obeh panelih" -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Izbrane datoteko so identine." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Prilo je do napake med primerjanjem datotek" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Zaasne datoteko ne morejo biti ustvarjene. Preverite nastavitve za vao zaasno pot." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4557,7 +4610,7 @@ msgstr "" "\n" "Opomba: e elite vedno obdrati razline prehode v drugo vrsto, izberite 'Prezri razlinost prehoda v drugo vrsto...' v tabulatorskem primerjanju nastavitev dialoga (dostopno pod Urajanje/Nastavitve." -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4568,22 +4621,22 @@ msgstr "" "Z trenutnimi opcijami, bodo nedefinirane v osnovnem tipu.\n" "Ali elite spremeniti opcije in prepreiti razline EOL ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Pojavila se je napaka med 'prediffing' datoteke '%1' z dodatkom '%2'. Prediffing se ne bo ve izvajal" -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Izbrana mapa je napana" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Ni mogoe odpreti binarne datoteke v urejevalniku" -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4598,7 +4651,7 @@ msgstr "" "%1\n" "na drugi strani in odpreti to mapo?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4609,132 +4662,132 @@ msgstr "" "Prikaz posamezne datoteke v svoji kodni tabeli bo povzroilo boli prikaz toda zdruevanje/kopiranje bo nevarno.\n" "Ali elite tretirati,da sta obe datoteka vidna v isti privzeti windows kodni tabeli (priporoljivo)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Opozorilo: Datoteki uporabljata razlini kodiranji, levo=%s in desno=%s, in s spajanjem je mogoe izgubiti informacije" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informacija izgubljena pri kodiranju: Obe datatoteki" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informacija izgubljena pri kodiranju: desna datoteka" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informacija izgubljena pri kodiranju: leva datoteka" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Ni razlike" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Vrstine razlike" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Zamenjan %1 znak(i)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Ni mogoe najti znaka \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopiraj celotno pot" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopiraj ime datoteke" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Poloaj panela" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Razlika panelov" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Paketna datoteka je bila uspeno zapisana" -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. predmet ni najden ali pa je mapa" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. predmet ni najden ali pa je mapa" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Paketna datoteka e obstaja. Jo elite prepisati?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 datoteka izbrana]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normalno" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Sobesedilo" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Poenoteno" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Ni mogoe zapisato v datoteko %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Navedena izhodna pot ni absolutna pot: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Doloite izhodno datoteko" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Ni mogoe izdelati paketne datotek iz binarnih datotek" -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Ne morem izdelati paketne datoteke iz map" -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4745,17 +4798,17 @@ msgstr "" " \n" "Izdelava paketa zahteva, da so vse datoteke predhodno shranjene." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Mapa ne obstaja" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Trenutni rezultati primerjave map bodo izbrisani" -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4766,7 +4819,7 @@ msgstr "" "Vse rabljene komponente (7-zip in/ali Merge7z*.dll) za arhivno podporo ni mogoe najdti.\n" "Za ve informacij poglejte v rubriko pomo o podpori arhivom." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4775,7 +4828,7 @@ msgstr "" "\n" "Sporoilo: 7-Zip intergracija je onemogoena v WinMerge nastavitvah." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4784,37 +4837,37 @@ msgstr "" "\n" "Sporoilo: 7-Zip zdruitev je omejena na samostojno operacijo v WinMerge nastavitvah." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Izberi datoteko za izvoz" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Izberi datoteko za uvoz" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Monosti uvoene iz datoteko" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Monosti izvoene v datoteko" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Ni mogoe uvoziti monosti iz datoteke" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Ni mogoe zapisati monosti v datoteko" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4825,473 +4878,493 @@ msgstr "" "\n" "Ali elite nadaljevati?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Napaka algoritma" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Ni povezave" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Neveljaven reden izraz" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Neveljaven izbrani znak" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Neveljaven znak imena klase" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Znak \"\"" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Neveljavna zadnje priporoilo" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Naujemajoe: [ ali [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Naujemajoe: ( ali \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Naujemajoe: \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Neveljavna vsebina \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Nepravilno konno obmoje" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Pomankanje pomnilnika" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Napaen stalen izraz" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Predasen konec danega izraza" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Dani izraz je prevelik" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Naujemajoe ) ali \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Zahodna evropa" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Vzhodna Evropa" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Vzhodna azija" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Srednje vshodnjaki" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Ni primerno" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirilica" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabsko" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grko" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltski Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grko 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirilica" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turko" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugalsko" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islandski" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrejski" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Francoska Kanada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordijksi" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirilica CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grko 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Tajski" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japonski" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Poenostavljena Kitajina" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korejski" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Tradicionalno Kitajski" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirilica (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grki" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turki)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrejski" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabski" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltski Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamski" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Rimski" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grki" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirilica" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Centralno Evropski" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turki" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproksimacija ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproksimacija ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproksimacija ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproksimacija ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproksimacija ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Pomeano" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Shrani levo datoteko" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Shrani desno datoteko" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Shrani levo datoteko z imenom.." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Shrani desno datoteko z imenom..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Spremeni levo datoteko/mapo samo za branje" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Spremeni desno datoteko/mapo samo za branje" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Pretvori EOL v Windows nain" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Pretvori EOL v Unix nain" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Pretvori EOL v Mac nain" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Preklopi med urejevalnim in zdruevalnim nainom" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5300,12 +5373,12 @@ msgstr "" "Prikai in nastavi lastnosti datotenega kodiranja\n" "Datotene lastnosti kodiranja" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Odpri in razrei konfliktno datoteko" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5314,7 +5387,7 @@ msgstr "" "Izberi razlina polja v izbrani vrstici\n" "Razlike v izbrani vrstici." -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5323,7 +5396,7 @@ msgstr "" "Pojdi na vrstico razlike\n" "Pojdi na (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5332,7 +5405,7 @@ msgstr "" "Nastavi programske monosti\n" "Monosti " -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5341,37 +5414,37 @@ msgstr "" "Osvei prikaz\n" "Osvei (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopiraj izbrane vrstico v odloie z dodajanjem tevilk vrstic na zaetku vrstice" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Osvei izbrane predmete" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Preklopi med oznakami" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Pojdi na naslednjo oznako" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Pojdi na prejnjo oznako" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Poisti vse oznake" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5380,7 +5453,7 @@ msgstr "" "Prikai predmete, ki so popolnoma enaki\n" "Prikai identine predmete" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5389,7 +5462,7 @@ msgstr "" "Prikai predmete, ki se razlikujeta\n" "Prikai razline predmete" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5398,7 +5471,7 @@ msgstr "" "Prikai predmete, ki obstajajo samo na levi strani\n" "Prikai leve unikatne predmete" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5407,7 +5480,7 @@ msgstr "" "Prikai vrstice ki obstajajo samo na desni strani\n" "Prikai desne unikatne vrstice" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5416,7 +5489,7 @@ msgstr "" "Prikazovanje binarnih datotek\n" "Prikai binarne datoteke" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5425,7 +5498,7 @@ msgstr "" "Prikazovanje preskoenih predmetov\n" "Prikai preskoene predmete" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5434,7 +5507,7 @@ msgstr "" "Izberi pisavo za pogled\n" "Izberi pogled pisave" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5443,27 +5516,27 @@ msgstr "" "Vraanje na uporabo privzete sistemske pisave pogled\n" "Privzeta pisava" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Prikai znake in praznine" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Preklopi na drug panel" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Panel prikazuje poloaj razlike v datoteki" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Prikai primerjalno mapo statistinega okna" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5472,7 +5545,7 @@ msgstr "" "Izberite trenutni uporabniki jezik vmesnika\n" "Jezik" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5481,12 +5554,12 @@ msgstr "" "Prikai razlike znotraj vrstic z razlinimi barvami\n" "Prikai vrstiene razlike" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Med seboj zamenjaj pozicije panelov " -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5495,7 +5568,7 @@ msgstr "" "Prikai tevilke vrstic\n" "Prikaz tevilke vrstic" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5504,7 +5577,7 @@ msgstr "" "Omogoi prelom vrstic\n" "Prelom vrsrtic" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5513,22 +5586,22 @@ msgstr "" "Prikai izbiro robov za oba panela\n" "Prikai izbrane robove" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Poveaj pisavo besedila" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Zmanjaj pisavo besedila" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Ponastavi poveavo besedila na privzeto velikost" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5537,7 +5610,7 @@ msgstr "" "Skoi na prejnjo razliko\n" "Prejnja razlika (Alt+up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5546,7 +5619,7 @@ msgstr "" "Skoi na naslednjo razliko \n" "Naslednja razlika (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5555,7 +5628,7 @@ msgstr "" "Skoi na prvo razliko\n" "Prva razlika (alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5564,7 +5637,7 @@ msgstr "" "Pojdi na trenutno razliko\n" "Trenutna razlika (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5573,7 +5646,7 @@ msgstr "" "Pojdi na zadnjo tazliko\n" "Zadnja razlika (alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5582,7 +5655,7 @@ msgstr "" "Kopiraj izbrano besedilo v desno datoteko\n" "Kopiraj desno(Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5591,7 +5664,7 @@ msgstr "" "Kopiraj izbrano besedilo v levo datoteko\n" "Kopiraj levo(Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5600,7 +5673,7 @@ msgstr "" "Kopiraj razliko na desno in se pomakni na nasldenjo\n" "Kopiraj Desno in pomakni (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5609,7 +5682,7 @@ msgstr "" "kopiraj razliko na levo in se pomakni na naslednjo\n" "Kopiraj levo in pomakni(Ctrl+Ald+left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5618,7 +5691,7 @@ msgstr "" "Kopiraj vse razlike v desno datoteko \n" "Vse v desno" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5627,72 +5700,77 @@ msgstr "" "Kopiranje vseh razlik v levo\n" "Vse v levo" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Izbrii izbrane predmete iz obeh map" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Primerjaj izbrani predmet ( primerjaj prvi predmet e je izbranih ve)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Izberi in ponovno razvrsti mape primerjalnih stolpcev" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Izdelaj paketno datoteko " -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Izberi in spremeni filtre" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Izdelaj poroilo iz primerjalnih rezultatov" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Uporabnik izbere arhiver (razpakiranje ne deluje med primerjanjem map)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Prilagojen arhiver je uporaben na obeh datotekah(samo ena datoteka potrebuje raziritev)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Izberite arhiver za urejanje naslednje datoteke" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Brez datotek (obieajno)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Priporoljivi dodatki" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Ostali dodatki" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Ponovno naloi vse dodatke(za izdelovalce)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5701,12 +5779,12 @@ msgstr "" "Activira naslednjo vidno datoteko\n" "Aktiviraj naslednjo datoteko" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Zapri vsa odprta okna" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5715,22 +5793,22 @@ msgstr "" "Odpre WinMerge Pomo\n" "WinMerge Pomo" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Proizvedi trenutne informacije in nastavitve WinMerge v tekstovno datoteko " -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Prikai GNU javno licenco" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Zasebna gradnja:%1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5739,7 +5817,7 @@ msgstr "" "Odpri datoteko z opisom izdaje\n" "Opis izdaje" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5748,262 +5826,267 @@ msgstr "" "Odpri spleno stran za prevode\n" "Prevodi" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Nastavitve vmesnika" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Brez dodatkov" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediff e je mogoe" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH ni najden - .sct skripte onemogoene" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Odpri datoteko z registrirano aplikacijo " -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Odpri datoteko z zunanjim urejevalnikom" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Odpri datoteko z doloenim programom" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Ne prilai premaknjene bloke" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Prikai vse premaknjene bloke" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Prikai premaknjene bloke samo iz trenutnih razlik" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Pojdi na razliko pod kazalcem" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Pojdi &na razliko %1 od %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Pojdi &na vrstico %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Onemogoeno" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Iz sistemske datoteke" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "IZ MRU seznama" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Osnovno" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Paketen" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Prenosni objekti" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Viri" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Skrij orodno vrstico" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Pokai malo orodno vrstico" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Pokai veliko orodno vrstico" diff --git a/Src/Languages/Spanish.po b/Src/Languages/Spanish.po index de256aa4439..eeae1334d9a 100644 --- a/Src/Languages/Spanish.po +++ b/Src/Languages/Spanish.po @@ -73,7 +73,7 @@ msgstr "Cor&tar" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&Copiar" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "&Pegar" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "Ir &a..." @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "A&brir" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "con la Aplicacin &Registrada" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "con un Editor &Externo" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&con..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Archivo" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Nuevo\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "Abrir Archivo &Conflictivo..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "Abrir Pro&yecto...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "&Guardar Proyecto..." @@ -162,1855 +164,1864 @@ msgid "Recent Projects" msgstr "Proyectos recientes" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Salir" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Editar" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "Conf&iguracin..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Ver" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Seleccionar &Fuente..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Usar F&uente del Siste&ma" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Combinar" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Ninguno" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Pequeo" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Grande" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Barra de &estado" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "&Pestaas" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "Idi&oma..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Herramientas" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtros..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Crear correccin..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "Desempaquetado &manual" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "Desempaquetado &automtico" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Editar con desempaquetador" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&Recargar plugins" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Depurar" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&Cargar Configuracin..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&Restablecer Configuracin" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Ve&ntana" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Cerrar" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "Cerrar &Todas" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Cambiar &Panel\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "Ordenar &Horizontalmente" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "Ordenar &Verticalmente" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Superponer" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "A&yuda" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "Ayuda de &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "Notas de la V&ersin" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&Traducciones" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "C&onfiguracin" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Soporte de &archivos deshabilitado..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "Licencia Pblica General &GNU" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Acerca de WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Lado i&zquierdo slo lectura" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Lado d&erecho slo lectura" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "&Codificacin de archivo" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Seleccionar todo\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Mostrar elementos &idnticos" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Mostrar elementos &diferentes" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Mostrar elementos nicos en lado i&zquierdo" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Mostrar elementos nicos en lado &derecho" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Mostrar elementos i&gnorados" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "Mostrar archivos &binarios" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Mostrar elementos &ocultos" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Estadsticas de &comparacin" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Actualizar\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Actualizar seleccionados\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Combinar" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "Co&mparar\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "Diferencia &siguiente\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "Diferencia &anterior\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&Primera diferencia\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "Diferencia a&ctual\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "<ima diferencia\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Copiar al lado De&recho\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Copiar al lado Izqui&erdo\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Borrar\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Personalizar columnas..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Generar Info&rme..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Guardar\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Guardar lado &Izquierdo" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Guardar" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Guardar &como..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Guardar lado &Derecho" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Imprimir..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Configurar &pgina" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "&Vista preliminar" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Convertir Saltos de Lnea a" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Modo &Combinacin\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "Codi&ficacin de archivo..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "Des&hacer\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Rehacer\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "Cor&tar\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&Copiar\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Pegar\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Seleccionar dif. de &lnea\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Buscar...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "R&eemplazar...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "Scri&pts" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Vaco >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "A&vanzado" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Copiar con Nmeros de Lnea\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Marcadores" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "Al&ternar marcador\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "Marcador siguie&nte\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "Marcador &anterior\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "Quitar todos los mar&cadores" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Ir a...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Zoom" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "A&cercar Zoom\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "A&lejar Zoom\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Destacar sintaxis" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "B&loquear paneles" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Mostrar &espacios" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Mostrar diferencias de &lnea" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Ver &nmeros de lnea" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Ver &mrgenes" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "&Ajuste de lnea" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "&Intercambiar paneles" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Panel de di&ferencias" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Panel de &posicin" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "Copiar al lado D&erecho y avanzar\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Copiar al lado I&zquierdo y avanzar\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Copiar todas al lado De&recho" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Copiar todas al lado Iz&quierdo" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Precomparacin" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Com¶r" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Co&mparacin especial" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Izquierda a Derecha" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "I&zquierda a..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Derecha a Izquierda" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "D&erecha a..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Mover" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Izquierda a..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Derecha a..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Eliminar" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Derecha" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Izquierda" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Ambos" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Re&nombrar" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Ocultar elementos" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "Abrir archivo &Izquierdo" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "Abrir archivo &Derecho" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Copiar nombres de &ruta" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Izquierda (%1 de %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Derecha (%1 de %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Ambos (%1 de %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Copiar nombres de &archivos" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Izquierda... (%1 de %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "De&recha... (%1 de %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Ambos... (%1 de %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Diferencias... (%1 de %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "Actualiza&r" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "&Copiar ruta completa" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Copiar &nombre de archivo" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Config. precomparacin" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "Si&n precomparacin" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Auto precomparacin" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "Ir a &diferencia" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&No mostrar bloques movidos" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "Most&ar todos los bloques movidos" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Mostrar bloques movidos desde la dif. a&ctual" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Acerca de WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Compilacin Privada)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Derechos reservados." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Visite la Web de WinMerge!" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "Aceptar" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Colaboradores" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Seleccione archivos o carpetas..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Izquierda:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Examinar..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Derecha:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "E&xaminar..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filtro:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Seleccionar..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "Desem&paq.:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "&Seleccionar..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Incluir subcarpetas" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Estado:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Cancelar" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Ayuda" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Objetos para Comparar" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Base de datos:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Proyecto:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Usuario:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Contrasea:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Enlazar a proyecto VSS destino" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Aplicar a todos los elementos" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Desproteger" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Guardar como..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Sistema de versionado" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "Sistema de &versionado:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Ruta a cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "General" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "Mover&se automticamente a la primera diferencia" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "No mostrar pantalla de bienveni&da" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "C&errar ventanas con ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verificar rutas &automticamente en la ventana de apertura" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Permitir s&olo una instancia en ejecucin" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "Preguntar al cerrar &mltiples ventanas" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "Mantener la hora en el archivo com¶do" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "A&uto-completar en dilogos de apertura:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Habilitar mltiples ventanas de comparacin para" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Comparacin de &carpetas" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Comparacin de &archivos" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge permite ocultar algunos mensajes comunes. Pulse Restablecer para hacer todos los mensajes visibles de nuevo." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "Restablecer" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Idioma" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Idiomas disponibles:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Buscar" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&Buscar:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Slo palabras &completas" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Coincidir &MAYSCULAS/minsculas" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "E&xpresin regular" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "N&o sobrepasar fin de archivo" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Direccin" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Arriba" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "A&bajo" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "Buscar &sig." -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Reemplazar" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Reem&plazar con:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "&Detenerse al final del archivo" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Reemplazar en" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Seleccin" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "T&odo el archivo" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Reemplazar" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Reempl. Tod&o" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Desproteger" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Comentarios" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Proteger despus de desproteger" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Filtros de lnea" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Permitir filtros de lnea" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Expresiones regulares (una por lnea):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Guardar" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Nuevo" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "Editar" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Eliminar" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Colores" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Diferencia:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Diferencia seleccionada:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Fondo" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Eliminada" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Texto" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Diferencia ignorada:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Movida:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Movida Seleccionada:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Diferencia de palabra:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Dif. de palabra sel.:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Predeterminada" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dilogo" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "Sistema" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Enviar archivos borrados a la Papelera de reciclaje." -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integracin" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "&Aadir al men contextual del explorador." -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "Habilitar men ava&nzado" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "In&cluir subcarpetas por defecto" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "Editor &externo:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filtrar carpetas:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Examina&r" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Carpeta de archivos temporarios" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "Carpeta temp del s&istema" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "Carpeta personal:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Examinar..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Generar correccin" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Archivo &1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Archivo &2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "&Intercambiar" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "&Anexar a archivo existente" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultado:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Formato" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "Es&tilo:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "&Contexto:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Espacios en blanco" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "Co&mparar" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "I&gnorar cambios" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ig&norar todos" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorar ln&eas en blanco" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Coincidir MA&Y./min." -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Incluir lnea de coman&do" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "Abrir en editor e&xterno" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Mostrar Columnas" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "&Arriba" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "A&bajo" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Seleccionar Desempaquetador" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Desempaquet.:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Mostrar todos los desempaquetadores, no comprobar exts." -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Extensiones:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Descripcin:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " Progreso de comparacin de carpetas" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Detener" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Comparando elementos..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Elementos comparados:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Total:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "Ir a" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "Ir a:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Archivo" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "Objetivo" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "L&nea" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Diferencia" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "Ir &a" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Comparar" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Espacios en blanco" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "&Comparar" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorar cambios" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "I&gnorar todos" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorar diferencias de lneas &vacas" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "Ignorar MAYSCULAS/mins&culas" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rar saltos de lnea diferentes (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "Habilitar detecci&n de bloques movidos" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Co&mbinar con lneas similares" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orar diferencias de tiempo menores de 3 segundos." -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "Com¶r:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "&Parar despus de la primera diferencia" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filtrar comentarios" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "Resaltar sinta&xis" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "&Actualizacin automtica" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "&Preservar caracteres EOL originales" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabulaciones" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tamao de tab.:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&Insertar tabulaciones" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Insertar e&spacios" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Coloracin de las diferencias de lnea" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Ver diferencias de lnea" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "A nivel de &caracter" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "A nivel de &palabra:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filtros de archivo" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Probar" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Instalar..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Nuevo..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Editar..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Eliminar..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Guardar archivos modificados?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Archivo en lado Izquierdo" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Guardar cambios" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Descartar cambios" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Archivo en lado Derecho" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "Gu&ardar cambios" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Des&cartar cambios" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Descartar todo" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Pgina de cdigos" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Pgina de cdigo predeterminada" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Seleccione la pgina de cdigos predeterminada a utilizar cuando se carguen archivos no Unicode:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2019,32 +2030,32 @@ msgstr "" "Detectar pgina de cdigos para stos archivos : .html, .rc, .xml \n" "Es necesario reiniciar." -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "Pgina de cdigos del sistema" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "La misma que la interfaz de usuario de WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Pgina de cdigos:" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Soporte de archivos deshabilitado" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Imposible detectar la versin de 7-Zip (no instalado?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2053,12 +2064,12 @@ msgstr "" "El soporte de archivos requiere 7-Zip o posterior instalado en su PC, o sus \n" "componentes esenciales copiados en la carpeta del programa para operar en solitario." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Adems debe haber un plugin de interface apropiado (Merge7z*.dll) en la ruta." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2067,12 +2078,12 @@ msgstr "" "Por favor, use la versin de 7-Zip recomendada debajo hasta que haya disponible \n" "una nueva versin del plugin de interface." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Versin" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2081,540 +2092,551 @@ msgstr "" "Plugin requerido\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Versin recomendada de 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "presente" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "Software 7-Zip instalado en su computadora:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "ninguno" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "falta" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "Componentes 7-Zip para op. en solitario:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "obsoleto" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins en la ruta:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "No mostrar este &mensaje de nuevo.\n(Puede volver a mostrar ste mensaje desde el men Ayuda.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Descarga de plugin" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Configuracin" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Categoras" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importar..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportar..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Palabras clave:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Nombres de funcin:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Comentarios:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nmeros:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operadores:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Cadenas:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocesar:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Usuario 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Usuario 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Negrita" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Informe de comparacin de carpetas" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Archivo de In&forme:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Examinar..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "E&stilo:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Copiar al Portapapeles" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Filtro Compartido o Privado" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Qu tipo de filtro quiere crear?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Filtro compartido (para todos los usuarios de esta mquina)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Filtro privado (solo para el usuario actual)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Soporte de Archivos" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "El soporte de archivos requiere el plugin de 7-Zip instalado:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Descargar plugin de 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Habilitar soport&e de archivos" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Utilizar 7-Zip en solitario si est disponible" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "Utilizar 7-Zip &local de la carpeta de WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detectar tipo de archivo por su firma" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Estadsticas de comparacin" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Carpetas:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Archivos:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Diferentes" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Texto:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binario:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "nicos" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Izquierda:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Derecha:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Iguales" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Total:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Cerrar" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Afecta" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Afecta)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Seleccione pgina de cdigos para" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Carga de archivos:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Guardado de archivo&s:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Usar la misma pgina de cdigos para ambos" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Aplicar" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Cancelar" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Prueba de filtro" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Probando filtro ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Texto a probar:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Nombre de carpeta" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultado:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Probar" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Cerrar" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Usar colores personalizados para el texto" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Colores elegidos para texto normal" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Espacio:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Texto normal:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Seleccin:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Rutas" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Sl&o lectura" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "S&lo lectura" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "Abrir..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Guardar..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Archivos de seguridad" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Crear archivos de seguridad en:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Crear archivos de seguridad en:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "Carpeta del archivo &original" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "Carpeta de copia de se&guridad:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Nombre de archivo:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Aadir extensin .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "Aadir &fecha" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Confirmar copia" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Est seguro que quiere copiar XXX elementos?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "De la Izquierda" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "A la Derecha" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "S" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "No" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "0c0a04e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0xc0a, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Listo" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "MAY" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2623,7 +2645,7 @@ msgstr "" "Crear documentos vacos\n" "Nuevo Documento (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2632,7 +2654,7 @@ msgstr "" "Comparar archivos o carpetas\n" "Comparar" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2641,7 +2663,7 @@ msgstr "" "Cerrar ventana\n" "Cerrar" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2650,7 +2672,7 @@ msgstr "" "Guardar los documentos abiertos\n" "Guardar" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2659,7 +2681,7 @@ msgstr "" "Guardar el documento activo con otro nombre\n" "Guardar como" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2668,7 +2690,7 @@ msgstr "" "Cambiar las opciones de impresin\n" "Configurar pgina" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2677,7 +2699,7 @@ msgstr "" "Cambiar la impresora y las opciones de impresin\n" "Configurar impresora" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2686,7 +2708,7 @@ msgstr "" "Imprimir el documento activo\n" "Imprimir" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2695,12 +2717,12 @@ msgstr "" "Mostrar vista preliminar\n" "Vista preliminar" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Mostrar todos los elementos ocultos" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2709,32 +2731,32 @@ msgstr "" "Abrir archivos del proyecto\n" "Proyecto (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Error desconocido al intentar abrir el proyecto" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Error desconocido al intentar guardar el proyecto" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Archivo de Proyecto" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Archivo de proyecto cargado con xito." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Archivo de proyecto guardado con xito." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2743,7 +2765,7 @@ msgstr "" "Guardar las rutas y configuraciones actuales al archivo de proyecto\n" "Guardar Archivo de Proyecto" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2752,7 +2774,7 @@ msgstr "" "Muestra informacon de la aplicacin, versin, y copyright\n" "Acerca de WinMerge" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2761,27 +2783,27 @@ msgstr "" "Cerrar la aplicacin\n" "Salir" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "Abrir ste documento" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2790,7 +2812,7 @@ msgstr "" "Cambiar al panel siguiente\n" "Panel Siguiente " -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2799,7 +2821,7 @@ msgstr "" "Cambiar al panel anterior\n" "Panel Anterior" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2808,7 +2830,7 @@ msgstr "" "Organizar ventanas en cascada (superpuestas)\n" "Superponer" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2817,7 +2839,7 @@ msgstr "" "Ordenar las ventanas horizontalmente\n" "Ordenar" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2826,7 +2848,7 @@ msgstr "" "Ordenar las ventanas verticalmente\n" "Ordenar" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2835,7 +2857,7 @@ msgstr "" "Copiar la seccin al portapapeles\n" "Copiar" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2844,7 +2866,7 @@ msgstr "" "Cortar la seleccin en el portapapeles\n" "Cortar" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2853,7 +2875,7 @@ msgstr "" "Buscar el texto especificado\n" "Buscar" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2862,7 +2884,7 @@ msgstr "" "Insertar contenido del portapapeles\n" "Pegar" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2871,7 +2893,7 @@ msgstr "" "Repetir la ltima accin\n" "Repetir" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2880,7 +2902,7 @@ msgstr "" "Reemplazar un texto especificado con otro\n" "Reemplazar" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2889,7 +2911,7 @@ msgstr "" "Seleccionar el documento completo\n" "Seleccionar todo" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2898,7 +2920,7 @@ msgstr "" "Deshacer el ltimo cambio\n" "Deshacer" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2907,7 +2929,7 @@ msgstr "" "Rehacer\n" "Rehacer" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2916,7 +2938,7 @@ msgstr "" "Muestra la barra de herramientas\n" "Barra de Herramientas" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2925,7 +2947,7 @@ msgstr "" "Muestra la Barra de Estado\n" "Barra de Estado" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2934,7 +2956,7 @@ msgstr "" "Muestra las pestaas\n" "Mostrar las pestaas" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2943,57 +2965,57 @@ msgstr "" "Cambia el tamao del panel automticamente\n" "Bloquear Paneles" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "Cambia el tamao de la ventana" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Cambia la posicin de la ventana" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Reduce la ventana a un icono" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Maximiza la ventaa a tamao completo" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Cambia a la ventana del documento siguiente" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Cambia a la ventana del documento anterior" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Cierra la ventana activa y pregunta al usuario si desea guardar los cambios" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "Devuelve la ventaa a su tamao normal" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Activa el Administrador de Tareas" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Activa sta ventana" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3002,183 +3024,183 @@ msgstr "" "Cierra la previsualizacin\n" "Cancelar previsualizacin" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nCompararCarpeta\n\n\n\nWinMerge.CompararCarpeta\nComparar Carpeta de WinMerge" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Preservar caracteres originales EOL" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Pulse una tecla" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Haga click derecho en la ruta para copiar" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Desarrolladores:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "Winmerge no concede ABSOLUTAMENTE NINGUNA GARANTA. Es software libre, y puede ser redistribuido bajo ciertas reglas. Vea la Licencia Pblica GNU en el men Ayuda para ms detalles." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&Aceptar" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Cancelar" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Reintentar" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorar" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignor&ar todos" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&S" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "S a to&do" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&No" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "No a &todo" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Continuar" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Omitir" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "O&mitir todos" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "No mostrar este &mensaje de nuevo." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "No &preguntar de nuevo." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Colores por Sintaxis" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Colores de Texto" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Control de Versiones" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "A:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "De la izquierda:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "A la izquierda:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "De la derecha:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "A la derecha:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Versin %1 - Espaol" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Configuracin (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Todas las cajas de mensaje se mostrarn de nuevo." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "Se han realizado modificaciones en los archivos de la sesion de comparacin actual. Algunas configuraciones pueden no surtir efecto hasta que la comparacin de archivos se ejecute de nuevo." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "La fuente seleccionada no se aplicar a ninguna de las ventanas de diferencias abiertas actualmente." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3189,7 +3211,7 @@ msgstr "" "\n" "Por favor, utilice valores 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3200,127 +3222,129 @@ msgstr "" "\n" "Por favor reinicie WinMerge despus de restablecer." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "Abrir" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programas|*.exe;*.bat;*.cmd|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Todos los archivos (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "Archivos de Proyecto de WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Archivos de opciones (*.ini)|*.ini|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Archivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "Archivos HTML (*.htm,*.html)|*.htm;*.html|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "Archivos XML (*.xml)|*.xml|Todos los archivos (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Todo el contenido" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Contenido rpido" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Fecha de modificacin" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "Fecha de modificacin y Tamao" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Tamao" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Nombre" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Ubicacin" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filtos" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Descripcin" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Seleccione nombre de archivo para el nuevo filtro" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Archivo de filtros (*.flt)|*.flt|Todos los archivos(*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3333,7 +3357,7 @@ msgstr "" "Por favor copie el archivo %1 a la carpeta WinMerge/Filters:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3346,7 +3370,7 @@ msgstr "" "\n" "Por favor, compruebe que la carpeta existe y que tiene permisos de escritura en ella." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3357,7 +3381,7 @@ msgstr "" "\n" "Por favor, seleccione la carpeta de filtros en Configuracin/Sistema." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3370,12 +3394,12 @@ msgstr "" "\n" "Quiza el archivo es de solo lectura?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Seleccione el archivo de filtros a instalar." -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3386,208 +3410,223 @@ msgstr "" "\n" "No se pudo copiar el archivo de filtros a la carpeta de filtros." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "El archivo de filtros ya existe. Desea sobreescribirlo?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Expresin regular" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Ruta a cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "R&uta a SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultado de la comparacin de carpetas" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Comparacin de archivos" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Sin ttulo izquierda" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Sin ttulo derecha" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Archivo externo" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Archivo interno" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Escaneando archivos..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "Abriendo la seleccin" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Copiando lado Izquierdo a lado Derecho" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Copiando lado Derecho a lado Izquierdo" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Copiando todo al lado Izquierdo" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Copiando todo al lado Derecho" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Copiando archivos..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Eliminando archivos..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Moviendo archivos..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Creando el informe..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Lnea: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Ln: %s Col: %d/%d Ch: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Combinar" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Diferencia %1 de %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 Diferencias encontradas" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 Diferencia encontrada" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "SL" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Archivo %1 de %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Elementos: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Seleccione dos carpetas o archivos existentes a comparar" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Seleccin de carpeta" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Seleccione dos carpetas o archivos a comparar." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "La ruta del lado Izquierdo no es vlida!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "La ruta del lado Derecho no es vlida!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Ninguna ruta es vlida!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Elija dos archivos para habilitar seleccin de desempaquetador." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Imposible comparar un archivo y una carpeta!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Archivo no encontrado: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Archivo no desempaquetado: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3600,42 +3639,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Fall al corregir archivo conflictivo." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "El archivo\n%1\nno es conflictivo." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Guardar Como" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Guardar los cambios a %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 es de slo lectura. Desea sobreescribirlo de modos modos ? (No salvarlo con un nuevo nombre.)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Error comprobando la posibilidad de escritura en destino" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Error haciendo copia de seguridad del archivo" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3648,7 +3687,7 @@ msgstr "" "\n" "Continuar de todas formas?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3665,7 +3704,7 @@ msgstr "" "\t-usar un nombre diferente (Aceptar)\n" "\t-cancelar la operacin (Cancelar)" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3680,7 +3719,7 @@ msgstr "" "\n" "Desea guardar la versin sin empaquetar en otro archivo?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3695,7 +3734,7 @@ msgstr "" "\n" "Desea guardar la versin sin empaquetar en otro archivo?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3710,7 +3749,7 @@ msgstr "" "\n" "Desea sobreescribir el archivo cambiado?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3719,7 +3758,7 @@ msgstr "" "%1\n" "es de slo lectura. Desea sobreescribirlo de todos modos?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3734,17 +3773,17 @@ msgstr "" "\n" "Si desea actualizar los archivos, cierre la comparacin actual y brala de nuevo." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Guardar lado izquierdo como" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Guardar lado derecho como" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3755,42 +3794,42 @@ msgstr "" "\n" "Actualize los documentos antes de continuar." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Debe especificar la ruta del proyecto de SourceSafe para continuar (ej. $/MiProyecto)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Desproteger archivos de VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "El sistema de versionado devolvo un error mientras trataba de desproteger el archivo. Imposible continuar..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Error ejecutando el comando del sistema de versionado." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "La carpeta de trabajo de VSS y la ubicacin del archivo actual no coinciden. Continuar?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "No se encontraron base(s) de datos de VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Error de VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3801,7 +3840,7 @@ msgstr "" " Por favor, compruebe la configuracin de la vista utilizada.\n" " Desea deshacer la desproteccin?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3810,170 +3849,169 @@ msgstr "" "El sistema de versionado devolvi un error cuando se intentaba deshacer la desproteccin del archivo.\n" " Por favor, compruebe la configuracin de la vista utilizada. " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Ninguno" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (menor que 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 y superior)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Parar en espacio en blanco" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Parar en espacio en blanco o puntuacin" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Copiar elemento seleccionado a la carpeta" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Copiar elemento seleccionado a la carpeta elegida" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Eliminar elemento selecionado del lado izquierdo" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Eliminar elemento selecionado del lado derecho" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Eliminar elementos seleccionados de ambos lados" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Ocultar elementos seleccionados (filtro al vuelo)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Renombrar el elemento seleccionado en ambos lados" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Lado derecho a lado izquierdo (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Lado izquierdo a lado derecho (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Lado derecho a lado izquierdo (%1 de %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Lado izquierdo a lado derecho (%1 de %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Lado izquierdo a... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Lado derecho a... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Lado izquierdo a... (%1 de %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Lado derecho a... (%1 de %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Lado izquierdo (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Lado derecho (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Ambos lados (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Lado izquierdo (%1 de %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Lado derecho (%1 de %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Ambos lados (%1 de %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Seleccione carpeta de destino" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Izquierda - Seleccione carpeta destino:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Derecha - Seleccione carpeta destino:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 Archivos Afectados)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 de %2 Archivos Afectados)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3984,17 +4022,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "Est seguro de copiar:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Est seguro de copiar %d elementos:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4013,458 +4051,473 @@ msgstr "" "\n" "Por favor actualice la comparacin." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "Abrir archivo del lado izquierdo" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "Abrir archivo del lado izquierdo con editor externo" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "Abrir archivo del lado izquierdo con..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "Abrir archivo del lado derecho" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "Abrir archivo del lado derecho con editor externo" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "Abrir archivo del lado derecho con..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Error al ejecutar editor externo: %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Extension del editor externa desconocida: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Copiar nombres de archivo al portapapeles" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Copiar rutas del lado izquierdo al portapapeles" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Copiar rutas del lado derecho al portapapeles" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Copiar rutas del ambos lados al portapapeles" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Formato de archivo desconocido" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Aadir elementos del lado izquierdo al archivo" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Aadir elementos del lado derecho al archivo" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Aadir elementos de ambos lados al archivo" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Aadir elementos diferentes al archivo (ambos lados)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Seleccionar carpeta donde mover archivo selecionado del lado izquierdo" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Seleccionar carpeta donde mover archivo selecionado del lado derecho" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Nombre" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Carpeta" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultado" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Fecha izq." -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Fecha dcha." -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Extensin" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Tamao izq." -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Tamao dcha." -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Tamao dcha. (Corto)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Tamao izq. (Corto)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Fecha de creacion izq." -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Fecha de creacion dcha." -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Archivo ms reciente" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Versin archivo izq." -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Versin archivo dcha." -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Resultados abreviados" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Atributos izq." -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Atributos dcha." -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "EOL izq." -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "EOL dcha." -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Codificacin izq." -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Codificacin dcha." -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Difs. ignoradas" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Diferencias" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binario" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "No se pueden comparar los archivos" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Elemento cancelado" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Archivo omitido" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Carpeta omitida" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Slo Izquierda: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Slo Derecha: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "Los archivos binarios son iguales" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "Los archivos binarios son diferentes" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Los archivos son diferentes" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Slo Izquierda" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Slo Derecha" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Error" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Tiempo transcurrido: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 elemento seleccionado" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 elementos seleccionados" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Nombre de archivo o carpeta." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Nombre de subcarpeta cuando se incluyen las subcarpetas." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Resultados de la comparacion, formato largo." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Fecha de modificacin del archivo del lado izquierdo." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Fecha de modificacin del archivo del lado derecho." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Extensin del archivo." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Tamao del archivo del lado izquierdo en bytes." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Tamao del archivo del lado derecho en bytes." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Tamao del archivo del lado izquierdo abreviado." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Tamao del archivo del lado derecho abreviado." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Fecha de creacin del archivo del lado izquierdo." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Fecha de creacin del archivo del lado derecho." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Indica que lado tiene la fecha de modificacin ms reciente." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Versin del archivo del lado izquierdo, slo para algunos tipos de archivo." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Versin del archivo del lado derecho, slo para algunos tipos de archivo." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Resultados de la comparacin abreviados." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Attributos del archivo del lado izquierdo." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Attributos del archivo del lado derecho." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Tipo de EOL del archivo del lado izquierdo." -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Tipo de EOL del archivo del lado derecho." -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Codificacin del lado izquierdo." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Codificacin del lado derecho." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Nmero de diferencias ignoradas en el archivo. Estas diferencias son ignoradas por WinMerge y no se pueden combinar." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Nmero de diferencias en el archivo. Este nmero no incluye las diferencias ignoradas." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Muestra un asterisco (*) si el archivo es binario." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Comparar %1 con %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Lista separada por comas" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Lista separada por tabuladores" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "HTML Simple" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "XML Simple " -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "El archivo de informe ya existe. Desea sobreescribir el archivo?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4473,32 +4526,32 @@ msgstr "" "Error al crear el informe:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "El informe se ha creado correctamente." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "El mismo archivo est abierto en ambos paneles." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "Los archivos seleccionados son iguales" -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Ocurri un error cuando se estaban comparando los archivos" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Los archivos temporales no se pudieron crear. Compruebe su ruta para archivos temporales." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4513,32 +4566,32 @@ msgstr "" "\n" "Nota: si desea tratar siempre todos los tipos de saltos de lnea como equivalentes, seleccione la opcin 'Ignorar saltos de lnea diferentes..' en la pestaa Comparar del dialogo Configuracin (disponible en Editar/Configuracin)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 "Los EOL son de tipos diferentes(DOS/UNIX/MAC) en el archivo '%1'.\n Con la configuracin actual, sern unificados al tipo principal.\n Desea cambiar las opciones y preservar los EOL diferentes?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ocurri un error mientras se precomparaba el archivo '%1' con el plugin '%2'. La precomparacin no ser aplicada de nuevo." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "La carpeta seleccionada no es vlida." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "No se puede abrir un archivo binario en el editor." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 "La carpeta solamente existe en el otro lado y no puede abrirse.\n\nQuiere crear una carpeta combinando:\n%1\nal otro lado y abrir stas carpetas?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4549,132 +4602,132 @@ msgstr "" "Mostrar cada archivo en su pgina de cdigos dar una mejor visualizacin, pero combinar/copiar sera peligroso.\n" "Le gustara tratar ambos archivos con la pgina de cdigos predeterminada de windows (recomendado)?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Atencin: los archivos utilizan codificaciones diferentes, izquierdo=%s y derecho=%s, y la combinacin podra provocar perdida de informacin." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Informacin perdida debido a errores de codificacin: ambos archivos" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Informacin perdida debido a errores de codificacin: archivo derecho" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Informacin perdida debido a errores de codificacin: archivo izquierdo" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "No hay diferencia" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Diferencia de lnea" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Reemplazada(s) %1 cadena(s)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Imposible encontrar la cadena \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Copiar ruta completa" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Copiar nombre de archivo" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Panel de ubicacin" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Panel de diferencias" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Archivo de correccin escrito correctamente." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. elemento no encontrado o es una carpeta!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. elemento no encontrado o es una carpeta!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "El archivo de correccin ya existe. Desea sobreescribirlo?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 archivo(s) selecionado(s)]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Contexto" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Unificado" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "No se pudo escibir en el archivo %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "La ruta de salida especificada no es absoluta: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Especifique un archivo de salida" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "No se puede crear un archivo de correccin a partir de un archivo binario." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "No se puede crear un archivo de correccin a partir de una carpeta." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4685,17 +4738,17 @@ msgstr "" "\n" "Crear una correccin requiere que no haya cambios pendientes de ser guardados." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "La carpeta no existe." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Los resultados de comparacin de carpetas actuales sern eliminados." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4706,7 +4759,7 @@ msgstr "" "Los componentes necesarios(7-zip y/o Merge7z*.dll) para el archivo no estn disponibles.\n" "Vea el manual para ms informacin acerca del soporte de archivos y cmo habilitarlo." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4715,7 +4768,7 @@ msgstr "" "\n" "Nota: La integracin con 7-Zip est deshabilitada en la configuracion de WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4724,37 +4777,37 @@ msgstr "" "\n" "Nota: La integracin con 7-Zip est restringida a operacin en solitario en la configuracion de WinMerge." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Seleccione archivo a exportar" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Seleccione archivo a importar" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Configuracin importada del archivo." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Configuracin exportada al archivo." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Fallo al importar la configuracin del archivo." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Fallo al exportar la configuracin al archivo." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4765,473 +4818,493 @@ msgstr "" "\n" "Desea continuar?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Error en expresin regular" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "No hay coincidencias" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Expresin regular no vlida." -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Carcter de intercalacin no vlido." -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Nombre de clase de carcter invlida" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Barra invertida" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Referencia trasera invlida" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Falta carcter final de [ o [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Falta carcter final de ( o \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Falta carcter final de \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Contenido no vlido en \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Fin de rango no vlido" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Memoria insuficiente" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Expresin regular precedente no vlida" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Fin de expresin regular prematuro" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Expresin regular demasiado grande" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Falta carcter inicial de ) o \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Europeo occidental" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Europeo oriental" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "Asitico del este" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Asitico sudeste & suroeste" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Medio Oriente" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "No aplicable" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cirlico" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arbico" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Griego" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Borde Bltico" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latino 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Griego 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latino 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cirlico" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turco" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugus" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islands" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreo" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Canad Francs" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nrdico" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cirlico CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Griego 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japons" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Chino Simplificado" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Koreano" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Chino Tradicional" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latino 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cirlico (Eslavo)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latino 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Griego" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latino 5 (Turco)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreo" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows rabe" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Borde Bltico" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnam" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romano" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Griego" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cirlico" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Europa Central" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turco" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Aproximadamente ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Aproximadamente ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Aproximadamente ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Aproximadamente ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Aproximadamente ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Mezclado" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Guardar el archivo del lado izquierdo" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Guardar el archivo del lado derecho" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Guardar el archivo del lado izquierdo como..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Guardar el archivo del lado derecho como..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "Cambiar el modo slo lectura del archivo/carpeta del lado izquierdo" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "Cambiar el modo slo lectura del archivo/carpeta del lado derecho" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Convertir EOL a formato Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Convertir EOL a formato Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Convertir EOL a formato Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Cambiar entre modo edicin y modo combinacin" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5240,12 +5313,12 @@ msgstr "" "Ver y ajustar propiedades de codificacin del archivo\n" "Propiedades de codificacin del archivo" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "Abrir y corregir archivo conflictivo" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5254,7 +5327,7 @@ msgstr "" "Selecciona el rea diferente de la lnea actual\n" "Diferencias de lnea actual" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5263,7 +5336,7 @@ msgstr "" "Ir a lnea o diferencia\n" "Ir a (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5272,7 +5345,7 @@ msgstr "" "Configurar las opciones del programa\n" "Configuracin" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5281,37 +5354,37 @@ msgstr "" "Actualizar la pantalla\n" "Actualizar (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Copiar las lneas seleccionadas al portapapeles aadiendo nmeros de lnea al principio de cada una de ellas" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Actualizar elementos seleccionados" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Alternar marcador" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Ir al siguiente marcador" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Ir al marcador anterior" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Quitar todos los marcadores" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5320,7 +5393,7 @@ msgstr "" "Muestra los elementos que son exactamente iguales\n" "Mostrar elementos iguales" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5329,7 +5402,7 @@ msgstr "" "Muestra los elementos que tienen diferencias\n" "Mostrar elementos diferentes" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5338,7 +5411,7 @@ msgstr "" "Muestra los elementos que existen solo en la parte izquierda\n" "Mostrar elementos nicos en lado izquierdo" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5347,7 +5420,7 @@ msgstr "" "Muestra los elementos que existen slo en la parte derecha\n" "Mostrar elementos nicos en lado derecho" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5356,7 +5429,7 @@ msgstr "" "Muestra los archivos binarios\n" "Mostrar archivos binarios" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5365,7 +5438,7 @@ msgstr "" "Muestra los elementos ignorados durante la comparacin\n" "Mostrar elementos ignorados" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5374,7 +5447,7 @@ msgstr "" "Seleccione la fuente\n" "Seleccionar fuente" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5383,42 +5456,42 @@ msgstr "" "Usar la fuente del sistema\n" "Fuente predeterminada" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Muestra los espacios en blanco" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Muestra el panel de diferencias" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Muestra el panel de ubicacin con una imagen global de los archivos" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Muestra el dilogo de estadsticas de comparacin de carpetas" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Permite seleccionar el idioma de la interfaz de usuario\nIdioma" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Muestra las diferencias en las lneas en un color diferente\nMostrar diferencias de lnea" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Intercambia la posicin de los dos paneles" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5427,7 +5500,7 @@ msgstr "" "Muestra los nmeros de lnea\n" "Mostrar nmeros de lnea" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5436,7 +5509,7 @@ msgstr "" "Ajusta la longitud de las lneas al ancho del panel\n" "Ajuste de lnea" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5445,47 +5518,47 @@ msgstr "" "Muestra los mrgenes en ambos paneles\n" "Mostrar los mrgenes" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "Aumentar tamao de texto" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Disminuir tamao de texto" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "Restablecer el zoom de texto al tamao predeterminado" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Ir a la diferencia anterior\nDiferencia anterior (Alt Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Ir a la diferencia siguiente\nDiferencia siguiente (Alt Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Ir a la primera diferencia\nPrimera diferencia (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Ir a la diferencia actual\nDiferencia actual (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Ir a la ltima diferencia\nltima diferencia (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5494,7 +5567,7 @@ msgstr "" "Copiar el texto seleccionado al lado derecho\n" "Copiar a la derecha (Alt Derecha)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5503,7 +5576,7 @@ msgstr "" "Copiar el texto seleccionado al lado izquierdo\n" "Copiar a la izquierda (Alt Izquierda)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5512,7 +5585,7 @@ msgstr "" "Copiar diferencia al lado derecho e ir a la siguiente\n" "Copiar a la derecha y avanzar (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5521,7 +5594,7 @@ msgstr "" "Copiar diferencia al lado izquierdo e ir a la siguiente\n" "Copiar a la izquierda y avanzar (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5530,7 +5603,7 @@ msgstr "" "Copiar todas las diferencias al lado derecho\n" "Todas a la derecha" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5539,367 +5612,377 @@ msgstr "" "Copiar todas las diferencias al lado izquierdo\n" "Todas a la izquierda" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Borra los elementos seleccionados de ambas carpetas" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Compara el elemento seleccionado (compara el primero si hay mltiples elementos seleccionados)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Seleccionar y reordenar las columnas de la comparacin de carpetas" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Generar un archivo de correccin" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Seleccionar y modificar filtros" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Genera un informe con los resultados de la comparacin" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "El usuario selecciona el desempaquetador (no se desempaqueta cuando se comparan carpetas)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "El desempaquetador elegido se aplica a ambos archivos (slo un archivo necesita tener la extensin)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Seleccione un desempaquetador para editar ste archivo" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Sin precomparacin (normal)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Plugins sugeridos" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Otros plugins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Descargar todos los plugins y actualizarlos (para desarrolladores)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "Cambia al siguiente archivo visible\nCambia al siguiente archivo" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Cierra todas las ventanas abiertas" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "Abre la Ayuda de WinMerge\nAyuda de WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Escribe la informacin de la versin actual de Winmerge y la configuracin a un archivo de texto" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Muestra la Licencia Pblica General GNU" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Compilacin Privada: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "Abre los documentos de las notas de versiones\nNotas de la Versin" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "Abre el sitio web de las traducciones\nTraducciones" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Configuracin de plugin" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Sin precomparacin" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Precomparacin si es posible" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH no encontrado - scripts .sct deshabilitados" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Abre el archivo con la aplicacin registrada" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "Abre el archivo con un editor externo" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "Abre el archivo con un programa en particular" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "No mostrar bloques movidos" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Mostrar todos los bloques movidos" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Mostrar slo bloques movidos a partir de la diferencia actual" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "Ir a la diferencia bajo el cursor" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "Ir &a diferencia %1 de %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "Ir a &lnea %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Deshabilitado" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Del sistema de archivos" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "De la lista MRU" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Ocultar la barra de herramientas" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Mostrar barra pequea de herramientas" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Mostrar barra grande de herramientas" diff --git a/Src/Languages/Swedish.po b/Src/Languages/Swedish.po index 5f3672c449f..fdf4a7f6419 100644 --- a/Src/Languages/Swedish.po +++ b/Src/Languages/Swedish.po @@ -72,7 +72,7 @@ msgstr "&Klipp ut" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "K&opiera" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "K&listra in" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "&G till..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "p&pna" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "med &Registrerat program" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "med &Extern editor" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "&med..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Arkiv" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Ny\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&ppna...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "pp&na Konfliktfil..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "ppna Projekt...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "Sp&ara Projekt..." @@ -161,1855 +163,1864 @@ msgid "Recent Projects" msgstr "Tidigare Projekt" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&Avsluta" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Redigera" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Instllningar..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Visa" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Vlj tecken&snitt..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "Anvnd standardtec&kensnitt" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "&Verktygsrad" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&Ingen" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "&Liten" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "&Stor" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "S&tatusflt" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "Fi&lrad" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "S&prk..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "Verkt&yg" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filter..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Skapa patch..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Plugins" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Manuell Uppackning" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Automatisk Uppackning" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&ndra med Uppackare" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "&ppna Plugins igen" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&Felskning" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "&ppna Konfiguration..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "&terstll Instllningar" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "F&nster" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Stng" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "St&ng alla" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "Vxla fil\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "&Ordna horisontellt" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "O&rdna vertikalt" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&verlappande" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Hjlp" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "&WinMerge Hjlp\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "R&eleasenoteringar" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&versttningar" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "K&onfiguration" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "A&rkivstd avstngt..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&Om WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "V&nster fil skrivskyddad" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "H&ger fil skrivskyddad" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "Fil&kodning" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "Vlj &allt\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "Visa &identiska objekt" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "Visa &olika objekt" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "Visa v&nsterunika objekt" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "Visa h&gerunika objekt" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "Visa &verhoppade objekt" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "V&isa binra filer" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "Visa dold&a objekt" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "Jmf&rstatistik" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&Uppdatera\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "&Uppdatera valda\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Jmfr" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "J&mfr\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Nsta skillnad\tAlt+Ner" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&Fregende skillnad\tAlt+Upp" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "F&rsta skillnad\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&Aktuell skillnad\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "&Sista skillnad\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "Kopiera till &hger\tAlt+Hger" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "Kopiera till &vnster\tAlt+Vnster" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&Ta bort\tDelete" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "&Anpassa kolumner..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "Generera &rapport..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Spara\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "Spara &Vnster fil" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Spara" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "Spara so&m..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "Spara &Hger fil" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&Skriv ut..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "Utskrifts&format" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "Frhandsgranska u&tskrift" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "&Radslut (DOS, UNIX, MAC)" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "&Mergemod\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "&Filkodning..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&ngra\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Gr om\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Klipp ut\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "K&opiera\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "K&listra in\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "Markera skillnad &p rad\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "S&k...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Erstt...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Script" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Inga >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "Avancerat" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "&Kopiera med radnummer\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&Bokmrken" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&Vxla Bokmrke\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "&Nsta Bokmrke\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "&Tidigare Bokmrke\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "&Ta bort alla Bokmrken" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&G till...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&Zooma" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Zooma in\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "Zooma ut\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "&Normal\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "Syntaxmarkering" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "&Ls placering" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "Visa &mellanslag" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "Visa &radskillnader" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "Visa rad&nummer" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "Visa &marginaler" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "R&adbryt rader" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "V&xla placering" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Skillnadsflt" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Skillnadsbild" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "K&opiera till hger och g framt\tAlt+Ctrl+Hger" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "Kopiera &till vnster och g framt\tAlt+Ctrl+Vnster" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "Kopiera allt &till hger" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "Kopiera allt t&ill vnster" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&Prediffer" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "Jm&fr" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "J&mfr Special" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "&Vnster till hger" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "V&nster till..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "&Hger till vnster" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "H&ger till..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&Flytta" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&Vnster till..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "&Hger till..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "&Ta bort" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "&Vnster" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "&Hger" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "&Bda" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "Byt &namn" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&Dlj filnamn" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "&ppna vnster" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "&ppna hger" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "Kop&iera Skvgar" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "&Vnster (%1 av %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "&Hger (%1 av %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "&Bda (%1 av %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "Kopiera &Filnamn" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&Zip" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&Vnster... (%1 av %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&Hger... (%1 av %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&Bda... (%1 av %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "&Skillnader... (%1 av %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&Uppdatera" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "Kopiera hela skvgen" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "Kopiera Filnamn" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Prediffer-instllningar" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "&Ingen Prediffer" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "Automatisk Prediffer" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "G& till skillnad" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "&Inga Flyttade Block" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "&Alla Flyttade Block" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Flyttat Block fr &Aktuell Skillnad" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "Om WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(Privat kompilering)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "Med ensamrtt" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "Besk WinMerges hemsida !" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "OK" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "Medarbetare" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "Vlj filer eller kataloger..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&Vnster:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&Blddra..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&Hger:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "B&lddra..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Filter:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "Vlj..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&Uppackare:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "Vlj..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "&Inkludera Underkataloger" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "Status:" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "Avbryt" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "Hjlp" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "Filer eller kataloger som skall jmfras" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "Databas:" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "Projekt:" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "Anvndare:" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "Lsenord:" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "Lnka till valt VSS-projekt" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "Tillmpa p alla objekt" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "Checka ut" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "Spara som..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "Versionsstyrningssystem" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "&Versionsstyrningssystem:" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "&Skvg till Cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "Generellt" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "G automati&skt till frsta skillnaden" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "&Visa inte Startskrm" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "St&ng fnster med ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "Verifiera skvgar i ppna-dialogen" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "&Tillt bara en upplaga att kra" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "Fr&ga nr flera fnster stngs" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "&Bevara Filtidsuppgifter i Filjmfrelse" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "&ppna-dialog Auto-Komplettera:" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "Starta flera jmfrfnster fr" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "&Jmfr kataloger" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "Jm&fr filer" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge tillter att vissa meddelanderutor dljs. Klicka p terstll-knappen fr att gra alla meddelanderutor synliga igen." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "terstll" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "Sprk" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "Tillgngliga sprk:" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "Sk" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "S&k efter:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Matcha &hela ord" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Mat&cha VERSALER och gemener" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "&Reguljrt uttryck" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "V&nd inte vid slutet av filen" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "Riktning" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&Upp" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&Ner" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&Sk nsta" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "Erstt" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "Ers&tt med:" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "Vnd inte vid slutet av filen" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "Erstt i" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "&Markering" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "He&la filen" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&Erstt" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "Erstt &alla" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "Checka ut" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Kommentarer" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "Checka in efter Checka ut" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Radfilter" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "Anvnd Radfilter" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "Reguljra uttryck (ett per rad):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "Spara" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "Ny" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "ndra" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "Ta bort" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "Kulrer" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "Skillnader:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "Markerade skillnader:" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "Bakgrund" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "Borttaget" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "Text" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "Ignorerad Skillnad:" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "Flyttad:" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "Markerad flyttad:" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "Ordskillnad:" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "Vald ordskillnad:" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "Standard" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "Dialog" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "System" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "&Skicka borttagna filer till Papperskorgen" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "Integration" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "Lgg till i Utforskarens popup-meny" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "A&nvnd avancerad meny" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "In&kludera underkataloger som standard" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "Extern Editor:" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Filterkatalog:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "Blddra..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "Katalog fr Temporra filer" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "S&ystemets temporra katalog" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "A&npassad katalog:" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "Blddra..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "Patchgenerator" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "Fil &1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "Fil &2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "Byt" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "Lgg till i befintlig fil" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "&Resultat:" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "&Format" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "T&yp:" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "Samman&hang:" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "&Mellanslag" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "&Jmfr" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "Ignorera skillnader" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "Ignorera alla" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "Ignorera blanka rader" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "VERSAL/gemen-knslig" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "Inklu&dera kommandorad" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "ppna i Extern editor" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "Visa kolumner" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "Flytta &Upp" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "Flytta &Ned" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "Vlj Uppackare" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "Fil-uppackare:" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "Visa alla uppackare, kontrollera inte filsuffixet" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "Filsuffixlista:" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "Beskrivning:" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Katalogjmfrelsens fortskridande" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "Stopp" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "Jmfr objekt..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "Jmfrda objekt:" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "Objekt totalt:" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "G till" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "G& till:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "Fil" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "G till vad" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "Ra&d" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&Skillnad" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&G till" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "Jmfr" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "Mellanslag" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "Jmfr &mellanslag" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "&Ignorera mellanslagsskillnader " -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "Ignorera &alla mellanslag" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "Ignorera blan&ka rader" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "&Ignorera VERSAL/gemen-skillnader" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "Igno&rera skillnader i radslut (Windows/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "M&jliggr detektion av flyttade textblock" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "&Matcha liknande rader" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "Ign&orera tidsskillnad mindre n 3 sekunder" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "&Filjmfrelsemetod:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "S&toppa efter frsta skillnaden" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Filterkommentarer" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "Editor" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "&Markera syntaxen" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "Automatisk &uppdatering" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "Tabbar" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "&Tabbsteg:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Infoga tabbar" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Infoga mellanslag" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "Radskillnadskulrer" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "Visa radskillnader" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "&Teckenniv" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "&Ordniv:" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Filfilter" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "Testa" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "Installera..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "Ny..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "Redigera..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "Ta bort..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "Spara ndrade filer?" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "Vnster fil" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "&Spara ndringar" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&Ignorera ndringar" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "Hger fil" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "S¶ ndringar" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "Ign&orera ndringar" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "Ignorera alla ndringar" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "Codepage" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "Standard Codepage" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "Vlj den Codepage som anvnds som standard nr icke-Unicodefiler ppnas:" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2018,32 +2029,32 @@ msgstr "" "Detektera Codepageinformation fr dessa filer : .html, .rc, .xml \n" "Detta krver en omstart av WinMerge" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "System Codepage" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "Enligt WinMerges anvndargrnssnitt" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "Anpassad Codepage :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - Arkivstd r avstngt" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Kan inte detektera 7-Zip-version (r 7-Zip inte installerat?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2052,12 +2063,12 @@ msgstr "" "Arkivstd krver antingen att version 3.11 eller hgre av 7-Zip r installerat p din dator, eller att dess\n" "ndvndiga komponenter kopieras till WinMerges programkatalog fr fristende anvndning." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "Det mste ocks finnas ett lmpligt grnssnittsplugin (Merge7z*.dll) i skvgen." -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2066,12 +2077,12 @@ msgstr "" "Var god och anvnd den version av 7-Zip som rekommenderas nedanfr tills grnssnittsplugins fr senare\n" "versioner blir tillgngliga." -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "Version" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2080,540 +2091,551 @@ msgstr "" "Plugin krvd\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "Rekommenderad version av 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "finns" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "7-Zip program installerat p din dator:" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "inget" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "saknas" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "7-Zip komponenter fr fristende anvndning:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "utdaterad" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "Plugins i skvg:" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "Visa inte detta &meddelande igen.\n(Du kan alltid f tillbaka detta meddelande frn Hjlp-menyn.)" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "Ladda ner Plugin" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "Instllningar" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " Kategorier" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "Importera..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "Exportera..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "Nyckelord:" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "Funktionsnamn:" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "Kommentarer:" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "Nummer:" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "Operatorer:" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "Strngar:" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "Preprocessor:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "Anvndare 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "Anvndare 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "Fet" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "Rapport fr Katalogjmfrelse" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "Rapport&fil:" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "Blddra..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&Stil:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "&Kopiera till klippbordet" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "Delat eller privat filter?" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Vilken typ av filter vill du skapa?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "Delat filter (fr alla anvndare p denna dator)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "Privat filter (bara fr den aktuella anvndaren)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "Arkivstd" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "Arkivstdet krver att 7-Zip-plugin r installerad:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "Ladda ner 7-zip-plugin" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "&Aktivera arkivfilstd" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "&Anvnd fristende 7-Zip om det finns" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "A&nvnd lokal 7-Zip frn WinMerges katalog" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "&Detektera arkivtyp frn filsignatur" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "Jmfrelsestatistik" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "Kataloger:" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "Filer:" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "Olika" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "Text:" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "Binr:" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "Unik" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "Vnster:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "Hger:" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "Identisk" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "Totalt:" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "Stng" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "Pverkar" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(Pverkar)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "Vlj Codepage fr" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "&Filppnande:" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "Filsparande:" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "&Anvnd samma Codepage fr bda" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&Verkstll" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&Avbryt" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "Testa Filter" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "Testar filter ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "&Skriv in text att testa:" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "&Katalognamn" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "Resultat:" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&Testa" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&Stng" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "&Anvnd anpassade textkulrer" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "Anpassade textkulrer" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "Mellanslag:" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "Vanlig text:" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "Markering:" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "Skvgar" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Bara& lsbar" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Bara& lsbar" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "ppna..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "Spara..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "Backup p filer" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "Skapa backupfiler i:" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "&Originalfilens katalog" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "&Global backupkatalog:" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "Backupfilnamn:" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "&Lgg till filsuffixet .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "L&gg till tidsmarkering" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "Bekrfta kopiering" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "r du sker p att du vill kopiera XXX objekt?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "Frn vnster" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "Till hger" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "Ja" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "Nej" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041d04e4" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x41d, 1252" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "Klar" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2622,7 +2644,7 @@ msgstr "" "Skapar nya dokument\n" "Nya Dokument (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2631,7 +2653,7 @@ msgstr "" "ppnar ett befintligt dokument\n" "ppna (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2640,7 +2662,7 @@ msgstr "" "Stnger det aktiva dokumentet\n" "Stng" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2649,7 +2671,7 @@ msgstr "" "Sparar det aktiva dokumentet\n" "Spara (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2658,7 +2680,7 @@ msgstr "" "Sparar det aktiva dokumentet med ett nytt namn\n" "Spara som" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2667,7 +2689,7 @@ msgstr "" "ndrar Utskriftsinstllningar\n" "Sidinstllningar" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2676,7 +2698,7 @@ msgstr "" "ndrar skrivare och skrivarinstllningar\n" "Skrivarinstllningar" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2685,7 +2707,7 @@ msgstr "" "Skriver ut det aktiva dokumentet\n" "Skriv ut" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2694,12 +2716,12 @@ msgstr "" "Visar helsidor\n" "Frhandsgranska" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "Gr alla dolda objekt synliga igen" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2708,32 +2730,32 @@ msgstr "" "ppna Projektfil\n" "Projektfil(Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "Oknt fel vid frsk att ppna Projektfil" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "Oknt fel vid frsk att spara Projektfil" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "Projektfil" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Projektfilen r framgngsrikt ppnad." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Projektfilen r framgngsrikt sparad." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2742,7 +2764,7 @@ msgstr "" "Sparar aktuella skvgar och instllningar till Projektfil\n" "Spara Projektfil" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2751,7 +2773,7 @@ msgstr "" "Visar Programinformation, Versionsnummer och Copyright\n" "Om" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2760,27 +2782,27 @@ msgstr "" "Avslutar WinMerge och frgar om du vill spara dokument\n" "Avsluta" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "ppna detta dokument" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2789,7 +2811,7 @@ msgstr "" "Vxlar till nsta fnster\n" "Nsta fnster" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2798,7 +2820,7 @@ msgstr "" "Vxlar till frra fnstret\n" "Frra fnstret" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2807,7 +2829,7 @@ msgstr "" "Arrangerar fnstren s att de verlappar varandra\n" "verlappande fnster" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2816,7 +2838,7 @@ msgstr "" "Ordnar fnstren icke-verlappande horisontellt\n" "Ordna horisontellt" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2825,7 +2847,7 @@ msgstr "" "Ordnar fnstren icke-verlappande vertikalt\n" "Ordna vertikalt" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2834,7 +2856,7 @@ msgstr "" "Kopierar den markerade texten och lgger det i klippbordet\n" "Kopiera" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2843,7 +2865,7 @@ msgstr "" "Klipper ut den markerade texten och lgger det i klippbordet\n" "Klipp ut" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2852,7 +2874,7 @@ msgstr "" "Sker den angivna texten\n" "Sk" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2861,7 +2883,7 @@ msgstr "" "Klistrar in innehllet i klippbordet\n" "Klistra in" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2870,7 +2892,7 @@ msgstr "" "Upprepar den senaste tgrden\n" "Upprepa" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2879,7 +2901,7 @@ msgstr "" "Erstter den markerade texten med annan text\n" "Erstt" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2888,7 +2910,7 @@ msgstr "" "Vljer hela dokumentet\n" "Vlj allt" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2897,7 +2919,7 @@ msgstr "" "ngrar den senaste tgrden\n" "ngra" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2906,7 +2928,7 @@ msgstr "" "Gr om den tidigare ngrade tgrden\n" "Gr om" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2915,7 +2937,7 @@ msgstr "" "Visar eller gmmer verktygsfltet\n" "Vxla verktygsflt" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2924,7 +2946,7 @@ msgstr "" "Visar eller gmmer statusfltet\n" "Vxla statusfltet" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2933,62 +2955,62 @@ msgstr "" "Visar eller gmmer filraden\n" "Vxla filraden" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "Automatisk storleksndring av placering\nLs Placering" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "ndra fnsterstorlek" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "Flytta fnster" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Minimera fnstret till en ikon" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Maximera fnstret till full storlek" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "Vxla till nsta dokumentfnster" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "Vxla till frra dokumentfnstret" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "Stng det aktiva fnstret och frga om dokumenten skall sparas" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "terstll fnstret till normal storlek" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "Lista med aktiva fnster" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "Aktiverar det hr fnstret" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2997,183 +3019,183 @@ msgstr "" "Stnger Frhandsgranskning\n" "Stng Frhandsgranskning" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nFiljmfrelse\n\n\n\nWinMerge.Filjmfrelse\nWinMerge Filjmfrelse" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nKatalogjmfrelse\n\n\n\nWinMerge.Katalogjmfrelse\nWinMerge Katalogjmfrelse" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Bevara ursprungliga radslutstecken" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "Tryck p en valfri tangent" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "Hgerklicka p skvgen fr att kopiera" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "Utvecklare:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge kommer med ABSOLUT INGA GARANTIER. Detta r fri programvara och du r vlkommen att vidaredistribuera den under vissa omstndigheter; se GNU General Public License i Hjlpmenyn fr detaljer." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&OK" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&Avbryt" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&Frsk igen" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&Ignorera" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "Ignorera &allt" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&Ja" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "Ja till &allt" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&Nej" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "Nej till a&llt" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&Fortstt" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&Skippa" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "Skippa &allt" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "Visa inte detta &meddelande igen." -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "Frga inte denna &frga igen." -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "Syntaxkulrer" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "Textkulrer" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "Versionskontroll" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "Till:" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "Frn vnster:" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "Till vnster:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "Frn hger:" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "Till hger:" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "Version %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "Unicode" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "Egenskaper (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "Alla meddelanderutor visas nu igen." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "ndringar har gjorts i den aktuella filjmfrelsesessionen. Vissa instllningar kanske inte syns frrn den aktuella filjmfrelsen startas om." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "ndringen av typsnitt kommer inte att synas i redan ppna fnster." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3184,7 +3206,7 @@ msgstr "" "\n" "Var god och anvnd vrden frn 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3195,127 +3217,129 @@ msgstr "" "\n" "Var god och terstarta WinMerge efter terstllningen." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "ppna" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "Programfiler|*.exe;*.bat;*.cmd|Alla Filer (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge Projektfiler (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "Instllningsfiler (*.ini)|*.ini|Alla Filer (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text-filer (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alla filer (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML-filer (*.htm,*.html)|*.htm;*.html|Alla filer (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML-filer (*.xml)|*.xml|Alla filer (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "Total jmfrelse" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "Snabb jmfrelse" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "Datum fr frndring" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "ndrat Datum och Storlek" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "Filstorlek" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "Namn" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "Skvg" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Filter" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "Beskrivning" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "Vlj filnamn fr nytt filter" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "Filfilter (*.flt)|*.flt|Alla Filer (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3328,7 +3352,7 @@ msgstr "" "Var god och kopiera filen %1 till WinMerges Filterkatalog:\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3341,7 +3365,7 @@ msgstr "" "\n" "Var god och verifiera att katalogen finns och att den r skrivbar." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3352,7 +3376,7 @@ msgstr "" "\n" "Var god och vlj filterkatalog i Instllningar/System." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3365,12 +3389,12 @@ msgstr "" "\n" "Kanske r filen bara lsbar?" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "Ange skvg fr filterfil att installera" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3381,208 +3405,223 @@ msgstr "" "\n" "Kunde inte kopiera ny filterfil till filterkatalogen." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Filterfilen r redan installerad. Vill du skriva ver existerande filterfil?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "Reguljrt uttryck" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "&Skvg till Cleartool.exe:" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "&Skvg till SS.EXE:" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "Resultat fr jmfrda kataloger" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "Filjmfrelse" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "Namnls vnster" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "Namnls hger" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "Deras fil" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "Min fil" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "Sker filer..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "ppnar val" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "Kopiera vnster till hger" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "Kopiera hger till vnster" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "Kopiera allt till vnster" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "Kopiera allt till hger" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "Kopierar filer..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Tar bort filer..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "Flyttar filer..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "Skapar rapport..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d Radslut: %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "Rad: %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "Rad: %s Kolumn: %d/%d Tecken: %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "Mergemod" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "Skillnad %1 av %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 skillnader funna" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "1 skillnad funnen" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "Objekt %1 av %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "Objekt: %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Vlj tv existerande kataloger eller filer att jmfra" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Val av katalog" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "Vlj tv kataloger eller tv filer att jmfra." -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "Vnster skvg r felaktig!" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "Hger skvg r felaktig!" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "Bda skvgarna r felaktiga!" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "Vlj tv filer fr att starta valet av uppackare." -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "Kan inte jmfra en fil med en katalog!" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "Kan inte hitta: %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "Filen r inte uppackad: %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3595,42 +3634,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "Kunde inte tolka Konfliktfilen." -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "Filen\n%1\nr inte en Konfliktfil." -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "Spara som" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "Spara ndringar i %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 r skrivskyddad. Vill du skriva ver filen (vlj Nej fr att spara filen med ett annat namn)?" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "Fel vid kontroll av skrivbarhet p destinationen!" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "Fel vid backup av filen" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3643,7 +3682,7 @@ msgstr "" "\n" "Vill du fortstta i alla fall?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3660,7 +3699,7 @@ msgstr "" "\t-anvnda ett annat filnamn (Tryck Ok)\n" "\t-avbryta sparande av fil (Tryck Avbryt)?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3675,7 +3714,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3690,7 +3729,7 @@ msgstr "" "\n" "Vill du spara den uppackade versionen till en annan fil?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3705,7 +3744,7 @@ msgstr "" "\n" "Vill du skriva ver den frndrade filen?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3714,7 +3753,7 @@ msgstr "" "%1\n" "r markerad bara lsbar. Vill du nd ndra i den?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3729,17 +3768,17 @@ msgstr "" "\n" "Om du vill uppdatera filer stng aktuell filjmfrelse och ppna filer igen." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "Spara vnster fil som" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "Spara hger fil som" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3750,42 +3789,42 @@ msgstr "" "\n" "Uppdatera filerna innan du fortstter." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "Du mste ange skvgen till ett SourceSafe-projekt fr att fortstta (t.ex.: $/MittProjekt)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "Hmtar filer frn VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "Versionshanteringssystemet (VSS) returnerade ett fel under frsket att checka ut filen. Det gr inte att fortstta..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "Fel vid utfrande av kommando fr versionshanteringssystem." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS-arbetskatalogen och lget p den aktuella filen matchar inte. Vill du fortstta nd?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "Ingen VSS databas hittad!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "Fel frn VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3796,7 +3835,7 @@ msgstr "" " Var god och, kontrollera konfigurationsspecifikation p anvnd markering.\n" " ngra checka ut tgrd?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3805,170 +3844,169 @@ msgstr "" "Versionshanteringssystemet (VSS) returnerade ett fel under frsket att ngra checka ut av filen.\n" " Var god och, kontrollera konfigurationsspecifikation p anvnd markering. " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "Inget" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (lgre n 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 eller hgre)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "Radbryt p mellanslag" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "Radbryt p mellanslag eller punkt" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "Kopiera valt objekt till angiven katalog" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "Kopiera valt objekt till anpassad katalog" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "Ta bort valda objekt p vnster sida" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Ta bort valda objekt p hger sida" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "Ta bort valda objekt p bda sidor" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "Dlj valda objekt (realtidsfilter)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "Byt namn p valt objekt p bda sidor" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "Hger till vnster (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "Vnster till hger (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "Hger till vnster (%1 av %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "Vnster till hger (%1 av %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "Vnster till... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "Hger till... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "Vnster till... (%1 av %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "Hger till... (%1 av %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "Vnster (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "Hger (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "Bda (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "Vnster (%1 av %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "Hger (%1 av %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "Bda (%1 av %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "Vlj destinationskatalog" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "Vnster sida - vlj destinationskatalog:" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "Hger sida - vlj destinationskatalog:" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 filer pverkade)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 av %2 filer pverkade)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3979,17 +4017,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "r du sker p att du vill kopiera:" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "r du sker p att du vill kopiera %d objekt:" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4008,458 +4046,473 @@ msgstr "" "\n" "Var god och uppdatera jmfrelsen." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "ppna den vnstra filen" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "ppna den vnstra filen med en extern editor" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "ppna den vnstra filen med ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "ppna den hgra filen" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "ppna den hgra filen med en extern editor" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "ppna den hgra filen med ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Kunde inte starta den externa editorn %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "Oknt suffix fr extern editor: %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "Kopiera filnamn till klippbordet" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "Kopiera vnster sidas skvgar till klippbordet" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "Kopiera hger sidas skvgar till klippbordet" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "Kopiera bda sidors skvgar till klippbordet" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Oknt arkivformat" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "Lgg till objekt frn vnster sida till arkivet" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "Lgg till objekt frn hger sida till arkivet" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "Lgg till objekt frn bda sidor till arkivet" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "Lgg till olika objekt till arkivet (frn bda sidor)" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "Flytta vald fil till vnster till anpassad katalog" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "Flytta vald fil till hger till anpassad katalog" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "Filnamn" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Katalog" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "Resultat av jmfrelsen" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "Vnster datum" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "Hger datum" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "Filsuffix" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "Vnster storlek" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "Hger storlek" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "Hger Filstorlek (Frkortad)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "Vnster Filstorlek (Frkortad)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "Vnster skapaddatum" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "Hger skapaddatum" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "Nyare filer" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "Filversion p vnster fil" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "Filversion p hger fil" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "Kort resultat" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "Vnster attribut" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "Hger attribut" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "Vnster radslutstyp" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "Hger radslutstyp" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "Vnster kodning" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "Hger kodning" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "Ignorerade skillnader" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "Skillnader" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Binr" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Kan inte jmfra filerna" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "Objekt avbrutet" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Hoppat ver filen" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "Hoppat ver katalogen" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "Bara vnster: %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "Bara hger: %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "De binra filerna r identiska" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "De binra filerna r olika" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "Filerna r olika" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "Endast vnster" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "Endast hger" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "Fel" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "Frfluten tid: %ld ms" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "1 objekt valt" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "%1 objekt valda" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "Filnamn eller katalognamn." -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "Underkatalognamn nr underkataloger inkluderas." -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "Jmfrelseresultat, lng version." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "Vnster sidas ndringsdatum." -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "Hger sidas ndringsdatum." -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "Filsuffix." -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "Vnster fils storlek i bytes." -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "Hger fils storlek i bytes." -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "Vnster filstorlek r frkortad." -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "Hger filstorlek r frkortad." -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "Vnster sidas skapelsetid." -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "Hger sidas skapelsetid." -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "Visar vilken sida som har ett nyare ndringsdatum." -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "Vnster sidas filversion, bara fr ngra filtyper." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "Hger sidas filversion, bara fr ngra filtyper." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "Kortfattat jmfrelseresultat." -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "Vnster sidas attribut." -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "Hger sidas attribut." -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "Vnster sidas filradslutstyp" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "Hger sidas filradslutstyp" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "Vnster sidas kodning." -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "Hger sidas kodning." -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "Antal ignorerade skillnader i filen. Dessa skillnader ignorerades av WinMerge och kan inte lggas samman." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "Antal skillnader i filen. Detta antal inkluderar inte ignorerade skillnader." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "Visar stjrna (*) om filen r binr." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "Jmfr %1 med %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "Komma-separerad lista" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "Tabb-separerad lista" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "Enkel HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "Enkel XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "Rapportfilen finns redan. Vill du skriva ver denna fil?" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4468,32 +4521,32 @@ msgstr "" "Fel vid skapande av rapport:\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "Rapporten har skapats." -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "Samma fil r ppnad i vnster och hger panel." -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "De valda filerna r identiska." -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "Ett fel intrffade under jmfrelsen av filerna." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Temporra filer kunde inte skapas. Kontrollera instllningarna fr dina temporra skvgar." -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4508,32 +4561,32 @@ msgstr "" "\n" "OBS: Om du alltid vill betrakta alla radslutstyper som likvrdiga, markera alternativet 'Ignorera skillnader i radslut (DOS,UNIX,MAC)' i Jmfr-fliken i Instllningar-dialogen (finns under Redigera/Instllningar)." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 "Radsluten r av olika typer (Windows/Unix/Mac) i filen '%1'.\n Med de aktuella instllningarna, kommer de att ndras till den vanligaste typen.\n Vill du ndra i instllningarna och bevara de olika radsluten ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "Ett fel uppstod vid prediffing av filen '%1' med plugin '%2'. Prediffing anvnds inte mer." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "Den valda katalogen r ogiltig." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "Kan inte ppna en binr fil fr att editera." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 "Katalogen finns bara p andra sidan och kan inte ppnas.\n\nVill du skapa en matchande katalog:\n%1\np andra sidan och ppna dessa kataloger?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4544,132 +4597,132 @@ msgstr "" "Att visa varje fil i dess egen Codepage ger en bttre visning men sammanfogning/kopierande blir farligt.\n" "Vi freslr att du glmmer Codepage informationen. nskar du detta ?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "Varning: Filerna anvnder olika filkodningar, vnster=%s och hger=%s, och sammanfogning kan leda till frlust av information." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "Information frlorades p grund av kodningsfel i: bda filerna" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "Information frlorades p grund av kodningsfel i: hger fil" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "Information frlorades p grund av kodningsfel i: vnster fil" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Ingen skillnad" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "Radskillnad" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "Ersatt %1 strng(ar)." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "Kan inte hitta strngen \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "Kopiera hela skvgen" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "Kopiera filnamn" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "Skillnadsflt" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "Skillnadsbild" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "Patchfilen sparad." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "Det gick inte att hitta frsta filen, eller s r det en katalog!" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "Det gick inte att hitta andra filen, eller s r det en katalog!" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "Patchfilen finns redan. Vill du skriva ver den?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 fil(er) valda]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "Normal" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "Sammanhang" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "Frenad" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "Kunde inte spara filen %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "Den specificerade resultatskvgen r inte en absolut skvg: %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "Vlj ett filnamn fr resultatet" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "Kan inte skapa en patchfil frn binra filer." -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "Kan inte skapa en patchfil frn kataloger." -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4680,17 +4733,17 @@ msgstr "" "\n" "Att skapa en patch krver att det inte finns ngra osparade frndringar i filerna." -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "Katalogen finns inte." -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "Aktuella katalogjmfrelseresultat kommer att tas bort." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4701,7 +4754,7 @@ msgstr "" "Alla krvda komponenter (7-zip och/eller Merge7z*.dll) fr arkivstd kan inte hittas.\n" "Se manualen fr mer information om arkivstd och hur man startar det." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4710,7 +4763,7 @@ msgstr "" "\n" "Notera: 7-Zip integration r avstngd i WinMerges instllningar." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4719,37 +4772,37 @@ msgstr "" "\n" "Notera: 7-Zip integration r begrnsad till fristende anvndning i WinMerges instllningar." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "Vlj fil att exportera" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "Vlj fil att importera" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "Instllningar importerades frn filen." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "Instllningar exporterades till filen." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Det gick inte att importera instllningar frn filen." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "Det gick inte att spara instllningar till filen." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4760,473 +4813,493 @@ msgstr "" "\n" "Vill du gra detta?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "Fel i reguljrt uttryck" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "Ingen trff" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "Ogiltigt reguljrt uttryck" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "Ogiltigt repetitionstecken" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "Ogiltigt teckenklassnamn" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "Baktlutat snedstreck sist p en rad" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "Felaktig baktreferens" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "Inte matchande [ eller [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "Inte matchande ( eller \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "Inte matchande \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "Felaktigt innehll av \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "Felaktigt intervallslut" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "Slut p minne" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "Ogiltigt fregende reguljrt uttryck" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "Fr tidigt slut p reguljrt uttryck" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Reguljrt uttryck r fr stort" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "Inte matchande ) eller \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Vsteuropeisk" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "steuropeisk" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "stasisk" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "Sydst- och sydvstasiatisk" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Mellanstersk" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Inte tillmplig" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Kyrillisk" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabiska" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Grekiska" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltisk utkant" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Grekisk 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Kyrillisk" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkiska" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portugisiska" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Islndska" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebreiska" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS Franska (Kanadensisk)" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordisk" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Kyrillisk CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Grekisk 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thailndska" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanska" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Frenklad Kinesiska" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Koreanska" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditionell Kinesiska" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Kyrillisk (Slavisk)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Grekiska" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkiska)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebreiska" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabiska" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltisk utkant" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamesiska" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Romersk" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Grekiska" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Kyrillisk" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh Centraleuropeisk" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Islndsk" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkiska" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "Liknar ISO-8859-2(Latin 2)" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "Liknar ISO-8859-1(Latin 1)" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "Liknar ISO-8859-7(Grekisk)" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "Liknar ISO-8859-9(Turkisk)" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "Liknar ISO-8859-8(Hebreisk)" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "DOS" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "MAC" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "UNIX" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "Blandad" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "Sparar den vnstra filen" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "Sparar den hgra filen" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "Sparar den vnstra filen som..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "Sparar den hgra filen som..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr "ndrar skrivskydd p vnster fil/katalog" +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr "ndrar skrivskydd p hger fil/katalog" +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "Konverterar radslut till Windows-format" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "Konverterar radslut till Unix-format" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "Konverterar radslut till Mac-format" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "Vxlar mellan Editeramod och Mergemod" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5235,12 +5308,12 @@ msgstr "" "Visar och ndrar filkodningsegenskaper\n" "Filkodningsegenskaper" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "ppna och fixa Konfliktfilen" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5249,7 +5322,7 @@ msgstr "" "Markerar skillnad p aktuell rad\n" "Skillnad p aktuell rad" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5258,7 +5331,7 @@ msgstr "" "Gr till rad eller skillnad\n" "G till (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5267,7 +5340,7 @@ msgstr "" "ndrar programinstllningar\n" "Instllningar" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5276,37 +5349,37 @@ msgstr "" "Uppdaterar innehllet\n" "Uppdatera (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "Kopierar valda rader till klippboken och lgger till radnummer i brjan p raderna" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "Uppdaterar valda objekt" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "Vxlar Bokmrke" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "Gr till nsta Bokmrke" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "Gr till tidigare Bokmrke" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "Tar bort alla Bokmrken" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5315,7 +5388,7 @@ msgstr "" "Visar objekt som r exakt lika\n" "Visa identiska objekt" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5324,7 +5397,7 @@ msgstr "" "Visar objekt som har skillnader\n" "Visa skillnader i objekt" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5333,7 +5406,7 @@ msgstr "" "Visar objekt som bara finns p vnster sida\n" "Visa vnsterunika objekt" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5342,7 +5415,7 @@ msgstr "" "Visar objekt som bara finns p hger sida\n" "Visa hgerunika objekt" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5351,7 +5424,7 @@ msgstr "" "Visar binra filer\n" "Visa binra filer" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5360,7 +5433,7 @@ msgstr "" "Visar verhoppade objekt\n" "Visa verhoppade objekt" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5369,7 +5442,7 @@ msgstr "" "Vljer typsnitt fr fnstren\n" "Vlj typsnitt" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5378,42 +5451,42 @@ msgstr "" "Vljer standardtypsnitt fr fnstren\n" "Vlj standardtypsnitt" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "Visar ett tecken fr mellanslag" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "Vxla skillnadsbilden" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "Skillnadsbilden visar en vergripande bild av filerna" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "Visar dialog med katalogjmfrelsestatistik" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "Vljer sprk fr anvndargrnssnittet\nSprk" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "Visar skillnader inom rader med olika frg\nVisa radskillnad" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "Vxlar placering p de tv filerna" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5422,7 +5495,7 @@ msgstr "" "Visar radnummer\n" "Visa radnummer" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5431,7 +5504,7 @@ msgstr "" "Startar radbrytning\n" "Radbrytning" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5440,47 +5513,47 @@ msgstr "" "Visar marginaler fr bda filerna\n" "Visa filmarginaler" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "ka textstorlek" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "Minska textstorlek" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "terstll textzoomning till standardstorlek" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "Gr till fregende skillnad\nFregende skillnad (Alt+Upp)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "Gr till nsta skillnad\nNsta skillnad (Alt+Ner)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "Gr till frsta skillnaden\nFrsta skillnad (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "Gr till aktuell skillnad\nAktuell skillnad (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "Gr till sista skillnaden\nSista skillnad (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5489,7 +5562,7 @@ msgstr "" "Kopierar den valda texten till den hgra filen\n" "Kopiera hger (Alt+Hger)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5498,7 +5571,7 @@ msgstr "" "Kopierar den valda texten till den vnstra filen\n" "Kopiera vnster (Alt+Vnster)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5507,7 +5580,7 @@ msgstr "" "Kopierar skillnad till hger och gr fram till nsta\n" "Kopiera hger och g framt (Ctrl+Alt+Hger)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5516,7 +5589,7 @@ msgstr "" "Kopierar skillnad till vnster och gr fram till nsta\n" "Kopiera vnster och g framt (Ctrl+Alt+Vnster)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5525,7 +5598,7 @@ msgstr "" "Kopierar alla skillnader till den hgra filen\n" "Kopiera allt till hger" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5534,368 +5607,378 @@ msgstr "" "Kopierar alla skillnader till den vnstra filen\n" "Kopiera allt till vnster" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "Tar bort valda objekt frn bda katalogerna" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "Jmfr valt objekt (jmfr frsta objektet om flera objekt r valda)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "Vlj och sortera om kolumnerna fr katalogjmfrelse" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "Skapar en patchfil" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "Vljer och ndrar filter" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "Genererar en rapport fr jmfrresultat" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "Anvndaren vljer uppackare (ingen uppackning nr man jmfr kataloger)" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "Den valda uppackaren anvnds fr bda filerna (bara en fil behver ha filsuffixet)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "Vlj en uppackare fr att ndra i denna fil" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "Ingen prediffer (standard)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "Freslagna plugins" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "Andra plugins" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Stng alla plugins och ppna dem igen (fr utvecklare)" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" "Aktiverar nsta synliga fil\nAktivera nsta fil" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Stnger alla ppna fnster" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "ppnar WinMerge Hjlp\nWinMerge Hjlp" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Sparar aktuell WinMerge Versionsinfo och Konfiguration till en textfil" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "Visar GNU General Public License" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "Privat Kompilering: %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "ppnar Releasenoteringsdokumentet\nReleasenoteringar" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "ppnar versttningssidan\nversttningar" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "Plugin-instllningar" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "Ingen prediffer" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "Prediffer om mjligt" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "Windows Script Host ('wscript.exe') hittades inte - .sct script r avstngda" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "ppna filen med registerat program" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "ppna filen med extern editor" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "ppna filen med ett speciellt program" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "Visa inte flyttade block" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "Visa alla flyttade block" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "Visa flyttade block bara frn aktuell skillnad" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "G till skillnad under cursor" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "G& till skillnad %1 av %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "G& till rad %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "Avstngd" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "Frn Filsystem" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "Frn Senast Anvnda filer" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portabelt Objekt" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resurser" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "Dlj verktygsraden" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "Visa liten verktygsrad" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "Visa stor verktygsrad" diff --git a/Src/Languages/Turkish.po b/Src/Languages/Turkish.po index 7eaade75b1a..cc621198f77 100644 --- a/Src/Languages/Turkish.po +++ b/Src/Languages/Turkish.po @@ -71,7 +71,7 @@ msgstr "" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "" @@ -83,7 +83,7 @@ msgid "&Paste" msgstr "" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "" @@ -94,62 +94,64 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&Dosya" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "&Yeni\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&A...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -160,2949 +162,2969 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "k&" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&Dzen" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&Seenekler..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&Grnm" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "Fo&nt Se" #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "&Varsaylan Fontu Kullan" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "Durum ubuu" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&Dil" #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&Aralar" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Filtreler" #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "&Yama ret..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&Eklentiler" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "&Manuel Amak" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "&Otomatik Amak" -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "&Acyla Dzenler" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "Eklentileri &Tekrar Ykle" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "Pencereler" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "&Kapat" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "&Pencere Deitir\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "&Yatay De" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "&Dikey De" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&Srala" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&Yardm" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "&Yedekleme Destei Kapal" -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "&WinMerge Hakknda..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Salt Okunur S&ol" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "Salt Okunu&r Sa" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "&Tmn Se\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "Ta&zele\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&Birletirme" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "&Sonraki Fark\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "&nceki Fark\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "&lk Fark\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "&u Anki Fark\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "S&on Fark\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "S&aa Kopyala\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "So&la Kopyala\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "Kolonlar &zelletir" -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&Kaydet\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "S&olu Kaydet " -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&Kaydet" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "&Farkl Kaydet" -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "&Sa Kaydet" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "Birletirme &Durumu\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&Geri Al\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&Geri Al Geri Al\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&Kes\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "Ko&pyala\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&Yaptr\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&Bul...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&Deitir...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&Senaryolar(Scripts)" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< Bo >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "&Git...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "&Boluklar Gster" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "Fark Penceresi" -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "Pozisyon Penceresi" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "&Gelimi Saa Kopyala\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "G&elimi Sola Kopyala\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "&Tmn Saa Kopyala" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "T&mn Sola Kopyala" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "&ncelikli Fark" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" "need to restart session" msgstr "" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "041f04e6" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x41f, 1254" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" "New Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" "Open (Ctrl+O)" msgstr "" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" "Close" msgstr "" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" "Save (Ctrl+S)" msgstr "" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" "Print" msgstr "" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" "Print Preview" msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" "About" msgstr "" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" "Cascade Windows" msgstr "" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" "Tile Windows Horizontally" msgstr "" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" "Tile Windows Vertically" msgstr "" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" msgstr "" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" "Find" msgstr "" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" "Paste" msgstr "" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" "Repeat" msgstr "" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" "Replace" msgstr "" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" "Select All" msgstr "" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" "Undo (Ctrl+Z)" msgstr "" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" "Redo (Ctrl+Y)" msgstr "" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3110,7 +3132,7 @@ msgid "" "Please use values 1 - %1." msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3118,127 +3140,129 @@ msgid "" "Please re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3247,7 +3271,7 @@ msgid "" "%2." msgstr "" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3256,7 +3280,7 @@ msgid "" "Please make sure the folder exists and is writable." msgstr "" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3264,7 +3288,7 @@ msgid "" "Please select filter folder in Options/System." msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3273,12 +3297,12 @@ msgid "" "Maybe the file is read-only?" msgstr "" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3286,208 +3310,223 @@ msgid "" "Could not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3496,42 +3535,42 @@ msgid "" "%2" msgstr "" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3540,7 +3579,7 @@ msgid "" "Continue anyway?" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3551,7 +3590,7 @@ msgid "" "\t-abort the current operation (Press Cancel)?" msgstr "" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3561,7 +3600,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3571,7 +3610,7 @@ msgid "" "Do you want to save the unpacked version to another file?" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3581,14 +3620,14 @@ msgid "" "Overwrite changed file?" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3598,17 +3637,17 @@ msgid "" "If you want to refresh files close current file compare and load files again." msgstr "" -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3616,42 +3655,42 @@ msgid "" "Refresh documents before continuing." msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3659,177 +3698,176 @@ msgid "" " Undo checkout operation?" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2155 #, 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:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3837,17 +3875,17 @@ msgid "" "%1 ?" msgstr "" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -3859,490 +3897,505 @@ msgid "" "Please refresh the compare." msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" "%1" msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4352,32 +4405,32 @@ msgid "" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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:2351 +#: Merge.rc:2385 #, 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:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4385,132 +4438,132 @@ msgid "" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4518,17 +4571,17 @@ msgid "" "Creating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4536,51 +4589,51 @@ msgid "" "See manual for more info about archive support and how to enable it." msgstr "" -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4588,1097 +4641,1127 @@ msgid "" "Do you want to continue?" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" +msgid "Change left side file/folder read-only status" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" +msgid "Change right side file/folder read-only status" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" "Go to (Ctrl+G)" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" "Options" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" "Refresh (F5)" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" "Select View Font" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" "Default Font" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" "Copy Right (Alt+Right)" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" "Copy Left (Alt+Left)" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" "Copy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" "Copy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" "All Right" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" "All Left" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Languages/Ukrainian.po b/Src/Languages/Ukrainian.po index 78813317b66..ed875e2bada 100644 --- a/Src/Languages/Ukrainian.po +++ b/Src/Languages/Ukrainian.po @@ -73,7 +73,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "&" @@ -85,7 +85,7 @@ msgid "&Paste" msgstr "&" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr " ..." @@ -96,62 +96,64 @@ msgid "Op&en" msgstr "³" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr " " #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr " " #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr " ..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "&" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "&³...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "³ ..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "³ ...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr " ..." @@ -162,1855 +164,1864 @@ msgid "Recent Projects" msgstr " " #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "&" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "&" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "&..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "&" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr " &..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr " & " #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "& " #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "&" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "& " #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "& " #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "& " #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr " " #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "&..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "&" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "&Գ..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "& ..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "&" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr " " -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr " " -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr " " -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "& " -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "&" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "& ..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "& " -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "&³" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr " " -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr " &\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr " &" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr " &" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "&" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "&" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr " &WinMerge\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "& " -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "&" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "&" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "ϳ & ..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "&GNU General Public License" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "& WinMerge..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr " & " -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr " & " -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr " " -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "& \tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "г" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr " " -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr " " -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr " " -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr " " -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "&\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr " &\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "&'" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "& \tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "& \tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "& \tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "& \tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "& \tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr " & \tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr " & \tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "&\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "& ..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr " &..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "&\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr " &" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "&" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr " &..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr " &" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "&..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr " ..." -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr " " -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "& " -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr " \tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr " ..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "&\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "&\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "&\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "&\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "&\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr " \tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "&...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "&...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "&" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "&" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "& \tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "&" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "&\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "& \tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "& \tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "& " -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr " ...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "&" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "³\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "ϳ " -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr " " -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "& " -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr " " -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr " " -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr " " -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr " " -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr " " -#: Merge.rc:411 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "& " -#: Merge.rc:412 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr " " -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr " \tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr " \tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "& " -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "& " -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "& " -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "&" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr " " -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr " " -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "˳ ..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr " " -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr " ..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "&" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "&˳ ..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "& ..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "˳" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "&" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "&" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "³ " -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "³ " -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr " " -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "& (%1 %2)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr " & " -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "&" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "&... (%1 %2)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "ҳ &... (%1 %2)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "&" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr " " -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr " ' " -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr " " -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "& " -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "& " -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr " &" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "& " -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "& " -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr ". & " -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr " WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "( )" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr " ." -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "³ WinMerge !" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr " ..." -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "&˳:" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "&..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "&:" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "&..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "&Գ:" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "&:" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "& " -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr ":" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr " " -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr " :" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr ":" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr ":" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr ":" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr " VSS" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr " " -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr " " -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr " ..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr " " -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "& :" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "& cleartool.exe:" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr " & " -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr " &" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "& ESC" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr " " -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "& ﳿ" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr " " -#: Merge.rc:759 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr " " -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "ij :" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr " " -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr " &" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr " &" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge . , ." -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr " :" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "&:" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr " &" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr " &" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "& " -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "& " -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "&" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "&" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "&" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "&: " -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr " " -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr " &" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr " &" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "&" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "& " -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "CheckIn checkout" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "Գ " -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr " " -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr " ( ):" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "³:" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "³ :" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr " :" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr ":" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "³ :" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr " :" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "³ :" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr " " -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "ij" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr " " -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr " & " -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "& " -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr " " -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr " :" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "&Գ:" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr " " -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr " Temp" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr " :" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr " " -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr " 1:" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr " 2:" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr " " -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr ":" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr ":" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr ":" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr " " -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr " " -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr " " -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr " " -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "& " -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "³ " -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "³ " -#: Merge.rc:1072 +#: Merge.rc:1080 #, fuzzy, c-format msgid "Move &Up" msgstr "&" -#: Merge.rc:1073 +#: Merge.rc:1081 #, fuzzy, c-format msgid "Move &Down" msgstr "&" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr " " -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr " :" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr " , " -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr " :" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr ":" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr " " -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr " ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr ":" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr ":" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "&:" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr " " -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "&" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "&³" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "&" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr " &" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr " " -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr " & " -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr " &" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr " &" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr " (Win/Unix/Mac)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr " & " -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr " " -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr " , 3 " -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr " &:" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "& " -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "Գ " -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "ϳ " -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr " &" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr " " -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "³" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr " &:" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "&" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "&" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "ϳ " -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr " " -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr " " -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr " :" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "Գ " -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr " " -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr " " -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "& " -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "&³ " -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr " " -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "& " -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "³& " -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "³ " -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr " " -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr " " -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr " :" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2019,56 +2030,56 @@ msgstr "" " : .html, .rc, .xml \n" "( )" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr " " -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr " WinMerge" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr " :" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - ϳ " -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr " 7-Zip ( ?)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr " 7-Zip 3.11 , WinMerge." -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr " (Merge7z*.dll)" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr " 7-Zip" -#: Merge.rc:1291 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2077,540 +2088,551 @@ msgstr "" " \n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr " 7-Zip:" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr " 7-Zip :" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1307 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr " 7-Zip WinMerge:" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr " :" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr " .\n( )" -#: Merge.rc:1317 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr " " -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr " " -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr " :" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr " :" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr ":" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr ":" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr ":" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr ":" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr ". .:" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr " 1:" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr " 2:" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr " " -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "& :" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "&:" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr " " -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr " " -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr " ?" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr " ( )" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr " ( )" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "ϳ " -#: Merge.rc:1445 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "ϳ 7-Zip:" -#: Merge.rc:1447 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr " 7-zip" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "& " -#: Merge.rc:1450 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "& , 7-Zip" -#: Merge.rc:1453 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "& 7-Zip WinMerge" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "& / " -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr " " -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr ":" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr ":" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "³" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr ":" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr ":" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "˳:" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr ":" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr ":" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr " :" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "()" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr " " -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr ". :" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr " :" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr " " -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "&" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "&" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr " " -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr " ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr " :" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr ":" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "&" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "&" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr " " -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr " " -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr ":" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr " :" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "³. :" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr " " -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr " " -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "³..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr " ﳿ" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr " :" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr " :" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr " & " -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr " & :" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "' :" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "& .bak" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr " " -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "ϳ" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr " XXX ?" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "˳" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "ͳ" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "042204e3" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x422, 1251" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2619,7 +2641,7 @@ msgstr "" " \n" " (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2628,7 +2650,7 @@ msgstr "" "³ \n" "³ (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2637,7 +2659,7 @@ msgstr "" " \n" "" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2646,7 +2668,7 @@ msgstr "" " \n" " (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2655,7 +2677,7 @@ msgstr "" " '\n" " '" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2664,7 +2686,7 @@ msgstr "" " \n" " " -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2673,7 +2695,7 @@ msgstr "" " \n" " " -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2682,7 +2704,7 @@ msgstr "" " \n" "" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2691,12 +2713,12 @@ msgstr "" " \n" " " -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr " " -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2705,32 +2727,32 @@ msgstr "" "³ \n" " (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr " " -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr " " -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr " " -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr " ." -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr " ." -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2739,7 +2761,7 @@ msgstr "" " \n" " " -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2748,7 +2770,7 @@ msgstr "" " , \n" " " -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2757,27 +2779,27 @@ msgstr "" " ; \n" "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "³ " -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2786,7 +2808,7 @@ msgstr "" " \n" " " -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2795,7 +2817,7 @@ msgstr "" " \n" " " -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2804,7 +2826,7 @@ msgstr "" " \n" "³ " -#: Merge.rc:1782 +#: Merge.rc:1804 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2813,7 +2835,7 @@ msgstr "" " , ,\n" "³ " -#: Merge.rc:1783 +#: Merge.rc:1805 #, fuzzy, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2822,7 +2844,7 @@ msgstr "" " , ,\n" "³ " -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2831,7 +2853,7 @@ msgstr "" " \n" "" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2840,7 +2862,7 @@ msgstr "" " \n" "" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2849,7 +2871,7 @@ msgstr "" " \n" "" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2858,7 +2880,7 @@ msgstr "" " \n" "" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2867,7 +2889,7 @@ msgstr "" " \n" "" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2876,7 +2898,7 @@ msgstr "" " \n" "" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2885,7 +2907,7 @@ msgstr "" "³ \n" "³ " -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2894,7 +2916,7 @@ msgstr "" " \n" "" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2903,7 +2925,7 @@ msgstr "" " \n" "³" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2912,7 +2934,7 @@ msgstr "" " \n" " " -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2921,7 +2943,7 @@ msgstr "" " \n" " " -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2930,62 +2952,62 @@ msgstr "" " \n" " " -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr " \n " -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr " " -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr " " -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr " " -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr " " -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr " " -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr " " -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr " " -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "³ " -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr " " -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr " " -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -2994,183 +3016,183 @@ msgstr "" " \n" " " -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge " -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge " -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr " " -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr " - " -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr " , " -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr ":\nij (Dean Grimm), ˳ (Christian List), ʳ (Kimmo Varis), (Jochen Tucht), ҳ (Tim Gerundt), (Takashi Sawanaki), (Gal Hammer), (Alexander Skinner)" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "WinMerge -ί Ҳ. ; GNU General Public License ." -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "&O" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "&" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "&" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "&" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr " &" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "&" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "& " -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "&ͳ" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "ͳ & " -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "&" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "&" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "& " -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr " & " -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr " & " -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "ϳ " -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr " " -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr " " -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr ":" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr ":" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "˳:" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr ":" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr ":" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr " %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr " (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr " ." -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr " . , ." -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr " ." -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3181,7 +3203,7 @@ msgstr "" "\n" " 1 - %1." -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3192,127 +3214,129 @@ msgstr "" "\n" " WinMerge ." -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "³" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "|*.exe;*.bat;*.cmd| (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr " (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr " WinMerge (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr " (*.ini)|*.ini| (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr " (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt| (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr " HTML (*.htm,*.html)|*.htm;*.html| (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr " XML (*.xml)|*.xml| (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr " " -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr " " -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr " " -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr " " -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr " " -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "'" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "̳ " -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "Գ" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" -#: Merge.rc:1989 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr " ' " -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr " (*.flt)|*.flt| (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3325,7 +3349,7 @@ msgstr "" " %1 :\n" "%2." -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3338,7 +3362,7 @@ msgstr "" "\n" ", ." -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3349,7 +3373,7 @@ msgstr "" "\n" " ." -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3362,12 +3386,12 @@ msgstr "" "\n" " ." -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr " " -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3378,208 +3402,223 @@ msgstr "" "\n" " ." -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "Գ . ?" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr " " -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" + +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "& cleartool.exe :" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "& SS.EXE :" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr " " -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr " " -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr " " -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr " " -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr " " -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "̳ " -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr " ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "³ " -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr " " -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr " " -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr " " -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr " " -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr " ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr " ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr " ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr " ..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr ": %s : %d/%d : %d/%d : %s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr ": %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr ": %s : %d/%d : %d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "'" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "³ %1 %2" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "%1 " -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr " " #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr " %1 %2" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr ": %1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr " ײ " -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr " " -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr " " -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr " " -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr " " -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr " " -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr " , " -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr " !" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr " : %1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr " : %1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3592,42 +3631,42 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr " " -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "\n%1\n " -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr " ..." -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr " %1?" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 . ? ( ' )" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr " " -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr " ﳿ" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3640,7 +3679,7 @@ msgstr "" "\n" " - ?" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3657,7 +3696,7 @@ msgstr "" "\t- ' ( O)\n" "\t- ( )?" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3672,7 +3711,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3687,7 +3726,7 @@ msgstr "" "\n" " ?" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3702,14 +3741,14 @@ msgstr "" "\n" " ?" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" "is marked read-only. Would you like to override the read-only item?" msgstr "%1 . ?" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3724,17 +3763,17 @@ msgstr "" "\n" " , ." -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr " ..." -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr " ..." -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3745,42 +3784,42 @@ msgstr "" "\n" " ." -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr " , SourceSafe (: $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr " VSS..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr " . ..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr " ." -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr " VSS . ?" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr " VSS!" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr " VSS:" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3791,7 +3830,7 @@ msgstr "" " .\n" " ?" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3800,170 +3839,169 @@ msgstr "" "VSS 䳿.\n" " . " -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 #, c-format msgid "None" msgstr "" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe (, 5.0)" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 )" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr " " -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr " " -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr " " -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr " " -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr " " -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr " " -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr " " -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr " ( )" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr " " -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr " %1 %2 " -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr " %1 %2 " -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "... (%1 %2)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "... (%1 %2)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "˳ (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr " (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "˳ (%1 %2)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%1 %2)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr " " -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "˳ - :" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr " - :" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 )" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%1 %2 )" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -3974,17 +4012,17 @@ msgstr "" "\n" "%1 ?" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr " , :" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr " , %d :" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4003,458 +4041,473 @@ msgstr "" "\n" " ." -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "³ " -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "³ " -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "³ ..." -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "³ " -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "³ " -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "³ ..." -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr " %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr " : %1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr " " -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr " " -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr " " -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr " " -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr " " -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr " " -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr " " -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr " " -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr " " -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr " " -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr " " -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "' " -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr " " -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr " " -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr " " -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr " " -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr " " -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr " (.)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr " (.)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr " " -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr " " -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr " " -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr " " -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr " " -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr " " -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr " " -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr " " -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "˳ " -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr " " -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr " " -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr " " -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr ". " -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "³" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr " " -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr " " -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr " " -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr " " -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "ҳ : %1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "ҳ : %1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr " " -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr " " -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr " " -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "ҳ " -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "ҳ " -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr " : %ld " -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr " 1 " -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr " : %1" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "' " -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr " , " -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr " , ." -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr " " -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr " " -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr " " -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr " " -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr " " -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr " (.)" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr " (.)" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr " " -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr " " -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr ", " -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr " , ." -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr " " -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr " " -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr " " -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr " " -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr " " -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr " " -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr " " -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "ʳ . ֳ WinMerge ." -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ʳ . ." -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr " (*) ." -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr " %1 %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr ", " -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr ", " -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr " HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr " XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr " . ??" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4463,32 +4516,32 @@ msgstr "" " :\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr " " -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr " " -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr " " -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr " ." -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr " . " -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4503,32 +4556,32 @@ msgstr "" "\n" ": , ' ' ." -#: Merge.rc:2350 +#: Merge.rc:2384 #, 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 " (Windows/Unix/Mac) '%1'.\n .\n , , ?" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr " '%2' '%1'. ." -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr " ." -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr " ." -#: Merge.rc:2354 +#: Merge.rc:2388 #, 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 " .\n\n :\n%1\n ?" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4539,132 +4592,132 @@ msgstr "" " , .\n" " ()?" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr ": , =%s, =%s. ." -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr " : " -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr " : " -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr " : " -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr " " -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr " " -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr " %1 ." -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr " \"%s\"" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr " " -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr " ' " -#: Merge.rc:2391 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "̳ " -#: Merge.rc:2392 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "³" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr " ." -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. " -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. " -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr " . ?" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 ]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr " %1." -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr " : %1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr " " -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr " " -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr " " -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4675,17 +4728,17 @@ msgstr "" "\n" " , " -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr " " -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr " ." -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4697,7 +4750,7 @@ msgstr "" " (7-zip / Merge7z*.dll) . \n" " , ." -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4706,7 +4759,7 @@ msgstr "" "\n" ": 7-Zip WinMerge." -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4715,37 +4768,37 @@ msgstr "" "\n" ": 7-Zip." -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr " " -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr " " -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr ", ." -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr ", ." -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr " ." -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr " ." -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4756,473 +4809,493 @@ msgstr "" "\n" "?" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr " " -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr " " -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr " " -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr " '" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr " ' " -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr " " -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr " " -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr " [ [^" -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr " ( \\(" -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr " \\{" -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr " \\{\\}" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr " " -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr " '" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr " " -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr " " -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr " " -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr " ) \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "-" -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "-" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "-" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "- -" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "-" -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr " " -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh" -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh " -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe" -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "³ ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "³ ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "³ ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "³ ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "³ ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " " -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr " " -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr " " -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr " ..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr " ..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" -msgstr " ' ' / " +msgid "Change left side file/folder read-only status" +msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" -msgstr " ' ' / " +msgid "Change right side file/folder read-only status" +msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr " Windows" -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr " Unix" -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr " Mac" -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr " " -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5231,12 +5304,12 @@ msgstr "" " \n" " " -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "³ " -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5245,7 +5318,7 @@ msgstr "" "³ \n" "³ " -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5254,7 +5327,7 @@ msgstr "" " \n" " (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5263,7 +5336,7 @@ msgstr "" " \n" "" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5272,37 +5345,37 @@ msgstr "" " \n" " (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr " , " -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr " " -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr " " -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr " " -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr " " -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5311,7 +5384,7 @@ msgstr "" " \n" " " -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5320,7 +5393,7 @@ msgstr "" " \n" " " -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5329,7 +5402,7 @@ msgstr "" " \n" " " -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5338,7 +5411,7 @@ msgstr "" " \n" " " -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5347,7 +5420,7 @@ msgstr "" " \n" " " -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5356,7 +5429,7 @@ msgstr "" " \n" " " -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5365,7 +5438,7 @@ msgstr "" " \n" " " -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5374,42 +5447,42 @@ msgstr "" " \n" " " -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr " " -#: Merge.rc:2630 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr " " -#: Merge.rc:2631 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr " " -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr " " -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr " \n" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr " \n " -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr " " -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5418,7 +5491,7 @@ msgstr "" " \n" " " -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5427,7 +5500,7 @@ msgstr "" " \n" " " -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5436,47 +5509,47 @@ msgstr "" " \n" "³ " -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr " " -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr " " -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr " " -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr " \n (Alt+Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr " \n (Alt+Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr " \n (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr " \n (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr " \n (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5485,7 +5558,7 @@ msgstr "" " \n" " (Alt+Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5494,7 +5567,7 @@ msgstr "" " \n" " (Alt+Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5503,7 +5576,7 @@ msgstr "" " \n" " (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5512,7 +5585,7 @@ msgstr "" " \n" " (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5521,7 +5594,7 @@ msgstr "" " \n" " " -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5530,367 +5603,377 @@ msgstr "" " \n" " " -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr " " -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr " ( , )" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr " " -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr " " -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr " " -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr " " -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "" + +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr " ( 䳺 )" -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr " ( )" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr " " -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr " " -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr " " -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr " " -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr " ( )" -#: Merge.rc:2686 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr " \n " -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr " " -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "³ WinMerge\n WinMerge" -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr " WinMerge " -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr " GNU General Public License" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr " : %1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "³ \n " -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr " \n" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr " " -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr " " -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr " " -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "WSH - .sct " -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "³ " -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "³ " -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "³ " -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr " " -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr " " -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr " " -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr " " -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr " & %1 %2" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr " & %1" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr " " -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr " " -#: Merge.rc:2744 +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "Portable Object" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "ϳ" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr " " -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr " " -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr " " From 14e452790ac27c2add195ca7a4b088474acb237c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 16:04:57 +0000 Subject: [PATCH 071/168] WinMerge beta release 2.9.10 (SVN revision 5804) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index f690752642b..98b7c0bf88c 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,7 +3,7 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.9.1.6 +WinMerge 2.9.10 - 2008-08-14 (r5804) Manual: Introduction update (#2011365) Manual: Reorganize structure (#2011924) Add ShellExtension menu for drive letters (root folders) (#2011602) From 008bd92d650b3e48b957113e02ab8e27e5658109 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 14 Aug 2008 18:41:35 +0000 Subject: [PATCH 072/168] Add replaceables.xml that should have been added in patch 2038924 (r5781). --HG-- branch : R2_10 --- Docs/Users/Manual/replaceables.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Docs/Users/Manual/replaceables.xml diff --git a/Docs/Users/Manual/replaceables.xml b/Docs/Users/Manual/replaceables.xml new file mode 100644 index 00000000000..01998c74dc0 --- /dev/null +++ b/Docs/Users/Manual/replaceables.xml @@ -0,0 +1,30 @@ + + +
      + Replaceable phrases + + + + + + WinMerge product name + + WinMerge + + + + Current version (minor) + + 2.8.6 + + + + Current version (major) + + 2.8 + + + + +
      \ No newline at end of file From ef2a54d5ff79553ec06ecb5c72208f30cd0317d1 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Fri, 15 Aug 2008 04:48:32 +0000 Subject: [PATCH 073/168] Japanese translation - update --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 5 +++++ Src/Languages/Japanese.po | 35 +++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 98b7c0bf88c..be33454cad2 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,6 +3,11 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] + +WinMerge 2.10 RC + Translation updates: + - Japanese (r5804) + WinMerge 2.9.10 - 2008-08-14 (r5804) Manual: Introduction update (#2011365) Manual: Reorganize structure (#2011924) diff --git a/Src/Languages/Japanese.po b/Src/Languages/Japanese.po index 456ce2de0f5..9b2547def01 100644 --- a/Src/Languages/Japanese.po +++ b/Src/Languages/Japanese.po @@ -285,7 +285,7 @@ msgstr " #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "Xg(&L)..." #: Merge.rc:152 #: Merge.rc:269 @@ -2582,12 +2582,12 @@ msgstr " #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "vOC" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "vOCLɂ(&E)" #. StringFileInfo.Block #: Merge.rc:1691 @@ -3454,6 +3454,9 @@ msgstr " #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"tB^XV܂B݊JĂ邷ׂẴtH_rEChEXV܂?\n" +"\n" +"A܂ׂ͂Ă̔rEChEXVȂꍇAIAŔrEChEXVĂB" #: Merge.rc:2043 #, c-format @@ -3548,12 +3551,12 @@ msgstr " #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "Ō̑ɖ߂Ă܂..." #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Ȏ蒼Ă܂..." #: Merge.rc:2078 #, c-format @@ -4089,17 +4092,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "ڂړ܂?: " #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "%d‚̍ڂړ܂?: " #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "ړ̊mF" #: Merge.rc:2227 #, c-format @@ -5289,22 +5292,22 @@ msgstr " PB" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "^Cv" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "WJvOC" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "rOvOC" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr "GfB^XNvg" #: Merge.rc:2628 #, c-format @@ -5329,12 +5332,12 @@ msgstr " #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "̃t@C/tH_[hI[ԂɕύX܂" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "Ẽt@C/tH_[hI[ԂɕύX܂" #: Merge.rc:2634 #, c-format @@ -5725,7 +5728,7 @@ msgstr " #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "p”\ȃvOC̃Xg\܂" #: Merge.rc:2719 #, c-format @@ -5911,7 +5914,7 @@ msgstr " #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "nCCgȂ" #: Merge.rc:2789 #, c-format From fae8cdd26919a1f233cceea56337a27de69c6811 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Fri, 15 Aug 2008 06:46:14 +0000 Subject: [PATCH 074/168] PATCH [ 1989858 ] Use std::vector in word-diff code(2) - BugFix: Didn't select word-diff cyclically by pressing F4 key --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- Src/MergeDocLineDiffs.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index be33454cad2..d0cf1e18de4 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,8 +3,8 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] - WinMerge 2.10 RC + BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) Translation updates: - Japanese (r5804) diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp index f91ccff4401..6d15fe6b86a 100644 --- a/Src/MergeDocLineDiffs.cpp +++ b/Src/MergeDocLineDiffs.cpp @@ -238,7 +238,7 @@ void CMergeDoc::Computelinediff(CCrystalTextView * pView1, CCrystalTextView * pV } // Are we continuing a cycle from the same place ? - if (whichdiff >= worddiffs.size()) + if (whichdiff >= (int)worddiffs.size()) whichdiff = -2; // Clearly not continuing the same cycle, reset to not in cycle // After last diff, reset to get full line again From 6b1dee3947e8a81bf026f1a9e47ad20150a96f64 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 17 Aug 2008 17:33:10 +0000 Subject: [PATCH 075/168] PATCH: [ 2008581 ] Convert paths using system codepage Fixed crash in DirCmpReport::WriteString() (merge Jochen's fix from trunk rev. 5652) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/DirCmpReport.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index d0cf1e18de4..7845b2bca02 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 RC BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) + BugFix: Crash when generating a folder comparison report (#2008581) Translation updates: - Japanese (r5804) diff --git a/Src/DirCmpReport.cpp b/Src/DirCmpReport.cpp index 949167e5d53..d994aa33dac 100644 --- a/Src/DirCmpReport.cpp +++ b/Src/DirCmpReport.cpp @@ -223,7 +223,8 @@ void DirCmpReport::GenerateReport(REPORT_TYPE nReportType) */ void DirCmpReport::WriteString(LPCTSTR pszText) { - LPCSTR pchOctets = ansiconvert_ThreadCP((LPTSTR)pszText); + LPCSTR pchOctets = ansiconvert_ThreadCP(pszText); + void *pvOctets = const_cast(pchOctets); size_t cchAhead = strlen(pchOctets); while (LPCSTR pchAhead = (LPCSTR)memchr(pchOctets, '\n', cchAhead)) { @@ -236,7 +237,7 @@ void DirCmpReport::WriteString(LPCTSTR pszText) cchAhead -= cchLine; } m_pFile->Write(pchOctets, cchAhead); - free((void*)pchOctets); + free(pvOctets); } /** From 1985466a8bb7768d6aa4c46dbd96656c43344604 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Mon, 18 Aug 2008 19:39:46 +0000 Subject: [PATCH 076/168] PATCH: [ 2045666 ] Various Updates in German Translation --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/German.po | 44 ++++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 7845b2bca02..ed68ee75332 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.10 RC BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) Translation updates: + - German (#2045666) - Japanese (r5804) WinMerge 2.9.10 - 2008-08-14 (r5804) diff --git a/Src/Languages/German.po b/Src/Languages/German.po index 67395541e7b..5c4f6f7e5e7 100644 --- a/Src/Languages/German.po +++ b/Src/Languages/German.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-04-21 23:30+0100\n" +"PO-Revision-Date: 2008-08-16 14:30+0100\n" "Last-Translator: Tim Gerundt \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -287,7 +287,7 @@ msgstr "&Plugins" #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&Liste..." #: Merge.rc:152 #: Merge.rc:269 @@ -2588,12 +2588,12 @@ msgstr "Nein" #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "Plugins" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "&Plugins aktivieren" #. StringFileInfo.Block #: Merge.rc:1691 @@ -3428,8 +3428,14 @@ msgstr "Regul #: Merge.rc:2037 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"Filter wurden aktualisiert. Wollen Sie alle geffneten Ordnervergleiche aktualisieren?\n" +"\n" +"Wenn Sie nicht jetzt alle Vergleiche aktualisieren mchten, knnen Sie Nein whlen und die Vergleiche spter aktualisieren." #: Merge.rc:2043 #, c-format @@ -3521,15 +3527,17 @@ msgstr "Verschiebe Dateien..." msgid "Creating the report..." msgstr "Erzeugt den Bericht..." +# Use action instead operation, like the rest of the undo/redo system. #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "Rckgngigmachen der letzten Aktion..." +# Use action instead operation, like the rest of the undo/redo system. #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Wiederholen der vorherigen Aktion..." #: Merge.rc:2078 #, c-format @@ -4067,17 +4075,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "Wollen Sie wirklich verschieben:" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "Wollen Sie wirklich %d Objekte verschieben:" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "Verschieben besttigen" #: Merge.rc:2227 #, c-format @@ -5266,22 +5274,22 @@ msgstr " PB" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "Typ" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "Entpacker" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "Prediffer" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr "Editor-Skript" #: Merge.rc:2628 #, c-format @@ -5306,12 +5314,12 @@ msgstr "Speichert die rechte Datei unter..." #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "ndert den linken Schreibschutz-Status." #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "ndert den rechten Schreibschutz-Status." #: Merge.rc:2634 #, c-format @@ -5702,7 +5710,7 @@ msgstr "Erzeugt einen Bericht von den Vergleichsergebnissen." #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "Zeigt eine Liste der verfgbaren Plugins." #: Merge.rc:2719 #, c-format @@ -5888,7 +5896,7 @@ msgstr "Von MRU-Liste" #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "Keine Hervorhebung" #: Merge.rc:2789 #, c-format From 49d96f004682537d7f941cf2cc6f12f7fbc3d302 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 18 Aug 2008 20:51:51 +0000 Subject: [PATCH 077/168] PATCH: [ 2053195 ] Update Help topics docedit-misc-5812.patch Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Compare_files.xml | 8 ++++---- Docs/Users/Manual/Faq.xml | 8 ++++---- Docs/Users/Manual/Install.xml | 29 ++++++++++++++++------------- Docs/Users/Manual/Open_paths.xml | 4 ++-- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index 1c9291efc66..ba673f3522c 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -181,7 +181,7 @@ -
      +
      File pane fonts<indexterm> <primary>fonts</primary> @@ -373,7 +373,7 @@ your WinMerge environment. For example, if you click in a line of text within a difference, you might notice several navigation and merge buttons become enabled in the toolbar. If you click in another area of text that - is not within a difference, these functions become unavailable. </para> + is not within a difference, these functions become unavailable.</para> <para>Difference functions are available in the WinMerge toolbar,and also through these alternate mechanisms:</para> @@ -662,7 +662,7 @@ <replaceable>n</replaceable> spaces, where <replaceable>n</replaceable> is the number of characters defined as the <guilabel>Tab size</guilabel> in the Editor page of - WinMerge options (4 by default). </para> + WinMerge options (4 by default).</para> </listitem> <listitem> @@ -1532,7 +1532,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637--> <listitem> <para>Use all the normal compare and merge functions described earlier - in this topic to resolve the conflicts in the Mine File pane. </para> + in this topic to resolve the conflicts in the Mine File pane.</para> </listitem> <listitem> diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml index 8a5506a6e0a..34d3b6f6e85 100644 --- a/Docs/Users/Manual/Faq.xml +++ b/Docs/Users/Manual/Faq.xml @@ -468,14 +468,14 @@ </qandaset> </section> - <section> + <section id="Faq_encoding"> <title>Text encoding (codepages) - - How do I tell if my file is coded in the local windows (ie, - ANSI) codepage? + + How do I tell if my file is coded + in the local windows (ie, ANSI) codepage? diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index 9e1a8126c49..a4ec3b47472 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -26,7 +26,7 @@ sites.
      -
      +
      Using the installer (recommended) @@ -68,9 +68,10 @@ In the Select Components page, choose one of the preconfigured installations in the top control. We recommend the Typical configuration for most users. The lower box - shows all the available components. You can modify a preconfigured - installation by checking or unchecking components. For example, you - might choose additional language files. Components are: + shows all the available components. You can modify the default + configuration by checking or unchecking components. For example, if you + want to use a WinMerge localization for a different language than + English, select the Languages component. @@ -102,12 +103,14 @@ Languages - WinMerge translation files. After installing translation - file user interface language can be selected from menu - View - - Language - . + WinMerge translation files. If you want to configure + WinMerge to use a different language than English, expand this + item and choose one or more available translations. The installer + creates a Languages subfolder in the WinMerge folder, containing a + *.po translation file for each of your selections. After + installation, you can open WinMerge and change its localization to + one of the translation file languages. See for details. @@ -209,8 +212,8 @@
      -
      - Installing from an archive +
      + Installing from an archive WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs. @@ -423,4 +426,4 @@
      - \ No newline at end of file + diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 8882bc7d562..8ffd9e509d8 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -277,7 +277,7 @@ to compare one file/folder against several files/folders. --> By default, WinMerge does not include subfolders in compare operations. To change the default behavior, enable Include - subfolders by befault in the System page of WinMerge options. + subfolders by default in the System page of WinMerge options. To change include subfolders while using the shell integration, press and hold the Control key while selecting Compare in the Windows Explorer context @@ -490,4 +490,4 @@ to compare one file/folder against several files/folders. --> example, <left></left> or <left/>).
      - \ No newline at end of file + From d0a37610a819cdad93fc53932fd880dd30722176 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 19 Aug 2008 14:48:27 +0000 Subject: [PATCH 078/168] PATCH: [ 2053195 ] Update Help topics docedit-plugins-5819.patch Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Open_paths.xml | 40 +- Docs/Users/Manual/Plugins.xml | 519 +++++++++++++++----------- Docs/Users/Manual/replaceables.xml | 3 +- Docs/Users/Manual/select_unpacker.xml | 42 +++ 4 files changed, 380 insertions(+), 224 deletions(-) create mode 100644 Docs/Users/Manual/select_unpacker.xml diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 8ffd9e509d8..bfa6a608004 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -31,7 +31,7 @@ Select Files or Folders dialog more efficiently.
      - Environment variables + Using environment variables You can use environment variables in your paths. Windows expands the variable name between % (percent) delimiters. For example, if an @@ -69,7 +69,7 @@
      - Filter selection + Selecting filters The third edit field in the Select Files or Folders dialog, Filter, enables you to restrict the files that are @@ -106,6 +106,29 @@ default *.* extension list).
      + +
      + Selecting an unpacker for file comparisons + + Unpackers are plugins that are installed with WinMerge to provide + functionality that is not used by default. Plugins that can be used to + preprocess certain types of files before comparing them. For example, + WinMerge cannot normally compare MS Word doc files, but by unpacking them, + you can compare just the text contents. See for + details. + + To apply a plugin to your file comparison, click the + Select button for the Unpacker + option. In the Select Unpacker dialog: + + + + Your choice is displayed in the Unpacker field. + Note that you cannot select an unpacker when launching a Folder Compare + operation. +
      @@ -196,8 +219,7 @@ (Left) path in the comparison. The path is loaded in memory; meanwhile WinMerge waits for you select the second path in Windows Explorer, using the - Compare shortcut (described next). - + Compare shortcut (described next). @@ -248,11 +270,11 @@ to compare one file/folder against several files/folders. --> The shell integration paths that you map are stored in memory until you use them to open WinMerge. As a result, you don't need to select both - files at the same time or even using the same Windows Explorer view: you - can choose one, open a different directory, and choose the other one. - Both paths are discarded from memory after a compare operation. This means that you cannot select one - Compare To path and compare it against several - paths. + files at the same time or even using the same Windows Explorer view: you + can choose one, open a different directory, and choose the other one. Both + paths are discarded from memory after a compare operation. This means that + you cannot select one Compare To path and + compare it against several paths. Here is a simple method of using the advanced integration נthere are other scenarios, of course. In Windows Explorer: diff --git a/Docs/Users/Manual/Plugins.xml b/Docs/Users/Manual/Plugins.xml index 7602810446e..0df6c6d4e88 100644 --- a/Docs/Users/Manual/Plugins.xml +++ b/Docs/Users/Manual/Plugins.xml @@ -2,238 +2,329 @@
      Plugins - Plugins are extra-features for WinMerge. They are not included in the - basic version because they interest few users, or because they do not fit in - WinMerge architecture. + WinMerge plugins are custom dlls or scriptlets, written in the COM API, + that preprocess data before a comparison. For example, you can use a plugin to + extract text data from MS Word files for WinMerge to compare. Plugins are not + included when you install WinMerge, either because the functions that they + provide are of interest to only a few users, or because they do not fit into + the WinMerge architecture. - Each plugin: + Each plugin is: - is a single file, either a dll or a scriptlet (extension - .sct) + A single dll or a scriptlet (sct) file - is installed in the subfolder MergePlugins + Installed in the MergePlugins + subfolder. A number of plugins are installed for you by WinMerge. - is easy to install: copy the plugin file in MergePlugins, close WinMerge if it is - running, and launch it again + Easy to install: To install a plugin that is not included in the + WinMerge installation, just copy the plugin file to MergePlugins. The plugin is available the + next time you open WinMerge.
      - Three categories of plugins + Plugin Types - "Plugins" is a generic name for extra-feature dll - or scriptlets. Plugins features are spread over three categories: + Plugins are grouped into three main categories: -
      - Editor complement - - Operate custom operations on the currently selected text from the - active editor pane. - - Example plugin: (Turn the selection - to UPPER CASE or lower case.) -
      - -
      - Unpacker - Transform a file to a text format + + + Editor complement - The plugin transform a file in a viewable format (for example, - decompress a file). The original file is not changed. A temporary - transformed file is created and loaded in WinMerge. - - Sometimes the transformed file can be packed back. (See the plugin - details to know if it supports packing back.) Then you may merge and save - the transformed file. The packing is done automatically in this case. To - avoid problems, you are proposed to change the filename when saving a - changed file. - - - When you compare folders, WinMerge doesn't need to display the - files, but the diffing process can give a different result when you - compare compressed and not compressed files (for example, uncompressed - files may be identical, but the compressed files may differ if they - include the date of creation). WinMerge applies the unpacker in all - situations, and you are sure to have the same result when you compare - folder, or when you merge two versions of a file. - + + This type of plugin performs custom operations on selected text + in the active editor (File pane) of the File Compare window. + + - Example plugin: (Display XML - files nicely, by consistently inserting tabs and linebreaks.) -
      + + Unpacker: transform a file to a text format -
      - Prediffer - Preprocess files to hide some differences + + This type of plugin transforms a compressed file to a viewable + format by decompressing it. The original file is not changed: a + temporary transformed file is created and loaded in WinMerge. + + Unpacker plugins operate on entire files, not to selected text + or diffs within files. Therefore, they are available only when you + launch file comparisons, from either the Folder Compare window or the + Select Files or Folders dialog. Unpacker plugins are not available in + the File Compare window. + + Sometimes the unpacked file can be repacked (see the details in + to check whether a plugin + supports repacking). Then, you can merge and save the transformed + file. The packing is done automatically in this case. To be safe, we + suggest that you rename the transformed file when you save it. + + + When you compare folders, WinMerge can give different results + for compressed and uncompressed files. For example, files that are + identical when uncompressed might be different if they include the + creation date. WinMerge applies the unpacker in all situations, and + you are sure to have the same result when you compare a folder, or + when you merge two versions of a file. + + + Example plugin: reformats XML + files for readability. + + - The plugin is not apply to the files displayed in the editor. It is - applied only to temporary copies of the files, and this copies are then - scanned to create the difference list. + + Prediffer: preprocess files to hide some differences - Example plugin: (Ignore the - differences inside given columns, while displaying the characters in these - columns.) -
      + + This type of plugin does not operate on the source files + displayed in the Compare window. It operates instead on temporary + copies of the files, and the copies are then scanned to create the + difference list. + + Example plugin: ignores the + differences inside specified columns, while displaying the characters + in these columns. + +       +
      - Select and apply a plugin - -
      - "<guilabel>Suggested plugin</guilabel>" and "<guilabel>Automatic - mode</guilabel>" - - Each plugin specifies a list of file extensions (see plugins details - for more info). When the file extension, either from the left or from the - right file, matches the plugin list, the plugin is called "a - suggested plugin". - - When "Automatic mode" is on, WinMerge searches - for a suggested plugin and applies it if it is avaialble. When two - suggested plugins are available for a file, WinMerge applies the first one - only (alphabetical order). - - - "Automatic Unpacking" and - "Auto prediffer" are two separate options. - There is no option for editor complements. - -
      + Suggested plugins and automatic modes + + How is WinMerge able to apply the right plugin for a given file? Each + plugin specifies a list of file extensions (also listed in each plugin's + section, under File + filter). The extensions are used to associate one or more file + types with the plugin: when a compared file's extension matches an extension + in the plugin's list, the plugin is considered to be a suggested + plugin. + + There are separate WinMerge options for the unpacking and prediffer + types, described later in this topic, that enable you to apply the plugins + either manually or automatically. There is no automatic mode for editor + complement plugins. + + When you apply plugins to a selected file using automatic mode, + WinMerge searches its list of suggested plugins for that file type, and + applies the first plugin whose name matches. The search is performed in + alphabetical order, so if there are multiple suggested plugins for a file + type, only the first one found is applied. +
      -
      - Editor complement in folder view +
      + Applying plugins - Not available -
      + The following subsections describe how to apply each type of plugin. + The methods are different for each type of plugin, and also vary depending + on whether you are comparing folders or files.
      - Editor complement in editor view + Applying editor complement plugins in the File Compare + window - Access list from + With your cursor in either File pane of the File Compare window, + click Edit Scripts + and choose one of these functions: - ... - in the main menu. -
      + + + MakeUpper + -
      - Unpacker in folder view + + MakeLower + - Check - Plugins + + InsertDate + - Automatic Unpacking - in the main menu. You need to update the results - (F5). Each file is loaded again with its suggested - unpacker and compared. + + InsertTime + + + + The functions are contributed to the + Scripts menu by the and + plugins. + + + Editor complement plugins are not available in the Folder Compare + window. +
      - Unpacker in editor view + Applying unpacker plugins in the Folder Compare window - - - Open dialog: Select the two files first and then press the - Select button right from the field - "Unpacker". WinMerge displays the standard dialog - for unpacker selection. Use the top combobox to select the plugin. Two - generic choices "None" and - "Automatic" are also available. - + Before applying unpacker plugins, you can set its mode to either + automatic or manual mode. + - From the folder view when + To set automatic mode for this type of plugin, click Plugins Automatic Unpacking - is checked: Just double click to open the file. The - suggested plugin used during the folder comparison is used to load the - file in the editor. + . - From the folder view, always: Select one file, then main menu - + To set manual mode, click Plugins - Edit with Unpacker - . WinMerge displays the dialog for unpacker selection. - Select an unpacker and press OK, WinMerge opens - the editor view and applies this unpacker to load the file. This - plugin is forgotten when you close the editor view. + Manual Unpacking + . - + + + Remember to click F5 to reload the Folder Compare + window using the new setting. + +
      + Using automatic mode + + To apply plugins when automatic unpacking is set, simply launch a + compare operation on a file in the Folder Compare window. If the file's + type suggested unpacker plugin (if any) preprocesses the file before + WinMerge opens it in the File Compare window. + + For example, suppose you right-click an MS Word + doc file and choose + Compare (also assume that the plugin is available). WinMerge converts the + doc file (or rather, a copy of it ) to a plain text file and opens it in + the File Compare window. +
      + +
      + Using manual mode + + Manual mode enables you to choose a different unpacker plugin than + the one that is selected for you in automatic mode. You can also launch + the compare using no plugin. + + To apply plugins when manual unpacking is set: + + + + Select the file you want to compare. + + + + Click + Plugins + + Edit with Unpacker + . + + This menu item is enabled only if the selected file's type is + supported by an available unpacking plugin. + + + + In the Select Unpacker dialog: + + + + + + Click OK to close the Select Unpacker + dialog and launch the file comparison. + + +
      +
      + +
      + Applying unpacker plugins in the Select Files or Folders + dialog + + You can use the Select Unpacker dialog to apply a plugin when you + launch a file comparison from the Select Files or Folders dialog. See + for details.
      - Prediffer in folder view + Applying prediffer plugins in the Folder Compare window + + With prediffer plugins, you set the mode (Auto + prediiffer or No prediffer) for + individual files. (Contrast this with unpacker plugins, where you set the + mode for all files.) That is, some files in the same folder have different + prediffer modes. - When the files are selected, right-click to open the context menu. - Follow + To set the mode for one or more files in the Folder Compare window, + right-click the files and choose Plugin Settings Prediffer Settings - and select "Auto prediffer" or - "No prediffer". Refresh the view - (F5) to update the results. + , then choose one of the submenu options: + + + + Auto Prediffer selects the first + prediffer plugin available for the file type. + + + + No prediffer means that no prediffer + plugin is used. + + + + Click F5 to update the window. - "Auto prediffer" is a per-file option. - Some files in the same folder can be in mode "No - prediffer" and some in mode "Auto - prediffer". When you change folder during a non-recursive - compare, the mode is always reset to "No - prediffer". + When you open a subfolder during a non-recursive compare, the mode + is always reset to No prediffer. + + When you open a file from the Folder Compare window, your prediffer + setting for that file is applied before the File Compare window is + opened.
      - Prediffer in editor view + Applying prediffer plugins in the File Compare window - - - From the folder view when "Auto - prediffer" is checked for a file: Just double click to - open the file. The plugin used during the folder comparison is used in - the editor before the diff algorithm. - - - - During an editor session, access prediffer lists with menu - - Plugins - - Prediffer + In the File Compare winodw, you can apply a prediffer plugin by + clicking + Plugins - ... - : The active prediffer is checked. Suggested plugins - are indicated first above the not-suggested ones. The files are - compared again after the selection, you don't need to rescan. - - + Prediffer + and choosing one of the plugins in the list. Suggested + plugins are indicated at the top of the list. The files are compared again + after the plugin is applied, so you don't need to rescan the files.
      -
      +
      Available plugins
      <filename>CompareMSExcelFiles.dll</filename> - Displays the text content of a Displays the text contents of a Microsoft Excel file, stripping away all formatting and embedded objects. - Categorie + Category File filter @@ -254,7 +345,7 @@
      -
      +
      <filename>CompareMSWordFiles.dll</filename> Displays the text content of a - Categorie + Category File filter @@ -288,12 +379,12 @@
      <filename>DisplayXMLFiles.dll</filename> - This plugin display XML files nicely, by consistently inserting tabs - and linebreaks. This is to fix XML files which do not have line returns in + This plugin pretty-prints XML files nicely by inserting tabs and + line breaks. This is useful for XML files that do not have line returns in convenient locations. - Categorie + Category File filter @@ -312,7 +403,7 @@
      <filename>editor addin.sct</filename> - Add two functions to the + Adds two functions to the Edit Scripts @@ -331,7 +422,7 @@ - Categorie + Category Editor complement @@ -342,12 +433,14 @@
      <filename>IgnoreColumns.dll</filename> - The plugin ignore the characters at specified columns. It does not - support files with tabulations (no crash, but all tabs will be treated as - a normal character). The first column has number 1. + This plugin ignores characters at specified columns. The first + column is number 1 - For the parameters, you just need to rename the dll with the - following syntax: + Note that this plugin does not support files with tabs: the plugin + does not fail, but all tabs are be treated as normal characters. + + To specify columns, rename the dll using + following fields as parameters: @@ -364,12 +457,12 @@ - When max = min, max may be omitted. + When max = min, max can be omitted. - <filename>IgnoreColumns.dll</filename> syntax + <filename>IgnoreColumns.dll</filename> examples @@ -394,7 +487,7 @@ - Categorie + Category File filter @@ -409,12 +502,12 @@
      <filename>IgnoreCommentsC.dll</filename> - The plugin ignores comments (//... and - /* ... */) in C, C++, PHP and - JavaScript files. + The plugin ignores comments within //... and + /* ... */ delimiters in C, C++, + PHP and JavaScript files. - Categorie + Category File filter @@ -435,15 +528,16 @@
      <filename>IgnoreFieldsComma.dll</filename> - The plugin is for files with fields and comma - as delimiters (CSV files for example). It ignore the characters in the - specified fields. First field has number 1. + This plugin is for files with fields and commas as delimiters (CSV + files, for example). It ignores the delimiter characters. The first field + is number 1. - Modify the filename to specify the fields. See for the syntax. + To specify the delimiters, rename the dll using + the same parameter fields used for . - Categorie + Category File filter @@ -458,17 +552,17 @@
      <filename>IgnoreFieldsTab.dll</filename> - The plugin is for files with fields and - tabulations as delimiters - (Excel files saved in format *.txt for example). It ignore the characters - in the specified fields. First field has number 1. + This plugin is for files that use fields and tabs as delimiters + (for examle, Excel files saved in the *.txt format). It ignores the delimiter + characters. The first field is number 1. - Modify the filename to specify the fields. See for the syntax. + To specify the delimiters, rename the dll using + the same parameter fields used for . - Categorie + Category File filter @@ -484,10 +578,10 @@ <filename>IgnoreLeadingLineNumbers.dll</filename> This plugin ignores the leading line numbers in text files (for - example NC and BASIC files). + example, NC and BASIC files). - Categorie + Category File filter @@ -503,10 +597,10 @@
      -
      +
      <filename>insert datetime.sct</filename> - Add two functions to the + Adds two functions to the Edit Scripts @@ -525,7 +619,7 @@ - Categorie + Category Editor complement @@ -537,15 +631,15 @@ <filename>RCLocalizationHelper.dll</filename>, <filename>RCLocalizationHelperU.dll</filename> - The plugin preprocesses RC files by stripping out localized strings, - to enable comparing differnt language versions of the same RC file and - ignoring the translations. + This plugin preprocesses RC files by stripping out localized + strings, to enable comparing different language versions of the same RC + file and ignoring the translations. RCLocalizationHelperU.dll is the Unicode version. - Categorie + Category File filter @@ -561,8 +655,8 @@ <filename>WatchBeginningOfLog.dll</filename>, <filename>WatchEndOfLog.dll</filename> - For long LOG files, the user is often interested only in the first - lines or in the last lines. + For long LOG files, often only in the first lines or in the last + lines are significant. @@ -577,7 +671,7 @@ - Categorie + Category File filter @@ -592,9 +686,9 @@ - Developers may find information and code of examples in the source - package, under the folder "Plugins". + Developers can find information and code examples in the source + package, under the Plugins + folder.
      @@ -604,26 +698,25 @@
      Windows Script Host - Some editor complements need this optional component from Microsoft. + Some editor complement plugins require this optional component from + Microsoft. - If the list of editor complements does not present all editor - plugins, this component is probably missing. You can check easily. - WinMerge informs you with a comment at the bottom of the list. You may - install WSH on any version of Windows (need IE 4.0). Download it from - If the list of editor complements does not include all editor + plugins, this component is probably missing. To help you verify, WinMerge + displays a comment at the bottom of the list. You can install WSH on any + version of Windows Download it from MSDN - Library. + Library, using IE 4.0 or later.
      <application>Visual Basic</application> runtime library - Some plugins require Visual Basic runtime - library to work. + Some plugins require the Visual Basic + runtime library to work. You can download the required file msvbvm60.dll + url="http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60">msvbvm60.dll, or use the Run-Time Redistribution Pack from - +
      Replaceable phrases diff --git a/Docs/Users/Manual/select_unpacker.xml b/Docs/Users/Manual/select_unpacker.xml new file mode 100644 index 00000000000..6876a943611 --- /dev/null +++ b/Docs/Users/Manual/select_unpacker.xml @@ -0,0 +1,42 @@ + + +
      + Using the Select Unpacker dialog + + + + Configure automatic plugin selection or choose a plugin + manually: + + + + To use automatic mode (which applies the first available + plugin), verify that <None> is displayed in + the the File unpacker control. + + + + To choose a different plugin (if available), use the + File unpacker control to choose the + plugin. + + By default, this control lists only suggested plugins for the + file type you selected to compare. To see all available plugins, + enable the option, Display all packers, don't check the + extension. + + + + To launch the compare without using any plugin, choose + <None> in the File + unpacker control. + + + + + + Click OK to close the Select Unpacker + dialog. + + +
      From 6e278f97f3cfcc09775c492b08f2a70fa786004b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 19 Aug 2008 21:04:20 +0000 Subject: [PATCH 079/168] PATCH: [ 2053195 ] Update Help topics Locales-5821.diff Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Locales.xml | 347 ++++++++++++++++++---------------- 1 file changed, 185 insertions(+), 162 deletions(-) diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 9483cf9a283..6736d0726d6 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -2,219 +2,242 @@
      Locale support - WinMerge allows translating the user interface to other languages than - English. Several translations have been contributed. Translations are - available for the following languages: + The WinMerge user interface is in English by default, but you can + localize your installation to other languages for which translations have been + have been contributed. Localizing WinMerge changes text strings that are + displayed in the interface, including menus, dialogs, tooltips, and messages, + to the language you choose. - - - Bulgarian - + Note that localization does not extend beyond the translation of + strings. For example, it does not affect how numbers are divided or how words + are alphabetized. (Those issues should be addressed in the conventional + Windows manner by using the Regional settings in the Control Panel.) - - Catalan - + Localizing your WinMerge installation involves these two basic + steps: + - Chinese (both Simplified and Traditional) + : Make one or more language + files available to WinMerge. - Croatian + : Choose one of the + configured language files. + - - Czech - +
      + Configuring the localization - - Danish - + Configuring a localization simply involves making its translation file + available to WinMerge, either during or after the installation. - - Dutch - + + + It's easiest to configure a language file during WinMerge + installation. The instructions in describe how to use the Select + Components page to install one or more translation files. + - - French - + + If you did not configure a language file when you installed + WinMerge (or did not use the installer at all), there is no need to + re-install WinMerge. You can get the latest translation files from the + WinMerge site and configure it yourself: + + + + Create a folder named Languages under the WinMerge + installation directory (where WinMerge.exe or + WinMergeU.exe is located), if it does not + already exist. + + + + Go to the WinMerge download site. + Download one of the archived binary files (either Zip or 7z format) + for the current WinMerge version, and save it to your file + system. + + + + Open the downloaded archive, and locate the + *.po files, where * is a language (for example, + Swedish.po for the Swedish translation). + Extract the language files you want to the + Languages subfolder in your WinMerge + installation directory. + + + + The language files are now available the next time you run + WinMerge. + + +
      - - German - +
      + Changing the Winmerge interface language - - Greek - + If you have configured one or more translation files, as described in + the preceding section, you can change the localization of WinMerge to any of + them: - - Hungarian - + + + Run WinMerge. + - - Italian - + + Select Language from the + View menu. + - - Japanese - + + Select your language and click + OK. + + - - Korean - + The language of the WinMerge user interface is instantly + updated. +
      - - Norwegian - +
      + Available WinMerge localizations - - Polish - + WinMerge localizations contributed to date include the following + translations: - - Portuguese - + + + Bulgarian + - - Portuguese (Brazilian) - + + Catalan + - - Romanian - + + Chinese (both Simplified and Traditional) + - - Russian - + + Croatian + - - Slovak - + + Czech + - - Spanish - + + Danish + - - Swedish - + + Dutch + - - Turkish - + + French + - - Ukrainian - - - - - The translations cover interface content, including menus, dialogs, - tooltips, and messages -- essentially the translation of all the strings - displayed. However, they do not provide areas outside of string - translation; they do not handle how numbers are divided, or how words are - alphabetized. (These issues should be addressed in the conventional - Windows manner, which is via the Regional settings in the Control - Panel.) - + + German + -
      - Selecting language + + Greek + - In order to change the current user interface language, do the - following: + + Hungarian + - - Run WinMerge + Italian - Select Language from the - View menu + Japanese - Select your language and click - OK + Korean - - Note that the WinMerge user interface instantly updates to the - selected language. -
      + + Norwegian + -
      - Installing translation - - The easiest way to install translations is to select them in the - installer. Translations are selected in the 4th installer dialog - (Select components). The default install - (Typical Installation) does not install translations, - but they can be individually selected from the list. - - If you do not want to re-run installer, or did not install WinMerge - with the installer in the first place, then the WinMerge translation files - are available in the zipped versions. To install a new translation - file: - - - - Download the zipped release from WinMerge download - site. - - - - If the Languages - subfolder does not exist under the WinMerge directory (where - WinMerge.exe and/or - WinMergeU.exe is located) create it. - - - - Search for *.po files, where * is a - language name (Swedish.po for Swedish - translation) in the archive file. Extract that file to the - Languages subfolder. - - - - Run WinMerge - - - - Select Language from the - View menu - - - - Select your language and click - OK - - + + Polish + + + + Portuguese + + + + Portuguese (Brazilian) + + + + Romanian + + + + Russian + + + + Slovak + + + + Spanish + + + + Swedish + + + + Turkish + + + + Ukrainian + +
      - Reporting error in translation + Reporting errors in translation - Please submit errors you find in translations as bugs to our Please submit any errors you find in translations as bugs to our + bug-list. - It would be great if you can provide a corrected version of the translated - text also. + It would be great if you also provide a corrected version of the translated + text.
      Submitting a new translation - If you would like to add your language to the list, look at the - on-line - documentation for the details on how to do it. All translations - are not complete so it would be nice if you can help improving them. - Translating (or improving translation) does not require you to have all - compile tools or knowledge of WinMerge internals. Just read instructions - from above link. And if you have problems ask help from us in one of - WinMerge + If you would like to add your language to the list, read the Translations documentation + in the WinMerge Web site to learn how. All the translations are incomplete, + so your help improving them would be appreciated. Translating (or improving + translation) does not require you to have all the compile tools or to know + about WinMerge internals, just to follow the instructions in the preceding + link. And if you have problems, ask for help from us in one of the WinMerge forums.
      -
      +
      \ No newline at end of file From 9d95144b6344cfd49c05210e7f7ee7e916ca9d7d Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 20 Aug 2008 15:20:59 +0000 Subject: [PATCH 080/168] PATCH: [ 2053195 ] Update Help topics docedit-about-5824.diff Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/About_Doc.xml | 374 +++++++++++++++++++++++++------- 1 file changed, 296 insertions(+), 78 deletions(-) diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index 2581d8d5395..383785854c2 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -1,106 +1,324 @@
      - About this document + About WinMerge online Help - This document is the user manual for WinMerge . It explains the capabilities and limitations - of WinMerge. This manual is recommended reading for both new and experienced - users. + This is online Help for WinMerge . - To learn essential WinMerge basics, please read the following - topics: +
      + Audience - - - + WinMerge Help is intended for both new and experienced users. It + explains how to use WinMerge, and documents its capabilities and + limitations. +
      - - Gets you quickly started with WinMerge and shows its basic - usage. - - +
      + How to access Help - - + WinMerge Help topics are provided in two forms: + - Explains the folder comparison window, available operations, and - customizing the results display. + Microsoft HTML Help (WinMerge.chm), located + in your WinMerge\Docs installation directory. - - - - - Explains the file comparison/merge window, available operations, - methods of navigation, and modes. + HTML manual on the WinMerge Web site. - + - - + You can access WinMerge Help in several ways: - - Explains how to customize WinMerge, including handling whitespace, - colours, and text encoding. - - - + + + WinMerge Help menu - To learn to use WinMerge more efficiently, read these topics: + + While using WinMerge, click + Help - - - + WinMerge Help + . HTML Help opens at the beginning (this topic). + + - - Introduces several ways to open files and folders in WinMerge - - there are many! For example, do you know how to use the Shell Extension - context menu in advanced mode? - - + + Context-sensitive help - - + + While using any WinMerge window, press F1. If a specific topic + is available for your current window, Help opens at that topic. If + not, Help opens at the beginning. + + - - Describes the optional, extra features that you can add to - WinMerge using its plugin mechanism. - - + + WinMerge command line - - + + Use the /? or -? switch when running WinMerge from the command + line. HTML Help opens at the beginning. + + - - Explains how to control what is compared in the folder or file - comparison window. - - + + WinMerge Web site - - + + Open your Web browser to www.winmerge.org. Under + Features, follow the Online + manual link to the latest Help version. - - Lists command-line parameters for using WinMerge with other tools - or from a script. - - + + + + +
      - - +
      + How to use Help - - Contains answers to many common questions asked of - developers. + Please read the following topics to learn essential WinMerge + basics, - Before submitting questions to SourceForge.net, - please check the FAQ first to see if your question is answered - there. - - - + + + + + + Gets you quickly started with WinMerge and shows its basic + usage. + + + + + + + + Explains the folder comparison window, available operations, and + customizing the results display. + + + + + + + + Explains the file comparison/merge window, available operations, + methods of navigation, and modes. + + + + + + + + Explains how to customize WinMerge, including handling + whitespace, colours, and text encoding. + + + + + To learn about WinMerge in more detail, read these topics: + + + + + + + Introduces several ways to open files and folders in WinMerge - + there are many! For example, do you know how to use the Shell + Extension context menu in advanced mode? + + + + + + + + Describes the optional, extra features that you can add to + WinMerge using its plugin mechanism. + + + + + + + + Explains how to control what is compared in the folder or file + comparison window. + + + + + + + + Lists command-line parameters for using WinMerge with other + tools or from a script. + + + + + + + + Contains answers to many common questions asked of + developers. + + Before submitting questions to SourceForge.net, + please check the topic first to see if your + question is answered there. + + + +
      + +
      + Documentation conventions + + + + + + Example + + Indicates + + + + + + Enter UTF-8 in the field.Click + the Browse button to navigate to the + path.Press F5 once to refresh the + window. + + Bold font in descriptive text can indicate: + + A value or string that you are instructed to + enter + + + + The name of a GUI button or keycap + + + + + + Press + Ctrl + + O + + + Press indicates a keyboard action. + In this example, press the Ctrl and + O keys in combination. + + + + Click OK. + + Click indicates a left mouse click on an object, such as a + menu item or button. + + + + Click + File + + Open + . + + The arrow indicates menu navigation. In the example, you + choose the Open item in the WinMerge + File menu . + + + + Right-click the row and choose the + Compare shortcut. + + Click the right mouse button on an object to open its context + menu, and then either left-click or right-click the indicated item + in the context menu. + + + + Enter options file.iniUse + the Filter field to eliminate files from the + operation.One or more consecutive different lines form + one difference (or diff). + + Italicized text can represent: + + A replaceable value or string. In the first example, you + would substitute a real file name for the italicized term, but + enter the ini file extension, which is + not italicized, as written. + + + + The name of a field, menu, or control in a WinMerge + window. + + + + A significant word or phrase that is introduced. + + + + + + The path %WORKDIR%\project1 is expanded to + C:\workfiles\project1.TwoWords + + Monospaced text can indicate: + + A path or the name of a file or other system item + + + + Sample code fragments + + + + Sample output + + + + Information that you enter in a form or on the command + line + + + + + + + command + + inputpath + + outputpath + + + In syntax lines, brackets indicate optional elements. In this + example, you must enter an input path with the command; you can + enter an output path, but the command is valid without it. + + + + +
      \ No newline at end of file From 5c2145b0c09142fa4102839d93bc9ce14e8bd168 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 20 Aug 2008 16:04:49 +0000 Subject: [PATCH 081/168] PATCH: [ 2059836 ] Brazilian translation update Submitted by Felipe Periard Lopes --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/Brazilian.po | 44 ++++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index ed68ee75332..dfb9ad4bc28 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.10 RC BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) Translation updates: + - Brazilian (#2059836) - German (#2045666) - Japanese (r5804) diff --git a/Src/Languages/Brazilian.po b/Src/Languages/Brazilian.po index c81555187f8..e8e9c3845c9 100644 --- a/Src/Languages/Brazilian.po +++ b/Src/Languages/Brazilian.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2008-06-16 18:00+0000\n" +"POT-Creation-Date: 2008-08-14 01:28+0000\n" +"PO-Revision-Date: 2008-08-14 18:00+0000\n" "Last-Translator: Felipe Periard Lopes \n" "Language-Team: Brazilian \n" "MIME-Version: 1.0\n" @@ -288,7 +288,7 @@ msgstr "&Plugins" #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&Lista..." #: Merge.rc:152 #: Merge.rc:269 @@ -2581,12 +2581,12 @@ msgstr "N #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "Plugins" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "&Ativar plugins" #. StringFileInfo.Block #: Merge.rc:1691 @@ -3453,8 +3453,14 @@ msgstr "Express #: Merge.rc:2037 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"Os filtros foram atualizados. Voc quer atualizar todas as comparaes das pastas abertas?\n" +"\n" +"Se voc no quer atualizar todas as comparaes agora voc pode selecionar o No e atualizar as comparaes mais tarde." #: Merge.rc:2043 #, c-format @@ -3549,12 +3555,12 @@ msgstr "Criando o relat #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "Desfazendo a ltima operao..." #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Refazendo a operao anterior" #: Merge.rc:2078 #, c-format @@ -4091,17 +4097,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "Voc tem certeza que voc quer mover:" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "Voc tem certeza que voc quer mover os itens %d:" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "Confirmar o Movimento" #: Merge.rc:2227 #, c-format @@ -5290,22 +5296,22 @@ msgstr " PB" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "Tipo" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "Desempacotador" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "Prediffer" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr "Script do editor" #: Merge.rc:2628 #, c-format @@ -5330,12 +5336,12 @@ msgstr "Salvar o arquivo a direita com o nome..." #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "Mudar o status somente-leitura do arquivo/pasta do lado esquerdo" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "Mudar o status somente-leitura do arquivo/pasta do lado direito" #: Merge.rc:2634 #, c-format @@ -5726,7 +5732,7 @@ msgstr "Gera um relat #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "Mostra uma lista de plugins disponveis" #: Merge.rc:2719 #, c-format @@ -5912,7 +5918,7 @@ msgstr "Da lista da MRU" #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "Sem Destacamento" #: Merge.rc:2789 #, c-format From 6e2454f93121af72cec0347366a89d1d7e8020d9 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Wed, 20 Aug 2008 21:27:49 +0000 Subject: [PATCH 082/168] PATCH: [ 2060771 ] Add icon for "Plugins->List" menu item --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/MainFrm.cpp | 1 + Src/Merge2.rc | 1 + Src/res/plugins.bmp | Bin 0 -> 774 bytes Src/resource.h | 1 + 5 files changed, 4 insertions(+) create mode 100644 Src/res/plugins.bmp diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index dfb9ad4bc28..4beaabcc2ef 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -4,6 +4,7 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 RC + Add icon for "Plugins->List" menu item (#2060771) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) Translation updates: diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index a8fd825139d..6aaa0537ce5 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -116,6 +116,7 @@ const CMainFrame::MENUITEM_ICON CMainFrame::m_MenuIcons[] = { { ID_TOOLS_FILTERS, IDB_TOOLS_FILTERS, CMainFrame::MENU_ALL }, { ID_TOOLS_CUSTOMIZECOLUMNS, IDB_TOOLS_COLUMNS, CMainFrame::MENU_ALL }, { ID_TOOLS_GENERATEPATCH, IDB_TOOLS_GENERATEPATCH, CMainFrame::MENU_ALL }, + { ID_PLUGINS_LIST, IDB_PLUGINS_LIST, CMainFrame::MENU_ALL }, { ID_FILE_PRINT, IDB_FILE_PRINT, CMainFrame::MENU_FILECMP }, { ID_TOOLS_GENERATEREPORT, IDB_TOOLS_GENERATEREPORT, CMainFrame::MENU_FILECMP }, { ID_EDIT_TOGGLE_BOOKMARK, IDB_EDIT_TOGGLE_BOOKMARK, CMainFrame::MENU_FILECMP }, diff --git a/Src/Merge2.rc b/Src/Merge2.rc index 03821cb89c7..386a6cc1018 100644 --- a/Src/Merge2.rc +++ b/Src/Merge2.rc @@ -139,6 +139,7 @@ IDB_TOOLBAR_ENABLED32 BITMAP "res\\ToolbarEnabled32.bmp" IDB_VIEW_ZOOMIN BITMAP "res\\zoom_in.bmp" IDB_VIEW_ZOOMOUT BITMAP "res\\zoom_out.bmp" IDB_FILE_OPENCONFLICT BITMAP "res\\open_conflict.bmp" +IDB_PLUGINS_LIST BITMAP "res\\plugins.bmp" ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/res/plugins.bmp b/Src/res/plugins.bmp new file mode 100644 index 0000000000000000000000000000000000000000..65bbc303714550cf53f01da5695ab80134014024 GIT binary patch literal 774 zcmb7>F-rqM5QSF-OO3?hP=q6#c#0NUNGxoGR3Yh-%0jHw8&S~0!bTKq z0%Af0K@?F?w6M(|5Xn!7A9=7W=P7u+9p-kwcQdoMROs(B-DjQ{vQn%;R*&(B#=P|! zb3dTf-5_*K=f4`issyztbGbTpRvJ0YV;??VOdn>^(EjYtuZ7p^xz&nY*cr?n(&l}@szMTHi1`5Dxt1s-Zz8iNIX^CLKBUuyi9=w68X0)@EXLc7m;fb zPZjv-r;YHT65Op}L8HwQg15a*-E4_xaPhKGg~U6_G2KFIk6OauB{t_?wh Date: Thu, 21 Aug 2008 02:50:44 +0000 Subject: [PATCH 083/168] Fix small typo in Manual --HG-- branch : R2_10 --- Docs/Users/Manual/Locales.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 6736d0726d6..36e87eab683 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -3,8 +3,8 @@ Locale support The WinMerge user interface is in English by default, but you can - localize your installation to other languages for which translations have been - have been contributed. Localizing WinMerge changes text strings that are + localize your installation to other languages for which translations have + been contributed. Localizing WinMerge changes text strings that are displayed in the interface, including menus, dialogs, tooltips, and messages, to the language you choose. From 28a27a97b6b34f160822577bd8711117a7b0c730 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 21 Aug 2008 13:28:52 +0000 Subject: [PATCH 084/168] PATCH: [ 2062107 ] A Swedish Swedish.po translation update Submitted by Hans Eriksson --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/Swedish.po | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 4beaabcc2ef..fd5fb7a1fbe 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -11,6 +11,7 @@ WinMerge 2.10 RC - Brazilian (#2059836) - German (#2045666) - Japanese (r5804) + - Swedish (#2062107) WinMerge 2.9.10 - 2008-08-14 (r5804) Manual: Introduction update (#2011365) diff --git a/Src/Languages/Swedish.po b/Src/Languages/Swedish.po index fdf4a7f6419..a06310d5eb1 100644 --- a/Src/Languages/Swedish.po +++ b/Src/Languages/Swedish.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-03-04 16:04+0100\n" +"PO-Revision-Date: 2008-08-20 13:00+0100\n" "Last-Translator: Hans Eriksson \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -286,7 +286,7 @@ msgstr "&Plugins" #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&Lista..." #: Merge.rc:152 #: Merge.rc:269 @@ -2581,12 +2581,12 @@ msgstr "Nej" #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "Plugins" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "&Starta Plugins" #. StringFileInfo.Block #: Merge.rc:1691 @@ -3418,7 +3418,7 @@ msgstr "Regulj #: Merge.rc:2037 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." -msgstr "" +msgstr "Filtren r uppdaterade Vill du uppdatera alla ppna katalogjmfrelser?\n\nOm du inte vill uppdatera alla jmfrelser nu kan du vlja Nej och uppdatera jmfrelser senare." #: Merge.rc:2043 #, c-format @@ -4049,17 +4049,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "r du sker att du vill flytta:" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "r du sker att du vill flytta % objekt:" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "Bekrfta flyttning" #: Merge.rc:2227 #, c-format @@ -5232,22 +5232,22 @@ msgstr " PB" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "Typ" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "Uppackare" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "Prediffer" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr "Editorscript" #: Merge.rc:2628 #, c-format @@ -5272,12 +5272,12 @@ msgstr "Sparar den h #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "ndrar vnster sidas fil/katalog bara lsbar status" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "ndrar hger sidas fil/katalog bara lsbar status" #: Merge.rc:2634 #, c-format @@ -5640,7 +5640,7 @@ msgstr "Genererar en rapport f #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "Visar en lista p tillgngliga Plugins" #: Merge.rc:2719 #, c-format @@ -5811,7 +5811,7 @@ msgstr "Fr #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "Ingen markering" #: Merge.rc:2789 #, c-format From e3bf23240e6833ed76da9b53d942d9f21b7a5236 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 21 Aug 2008 13:34:26 +0000 Subject: [PATCH 085/168] PATCH: [ 2061726 ] Manual: Add Slovenian translation --HG-- branch : R2_10 --- Docs/Users/Manual/Locales.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 36e87eab683..64d4ff93791 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -199,6 +199,10 @@ Slovak + + Slovenian + + Spanish From 25e0c3509569e1942329fd9dc784ab01e3dc0ee3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 21 Aug 2008 13:45:52 +0000 Subject: [PATCH 086/168] PATCH: [ 2062442 ] Greek Translation Update - R2_10 Branch (2008/08/20) Submitted by Polyvios J. Simopoulos --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/Greek.po | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index fd5fb7a1fbe..606a4968882 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -10,6 +10,7 @@ WinMerge 2.10 RC Translation updates: - Brazilian (#2059836) - German (#2045666) + - Greek (#2062442) - Japanese (r5804) - Swedish (#2062107) diff --git a/Src/Languages/Greek.po b/Src/Languages/Greek.po index 932647eb015..89ab1bc5cc1 100644 --- a/Src/Languages/Greek.po +++ b/Src/Languages/Greek.po @@ -285,7 +285,7 @@ msgstr " #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "..." #: Merge.rc:152 #: Merge.rc:269 @@ -2584,12 +2584,12 @@ msgstr " #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr " " #. StringFileInfo.Block #: Merge.rc:1691 @@ -3457,7 +3457,7 @@ msgstr " #: Merge.rc:2037 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." -msgstr "" +msgstr " . ;\n\n , ." #: Merge.rc:2043 #, c-format @@ -3552,12 +3552,12 @@ msgstr " #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr " ..." #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr " ..." #: Merge.rc:2078 #, c-format @@ -4094,17 +4094,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr " :" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr " %d :" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr " " #: Merge.rc:2227 #, c-format @@ -5293,22 +5293,22 @@ msgstr "" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr " " #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr " " #: Merge.rc:2628 #, c-format @@ -5333,12 +5333,12 @@ msgstr " #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr " \" \" /" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr " \" \" /" #: Merge.rc:2634 #, c-format @@ -5727,7 +5727,7 @@ msgstr " #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr " " #: Merge.rc:2719 #, c-format @@ -5913,7 +5913,7 @@ msgstr " #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr " " #: Merge.rc:2789 #, c-format From 4aecad1c7525863ccc14dd4b33e57267af6d5e0c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 24 Aug 2008 09:57:29 +0000 Subject: [PATCH 087/168] PATCH: [ 2067785 ] Russian translation update Submitted by Dmitriy --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/Russian.po | 257 ++++++++++++++++++++++++++++----------- 2 files changed, 185 insertions(+), 73 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 606a4968882..2c1ce500470 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -12,6 +12,7 @@ WinMerge 2.10 RC - German (#2045666) - Greek (#2062442) - Japanese (r5804) + - Russian (#2067785) - Swedish (#2062107) WinMerge 2.9.10 - 2008-08-14 (r5804) diff --git a/Src/Languages/Russian.po b/Src/Languages/Russian.po index c3a06b23d95..08fd3947470 100644 --- a/Src/Languages/Russian.po +++ b/Src/Languages/Russian.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2007-09-23 23:22-0000\n" +"PO-Revision-Date: 2008-08-22 17:56+0300\n" "Last-Translator: Dmitriy S. Aleshkowskiy \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -280,14 +280,14 @@ msgstr "& #: Merge.rc:448 #, c-format msgid "&Plugins" -msgstr "&" +msgstr "&" #: Merge.rc:150 #: Merge.rc:267 #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&" #: Merge.rc:152 #: Merge.rc:269 @@ -315,7 +315,7 @@ msgstr " #: Merge.rc:462 #, c-format msgid "&Reload plugins" -msgstr "& " +msgstr "& " #: Merge.rc:159 #: Merge.rc:276 @@ -1081,7 +1081,7 @@ msgstr " #: Merge.rc:670 #, c-format msgid "Contributors" -msgstr "" +msgstr "" #: Merge.rc:677 #, c-format @@ -2065,14 +2065,14 @@ msgstr " #: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." -msgstr " (Merge7z*.dll)" +msgstr " (Merge7z*.dll)" #: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." -msgstr " 7-Zip" +msgstr " 7-Zip, ." #: Merge.rc:1299 #, c-format @@ -2085,7 +2085,7 @@ msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" -" \n" +" \n" "(dllbuild %04u)" #: Merge.rc:1303 @@ -2133,17 +2133,21 @@ msgstr " #: Merge.rc:1320 #, c-format msgid "Plugins on path:" -msgstr " :" +msgstr " :" #: Merge.rc:1321 #, c-format -msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" -msgstr " .\n( )" +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" +msgstr "" +" .\n" +"( )" #: Merge.rc:1325 #, c-format msgid "Plugin Download" -msgstr " " +msgstr " " #: Merge.rc:1334 #, c-format @@ -2280,12 +2284,12 @@ msgstr " #: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" -msgstr " 7-Zip:" +msgstr " 7-Zip:" #: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" -msgstr " 7-zip" +msgstr " 7-zip" #: Merge.rc:1456 #, c-format @@ -2578,12 +2582,12 @@ msgstr " #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "& " #. StringFileInfo.Block #: Merge.rc:1691 @@ -2954,8 +2958,12 @@ msgstr "" #: Merge.rc:1828 #, c-format -msgid "Automatically resize panes\nLock Panes" -msgstr " \n " +msgid "" +"Automatically resize panes\n" +"Lock Panes" +msgstr "" +" \n" +" " #: Merge.rc:1834 #, c-format @@ -3018,13 +3026,41 @@ msgstr "" #: Merge.rc:1860 #, c-format -msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" -msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge " +msgid "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" +msgstr "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge " #: Merge.rc:1861 #, c-format -msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" -msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge " +msgid "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" +msgstr "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge " #: Merge.rc:1868 #, c-format @@ -3044,8 +3080,12 @@ msgstr " #: Merge.rc:1888 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -msgstr ":\n (Dean Grimm), (Christian List), (Kimmo Varis), (Jochen Tucht), (Tim Gerundt), (Takashi Sawanaki), (Gal Hammer), (Alexander Skinner)" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgstr "" +":\n" +" (Dean Grimm), (Christian List), (Kimmo Varis), (Jochen Tucht), (Tim Gerundt), (Takashi Sawanaki), (Gal Hammer), (Alexander Skinner)" #: Merge.rc:1889 #, c-format @@ -3414,8 +3454,13 @@ msgstr " #: Merge.rc:2037 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +" . ?\n" +" , \"\" ." #: Merge.rc:2043 #, c-format @@ -3510,12 +3555,12 @@ msgstr " #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr " " #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr " " #: Merge.rc:2078 #, c-format @@ -3638,8 +3683,14 @@ msgstr " #: Merge.rc:2115 #, c-format -msgid "The file\n%1\nis not a conflict file." -msgstr "\n%1\n " +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." +msgstr "" +"\n" +"%1\n" +" " #: Merge.rc:2121 #, c-format @@ -3705,7 +3756,7 @@ msgid "" "\n" "Do you want to save the unpacked version to another file?" msgstr "" -" '%2' '%1'.\n" +" '%2' '%1'.\n" "\n" " .\n" "\n" @@ -3720,7 +3771,7 @@ msgid "" "\n" "Do you want to save the unpacked version to another file?" msgstr "" -" '%2' '%1'.\n" +" '%2' '%1'.\n" "\n" " .\n" "\n" @@ -4044,17 +4095,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr ", :" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr ", %d :" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr " " #: Merge.rc:2227 #, c-format @@ -4558,13 +4609,19 @@ msgstr "" #: Merge.rc:2384 #, 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 " (EOL) (Windows/Unix/Mac) '%1'.\n .\n , EOL , ?" +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 "" +" (EOL) (Windows/Unix/Mac) '%1'.\n" +" .\n" +" , EOL , ?" #: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." -msgstr " prediffer '%2' '%1'. prediffer ." +msgstr " '%1' '%2'. ." #: Merge.rc:2386 #, c-format @@ -4578,8 +4635,18 @@ msgstr " #: Merge.rc:2388 #, 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 " .\n\n :\n%1\n ?" +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" +msgstr "" +" .\n" +"\n" +" :\n" +"%1\n" +" ?" #: Merge.rc:2394 #, c-format @@ -5228,22 +5295,22 @@ msgstr " #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr " " #: Merge.rc:2628 #, c-format @@ -5268,12 +5335,12 @@ msgstr " #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr " \" \" /" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr " \" \" /" #: Merge.rc:2634 #, c-format @@ -5469,13 +5536,21 @@ msgstr " #: Merge.rc:2677 #, c-format -msgid "Select the current user interface language\nLanguage" -msgstr " \n" +msgid "" +"Select the current user interface language\n" +"Language" +msgstr "" +" \n" +"" #: Merge.rc:2678 #, c-format -msgid "Shows differences inside lines with different colors\nShow Line Difference" -msgstr " \n " +msgid "" +"Shows differences inside lines with different colors\n" +"Show Line Difference" +msgstr "" +" \n" +" " #: Merge.rc:2679 #, c-format @@ -5526,28 +5601,48 @@ msgstr " #: Merge.rc:2691 #, c-format -msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" -msgstr " \n (Alt+Up)" +msgid "" +"Scroll to the previous difference\n" +"Previous Difference (Alt+Up)" +msgstr "" +" \n" +" (Alt+Up)" #: Merge.rc:2692 #, c-format -msgid "Scroll to the next difference\nNext Difference (Alt+Down)" -msgstr " \n (Alt+Down)" +msgid "" +"Scroll to the next difference\n" +"Next Difference (Alt+Down)" +msgstr "" +" \n" +" (Alt+Down)" #: Merge.rc:2693 #, c-format -msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" -msgstr " \n (Alt+Home)" +msgid "" +"Scroll to the first difference\n" +"First Difference (Alt+Home)" +msgstr "" +" \n" +" (Alt+Home)" #: Merge.rc:2694 #, c-format -msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" -msgstr " \n (Alt+Enter)" +msgid "" +"Scroll to the current difference\n" +"Current Difference (Alt+Enter)" +msgstr "" +" \n" +" (Alt+Enter)" #: Merge.rc:2695 #, c-format -msgid "Scroll to the last difference\nLast Difference (Alt+End)" -msgstr " \n (Alt+End)" +msgid "" +"Scroll to the last difference\n" +"Last Difference (Alt+End)" +msgstr "" +" \n" +" (Alt+End)" #: Merge.rc:2696 #, c-format @@ -5636,7 +5731,7 @@ msgstr " #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr " " #: Merge.rc:2719 #, c-format @@ -5661,22 +5756,26 @@ msgstr " #: Merge.rc:2723 #, c-format msgid "Suggested plugins" -msgstr " " +msgstr " " #: Merge.rc:2724 #, c-format msgid "Other plugins" -msgstr " " +msgstr " " #: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" -msgstr " ( )" +msgstr " ( )" #: Merge.rc:2731 #, c-format -msgid "Activates next visible file\nActivate next File" -msgstr " \n " +msgid "" +"Activates next visible file\n" +"Activate next File" +msgstr "" +" \n" +" " #: Merge.rc:2732 #, c-format @@ -5685,8 +5784,12 @@ msgstr " #: Merge.rc:2738 #, c-format -msgid "Opens the WinMerge Help\nWinMerge Help" -msgstr " WinMerge\n WinMerge" +msgid "" +"Opens the WinMerge Help\n" +"WinMerge Help" +msgstr "" +" WinMerge\n" +" WinMerge" #: Merge.rc:2739 #, c-format @@ -5705,18 +5808,26 @@ msgstr " #: Merge.rc:2742 #, c-format -msgid "Opens the release notes document\nRelease Notes" -msgstr " \n " +msgid "" +"Opens the release notes document\n" +"Release Notes" +msgstr "" +" \n" +" " #: Merge.rc:2743 #, c-format -msgid "Opens the translations website\nTranslations" -msgstr " \n" +msgid "" +"Opens the translations website\n" +"Translations" +msgstr "" +" \n" +"" #: Merge.rc:2749 #, c-format msgid "Plugin Settings" -msgstr " " +msgstr " " #: Merge.rc:2750 #, c-format @@ -5806,7 +5917,7 @@ msgstr " #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr " " #: Merge.rc:2789 #, c-format From af0bb62126b83d82fec5b5e9ccd0ba495b46dac4 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 24 Aug 2008 10:38:57 +0000 Subject: [PATCH 088/168] PATCH: [ 1979321 ] Plugins: Show processing instructions in XML files Submitted by Marco De Paoli --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/Contributors.txt | 1 + Plugins/dlls/DisplayXMLFiles.dll | Bin 221184 -> 143360 bytes .../DisplayXMLFiles/DisplayXMLFiles.rc | 10 +- .../DisplayXMLFiles/DisplayXMLFiles.sln | 57 ++ .../DisplayXMLFiles/DisplayXMLFiles.vcproj | 693 ++++++++++++++++++ Src/ExpatMapLib/expat_maps_static.vcproj | 227 ++++++ 7 files changed, 984 insertions(+), 5 deletions(-) create mode 100644 Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.sln create mode 100644 Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcproj create mode 100644 Src/ExpatMapLib/expat_maps_static.vcproj diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 2c1ce500470..9a1bd15a88f 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 RC Add icon for "Plugins->List" menu item (#2060771) + Plugins: Show processing instructions in XML plugin (#1979321) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) Translation updates: diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt index bce3b05d03d..0411164289a 100644 --- a/Docs/Users/Contributors.txt +++ b/Docs/Users/Contributors.txt @@ -148,6 +148,7 @@ Other Contributors (code, ideas, testing..): * Andreas Morsing * Ryan Mott * Tim Musschoot +* Marco De Paoli * Dan Pidcock * Vincent Osele * Scott Rasmussen diff --git a/Plugins/dlls/DisplayXMLFiles.dll b/Plugins/dlls/DisplayXMLFiles.dll index eb137775e8491caf758dfca382c9ff78c520873c..e37fdc78be5a7f8b0213f6d31324d938429ad08b 100644 GIT binary patch literal 143360 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 literal 221184 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 z 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 z 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%0D0n3OPUuTw-i>$bvp!k8$Z!VXEH@DcS!OOXmgA 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Src/ExpatMapLib/expat_maps_static.vcproj b/Src/ExpatMapLib/expat_maps_static.vcproj new file mode 100644 index 00000000000..5584efe512b --- /dev/null +++ b/Src/ExpatMapLib/expat_maps_static.vcproj @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 722afac0c2e24d79d15c23332deae24a8a506cae Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 24 Aug 2008 19:40:17 +0000 Subject: [PATCH 089/168] PATCH: [ 2071625 ] Fix MS HTML Help toc Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/Manual/build/build_htmlhelp.xsl | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 9a1bd15a88f..aa64c66cf2d 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -8,6 +8,7 @@ WinMerge 2.10 RC Plugins: Show processing instructions in XML plugin (#1979321) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) + BugFix: Table of Contents in manual (#2071625) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Docs/Users/Manual/build/build_htmlhelp.xsl b/Docs/Users/Manual/build/build_htmlhelp.xsl index 32a8fa0a48d..f1d8b21de60 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.xsl +++ b/Docs/Users/Manual/build/build_htmlhelp.xsl @@ -23,8 +23,11 @@ html/param.xsl parameters ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> set nop + css/help.css - +htmlhelp/AboutDoc.html +WinMerge Help + From bbd4bd1abbb7a12d1996f6aabc88ae790d76d438 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 24 Aug 2008 20:31:56 +0000 Subject: [PATCH 090/168] BUG: [ 2051069 ] clearcase checkin without german resources --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/CCPrompt.cpp | 44 +++++++++++++++++++++++++++++++--------- Src/CCPrompt.h | 33 ++++++++++++++++++++++++------ 3 files changed, 62 insertions(+), 16 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index aa64c66cf2d..da27a371b30 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -9,6 +9,7 @@ WinMerge 2.10 RC BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) BugFix: Table of Contents in manual (#2071625) + BugFix: ClearCase checkout/commit dialog translation error (#2051069) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Src/CCPrompt.cpp b/Src/CCPrompt.cpp index 233f14e2b50..f6a908e9d10 100644 --- a/Src/CCPrompt.cpp +++ b/Src/CCPrompt.cpp @@ -1,5 +1,26 @@ -// CCPrompt.cpp : implementation file +///////////////////////////////////////////////////////////////////////////// +// License (GPLv2+): +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. // +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +///////////////////////////////////////////////////////////////////////////// +/** + * @file CCPrompt.cpp + * + * @brief Implementation file for ClearCase dialog + */ +// ID line follows -- this is updated by SVN +// $Id$ #include "stdafx.h" #include "merge.h" @@ -11,10 +32,6 @@ static char THIS_FILE[] = __FILE__; #endif -///////////////////////////////////////////////////////////////////////////// -// CCCPrompt dialog - - CCCPrompt::CCCPrompt(CWnd* pParent /*=NULL*/) : CDialog(CCCPrompt::IDD, pParent) , m_bMultiCheckouts(FALSE) @@ -22,7 +39,6 @@ CCCPrompt::CCCPrompt(CWnd* pParent /*=NULL*/) { } - void CCCPrompt::DoDataExchange(CDataExchange* pDX) { CDialog::DoDataExchange(pDX); @@ -33,18 +49,26 @@ void CCCPrompt::DoDataExchange(CDataExchange* pDX) //}}AFX_DATA_MAP } - BEGIN_MESSAGE_MAP(CCCPrompt, CDialog) //{{AFX_MSG_MAP(CCCPrompt) ON_BN_CLICKED(IDC_SAVE_AS, OnSaveas) //}}AFX_MSG_MAP END_MESSAGE_MAP() -///////////////////////////////////////////////////////////////////////////// -// CCCPrompt message handlers +/** + * @brief Handler for WM_INITDIALOG; conventional location to initialize + * controls. At this point dialog and control windows exist. + */ +BOOL CCCPrompt::OnInitDialog() +{ + theApp.TranslateDialog(m_hWnd); + CDialog::OnInitDialog(); + + return TRUE; // return TRUE unless you set the focus to a control + // EXCEPTION: OCX Property Pages should return FALSE +} void CCCPrompt::OnSaveas() { EndDialog(IDC_SAVE_AS); } - diff --git a/Src/CCPrompt.h b/Src/CCPrompt.h index fb1e5ac1e06..1a18e9ec8aa 100644 --- a/Src/CCPrompt.h +++ b/Src/CCPrompt.h @@ -1,13 +1,34 @@ -// CCPrompt.h : header file +///////////////////////////////////////////////////////////////////////////// +// License (GPLv2+): +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. // +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +///////////////////////////////////////////////////////////////////////////// +/** + * @file CCPrompt.h + * + * @brief Declaration file for ClearCase dialog. + * + */ +// ID line follows -- this is updated by SVN +// $Id$ #if !defined(AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_) #define AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_ - -///////////////////////////////////////////////////////////////////////////// -// CCCPrompt dialog - +/** + * @brief A dialog for ClearCase checkout/checkin. + */ class CCCPrompt : public CDialog { // Construction @@ -30,6 +51,7 @@ class CCCPrompt : public CDialog // Implementation protected: + virtual BOOL OnInitDialog(); // Generated message map functions //{{AFX_MSG(CCCPrompt) @@ -46,4 +68,3 @@ class CCCPrompt : public CDialog // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_) - From 956feaaa6cef76415470ec877866641c4bfd8545 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 31 Aug 2008 11:15:00 +0000 Subject: [PATCH 091/168] PATCH: [ 2082774 ] Use configured external editor to edit filter files --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/FileFilterHelper.cpp | 13 +++---------- Src/MainFrm.h | 3 ++- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index da27a371b30..02efa5dad86 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 RC Add icon for "Plugins->List" menu item (#2060771) + Use external editor to edit plugins (#2082774) Plugins: Show processing instructions in XML plugin (#1979321) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) diff --git a/Src/FileFilterHelper.cpp b/Src/FileFilterHelper.cpp index 088f50be813..5b393fc0438 100644 --- a/Src/FileFilterHelper.cpp +++ b/Src/FileFilterHelper.cpp @@ -24,6 +24,7 @@ #include "stdafx.h" #include "Ucs2Utf8.h" +#include "MainFrm.h" #include "FilterList.h" #include "DirItem.h" #include "FileFilterMgr.h" @@ -293,20 +294,12 @@ BOOL FileFilterHelper::includeDir(LPCTSTR szDirName) } /** - * @brief Open filter file to editor (notepad) for modifying. - * + * @brief Open filter file to external editor for modifying. * @param [in] szFileFilterterPath Path of filter file to edit. - * @todo Use external editor defined in options? */ void FileFilterHelper::EditFileFilter(LPCTSTR szFileFilterPath) { - CString cmdLine = (CString)_T("notepad ") + szFileFilterPath; - STARTUPINFO stInfo = {0}; - PROCESS_INFORMATION prInfo; - BOOL processSuccess = FALSE; - stInfo.cb = sizeof(STARTUPINFO); - processSuccess = CreateProcess(NULL, (LPTSTR)(LPCTSTR)cmdLine, NULL, - NULL, FALSE, 0, NULL, NULL, &stInfo, &prInfo); + CMainFrame::OpenFileToExternalEditor(szFileFilterPath); } /** diff --git a/Src/MainFrm.h b/Src/MainFrm.h index f84dce872e9..081b5aca080 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -130,7 +130,6 @@ class CMainFrame : public CMDIFrameWnd CString SetStatus(LPCTSTR status); void ClearStatusbarItemCount(); void ApplyViewWhitespace(); - void OpenFileToExternalEditor(LPCTSTR file); void SetEOLMixed(BOOL bAllow); void SelectFilter(); void ShowVSSError(CException *e, LPCTSTR strItem); @@ -144,6 +143,8 @@ class CMainFrame : public CMDIFrameWnd BOOL DoOpenConflict(LPCTSTR conflictFile, bool checked = false); FRAMETYPE GetFrameType(const CFrameWnd * pFrame) const; + static void OpenFileToExternalEditor(LPCTSTR file); + // Overrides virtual void GetMessageString(UINT nID, CString& rMessage) const; // ClassWizard generated virtual function overrides From 38c4ad8cbde1b7ccaf77d6ce6d06d232c56c2839 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 31 Aug 2008 11:30:36 +0000 Subject: [PATCH 092/168] PATCH: [ 2053195 ] Update Help topics Improve HTML manual look Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/css/all.css | 46 +++++---- Docs/Users/Manual/css/print.css | 155 ++++++------------------------ Docs/Users/Manual/images/head.gif | Bin 0 -> 4746 bytes 3 files changed, 53 insertions(+), 148 deletions(-) create mode 100644 Docs/Users/Manual/images/head.gif diff --git a/Docs/Users/Manual/css/all.css b/Docs/Users/Manual/css/all.css index abe6c0577ff..911579957ed 100644 --- a/Docs/Users/Manual/css/all.css +++ b/Docs/Users/Manual/css/all.css @@ -31,10 +31,22 @@ div.navheader, div.navfooter { padding: 1px 0 1px 0; } +div.navheader { + height: 50px; + background-image: url("../images/head.gif"); + background-repeat: no-repeat; + background-position: center top; +} + +div.navheader table { + height: 50px; +} + div.navheader * * * th { display:none; } -div.navheader a, div.navheader a:visited, div.navfooter a, div.navfooter a:visited { + +div.navheader a, div.navheader a:visited, div.navfooter a, div.navfooter a:visited { display: inline-block; padding: 2px 4px 2px 4px; text-decoration: none; @@ -50,7 +62,7 @@ div.navheader a:hover, div.navfooter a:hover { /* Main topic divs */ div.book,div.article,div.appendix,div.index { - margin: 0 10px 0 10px; + margin: 0 10px 10px 10px; } div.section { @@ -64,38 +76,27 @@ hr { background-color: #707070; } -/* Help title page*/ -div.titlepage { - text-align: center; -} - -div.book h1 { +/* Manual title */ +h1 { font-size: 200%; - color: #3333cc; letter-spacing: 0.05em; } /* Topic titles */ -div.article h2, div.appendix h2, div.index h2 { - font-size: 160%; - text-align: center; - color: #3333cc; +h2 { + font-size: 180%; } +/* Section titles */ div.section h2 { - text-align: left; font-size: 140%; } div.section h3 { - text-align: left; font-size: 120%; - color: #3333cc; } div.section h4 { - text-align: left; font-size: 110%; - color: #3333cc; } #ads { @@ -157,18 +158,21 @@ div.section h4 { font-style: italic; } +.guibutton, .keycap { + font-weight: bold; +} /* FAQ */ .question { font-weight: bold; } /* tables */ -.table table { +.table table, .informaltable table { border-collapse: collapse; border: 1px solid black; } -.table th { +.table th, .informaltable th { padding: 2px; text-align: left; color: white; @@ -176,7 +180,7 @@ div.section h4 { border: 1px solid black; } -.table td { +.table td, .informaltable td { padding: 2px; border: 1px solid black; } diff --git a/Docs/Users/Manual/css/print.css b/Docs/Users/Manual/css/print.css index fb0c691e433..20b20360605 100644 --- a/Docs/Users/Manual/css/print.css +++ b/Docs/Users/Manual/css/print.css @@ -1,150 +1,51 @@ -body,th,td { - font-family: Verdana,Helvetica,Arial,sans-serif; - font-size: 80%; -} - -pre,code,tt { - font-family: "Courier New",Courier,monospace; - font-size: 100%; -} - -ul { - list-style-type: square; +@import url("all.css") print; +body { + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 77%; } -/* Default link style */ -a:link { color:black; text-decoration:underline; } -a:visited { color:black; text-decoration:underline; } -a:focus { color:black; text-decoration:none; } -a:hover { color:black; text-decoration:none; } -a:active { color:black; text-decoration:none; } - -.navheader { - display: none; -} -.navfooter { - display: none; -} -#ads { +.navheader,.navfooter, div#ads { display: none; } -.mediaobject { - margin-top: 10px; -} - -.screen { - padding: 0; - background-color: white; - border: 0; -} - -.caution { - background-color: white; - border: 1px solid black; -} -.important { - background-color: white; - border: 1px solid black; -} -.note { - background-color: white; - border: 1px solid black; -} -.tip { - background-color: white; - border: 1px solid black; -} -.warning { - background-color: white; - border: 1px solid black; -} - -/* Examples */ -.example,.informalexample { - padding-left: 7px; - border-left: 3px solid black; +h1, h2 { + font-family: Verdana,Helvetica,Arial,sans-serif; } -/* Command synopsis */ -.cmdsynopsis p { - padding: 0; - color: black; - background-color: white; - border: 0; +h1 { + font-size: 160%; + letter-spacing: inherit; } -.command,.option,.replaceable { - color: black; +div.article h2, div.appendix h2, div.index h2 { + font-size: 140%; } -/* GUI elements */ -.guimenu,.guisubmenu,.guimenuitem,.guilabel { - font-style: italic; -} -/* FAQ */ -.question { - font-weight: bold; +div.section h3 { + font-size: 120%; } - -/* tables */ -.table table { - border-collapse: collapse; - border: 1px solid black; +div.section h4 { + font-size: 110%; } -.table th { - padding: 2px; - text-align: left; - color: black; - background: white; - border: 1px solid black; - border-bottom: 2px solid black; +div.toc p{ + color: #000; } -.table td { - padding: 2px; - border: 1px solid black; -} -/* variablelist */ -.variablelist dl { - margin-left: 2em; -} -.variablelist dt { - font-weight: bold; -} -.variablelist dd { - margin-left: 2em; -} -.variablelist dd p { - margin-top: 0.5em; +.screen { + padding: 5px; + background-color: inherit; + border: 0.5px solid #BEBEBE; } -/* authorgroup */ -.authorgroup { - margin-left: 2em; -} -.author h3 { - margin: 0; - margin-bottom: 0.25em; - padding: 0; - font-size: 100%; +.caution,.important,.note,.tip,.warning { + background-color: none; + border: 1px solid #808080; } -/* table of contents */ -.toc dt { - margin-top: 1em; -} -.toc dd dl dt { - margin-top: 0; -} - -.toc .sect1, -.toc .appendix, -.toc .index { - font-size: 120%; - font-weight: bold; -} \ No newline at end of file +/* links */ +a:link { color:black; text-decoration:underline; } +a:visited { color:black; text-decoration:underline; } diff --git a/Docs/Users/Manual/images/head.gif b/Docs/Users/Manual/images/head.gif new file mode 100644 index 0000000000000000000000000000000000000000..3681d1eb4d7c370ff66ea2951fc4aaf316668c90 GIT binary patch literal 4746 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 Date: Mon, 1 Sep 2008 17:50:37 +0000 Subject: [PATCH 093/168] PATCH: [ 2084879 ] Fix NSIS ShowUninstDetails keyword in syntax highlighting --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/editlib/nsis.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 02efa5dad86..c2cd9a0463c 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -11,6 +11,7 @@ WinMerge 2.10 RC BugFix: Crash when generating a folder comparison report (#2008581) BugFix: Table of Contents in manual (#2071625) BugFix: ClearCase checkout/commit dialog translation error (#2051069) + BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Src/editlib/nsis.cpp b/Src/editlib/nsis.cpp index 9c7a4dd9db3..8dc8674d92b 100644 --- a/Src/editlib/nsis.cpp +++ b/Src/editlib/nsis.cpp @@ -229,7 +229,7 @@ static LPTSTR s_apszNsisKeywordList[] = _T ("SetStaticBkColor"), _T ("SetWindowLong"), _T ("ShowInstDetails"), - _T ("ShowUninstDetails"), + _T ("ShowUnInstDetails"), _T ("ShowWindow"), _T ("SilentInstall"), _T ("SilentUnInstall"), From 48d19e36f077c46feda027ca597b86f9d446ad31 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 1 Sep 2008 19:24:42 +0000 Subject: [PATCH 094/168] PATCH: [ 1979321 ] Plugins: Show processing instructions in XML files Submitted by Marco De Paoli Commit actual code changes, previous commit contained only project changes. --HG-- branch : R2_10 --- Plugins/dlls/DisplayXMLFiles.dll | Bin 143360 -> 143360 bytes .../DisplayXMLFiles/DisplayXMLFiles.rc | 8 +++---- .../DisplayXMLFiles/WinMergeScript.cpp | 22 ++++++++++++++---- Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h | 3 ++- Src/ExpatMapLib/expat_maps.cpp | 4 ++-- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Plugins/dlls/DisplayXMLFiles.dll b/Plugins/dlls/DisplayXMLFiles.dll index e37fdc78be5a7f8b0213f6d31324d938429ad08b..ee40dc5f20f473060594aa47f605ea83de664951 100644 GIT binary patch delta 12350 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 TMzb-&n2hhB2Y1G3=J)s?N`4K= delta 12258 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 + { + fprintf(pData->pOutput,">\n"); + pData->bNeedsEnding = false; + } + + // Indent + for (int i = 0; i < pData->iDepth; i++) + { + fprintf(pData->pOutput,"\t"); + } + + // Output processing instruction + fprintf(pData->pOutput, "\n", target, data); } static void XMLCALL CommentHandler(void *userData, const char *data) { - int i; CXMLData *pData = (CXMLData*)userData; // End the previous element if needed @@ -230,7 +244,7 @@ static void XMLCALL CommentHandler(void *userData, const char *data) } // Indent - for (i = 0; i < pData->iDepth; i++) + for (int i = 0; i < pData->iDepth; i++) { fprintf(pData->pOutput,"\t"); } @@ -285,7 +299,7 @@ STDMETHODIMP CWinMergeScript::UnpackFile(BSTR fileSrc, BSTR fileDst, VARIANT_BOO XML_SetUserData(parser, &oData); XML_SetElementHandler(parser, StartElementHandler, EndElementHandler); XML_SetDefaultHandler(parser, DefaultHandler); - //XML_SetProcessingInstructionHandler(parser, ProcessingInstructionHandler); + XML_SetProcessingInstructionHandler(parser, ProcessingInstructionHandler); XML_SetCommentHandler(parser, CommentHandler); XML_SetXmlDeclHandler(parser, XmlDeclHandler); XML_SetUnknownEncodingHandler(parser, WinMerge_Plug_UnknownEncodingHandler, this); diff --git a/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h b/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h index edac4d1d94a..0fc33e33078 100644 --- a/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h +++ b/Plugins/src_VCPP/DisplayXMLFiles/typeinfoex.h @@ -89,7 +89,8 @@ class CComTypeInfoHolderModule { for (int i=0; i<(int)cNames; i++) { int n = ocslen(rgszNames[i]); - for (int j=m_nCount-1; j>=0; j--) + int j; + for (j=m_nCount-1; j>=0; j--) { if ((n == m_pMap[j].nLen) && (memcmp(m_pMap[j].bstr, rgszNames[i], m_pMap[j].nLen * sizeof(OLECHAR)) == 0)) diff --git a/Src/ExpatMapLib/expat_maps.cpp b/Src/ExpatMapLib/expat_maps.cpp index 4959258b806..22d16a248a0 100644 --- a/Src/ExpatMapLib/expat_maps.cpp +++ b/Src/ExpatMapLib/expat_maps.cpp @@ -137,7 +137,7 @@ do_maps_getMap(const XML_Char *name, XML_Encoding *info) } } // Lets allow any encoding at all, and provide ISO-8859-1 map - for (i=0; i<256; ++i) + for (int i=0; i<256; ++i) { // i->i gives us identity for ASCII, and ISO-8859-1 for remainder // because Unicode character set is numbered exactly like ISO-8859-1 @@ -158,7 +158,7 @@ populate_encoding_info(const map_info * mapinfo, XML_Encoding * info) info->map[i] = (i<127 ? i : 0); } // Populate code bytes as given in our map table - for (i=0; mapinfo->mapdata[i] != -1; i += 2) + for (int i=0; mapinfo->mapdata[i] != -1; i += 2) { int src = mapinfo->mapdata[i]; int dest = mapinfo->mapdata[i+1]; From 953f15ca4d5326946913a0def707e7067b8cc7b0 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 3 Sep 2008 13:27:54 +0000 Subject: [PATCH 095/168] PATCH: [ 2091055 ] Doc edit: Filters.xml Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Filters.xml | 1310 ++++++++++++++++++++++----- Docs/Users/Manual/WinMerge_help.xml | 4 +- 2 files changed, 1082 insertions(+), 232 deletions(-) diff --git a/Docs/Users/Manual/Filters.xml b/Docs/Users/Manual/Filters.xml index 1d66bf59980..0a848799ed6 100644 --- a/Docs/Users/Manual/Filters.xml +++ b/Docs/Users/Manual/Filters.xml @@ -1,331 +1,1179 @@

      - Filters + Using Filters<indexterm> + <primary>filtering</primary> + </indexterm> + + When you compare files or folders, you can use filters to narrow the + scope of the comparison. This can be useful when you want to simplify the + comparison result by eliminating differences that you are not interested in. + Filters are rules based on regular expressions. WinMerge uses the popular PCRE + (Perl Compatible Regular Expressions) regular expression engine. + regular expressions + + supported engine + + PCRE regular expression engine + + regexp + + regular expressions + + + The basic function of filtering is simple: evaluate each item that would + normally be compared (a folder, file, or line within a file), and if the + filter expression matches the target item, apply the filter. Depending on the + type of filter, the item is either included or excluded in the + comparison. + + There are different WinMerge filters for folder compare and file compare + operations: + + + + Folder comparison: File masks and file filters + comparing folders + + filtering + + + + You can specify files to include in a folder comparison by using + simple file masks, or, for more complex filtering, by applying multiple + rules specified in a file filter. You cannot apply both a file mask and + a file filter in the same operation. + + Files and folders that are filtered are hidden in the result by + default, which is typically what you want. You can click + View + + Show Skipped Items + to unhide filtered items, but the Folder Compare window + shows only minimal information about them. For example, you cannot tell + whether a skipped file is a text file or binary. + + + + + File comparisons: Line filters + comparing files + + filtering + + + + Line filters are applied only to file compare operations. They let + you ignore single line differences. + + + + +
      + Using file masks<indexterm> + <primary>file masks</primary> + </indexterm><indexterm> + <primary>filters</primary> + + <secondary>file masks</secondary> + </indexterm><indexterm> + <primary>filtering</primary> + + <secondary>in folder comparisons</secondary> + </indexterm> + + You can use one or more file masks that specify + file extensions to include in a folder comparison. All other files are + omitted from your selection. + +
      + Defining and applying file masks + + Define and apply a file mask at the time you launch your folder + compare operation: - There are two kinds of filters in WinMerge: file filters for filtering - files and folders in folder compare and line filters for ignoring lines from - files before comparing. + + + If you are using the Select Files or Folders dialog, after + choosing the Left and Right + folders, enter one or more file masks in the + Filter field. The masks are applied when you + start the folder compare operation. + + + + If you are using the WinMerge command line, use the + flag to specify file masks (see the example in the + next section). + + + + Remember, you cannot specify both a file mask and a file filter in + the field or command line. +
      + +
      + File mask syntax and example<indexterm> + <primary>rules</primary> + + <secondary>file masks</secondary> + </indexterm><indexterm> + <primary>filters</primary> + + <secondary>file mask syntax</secondary> + </indexterm><indexterm> + <primary>regular expressions</primary> + + <secondary>in file masks</secondary> + </indexterm> + + Use this syntax for file masks: + + *.[extension][delimiter *.extension ...] -
      - Regular expressions + Valid delimiters are spaces, commas, colons or semicolons. - Filters are based on regular expressions (regexps). Each line filter - or file filter rule is regexp which is matched against file/folder name or - line. + A mask with no extension ( *. ) selects files + without any extension, such as + README. - Regexps can be very complex to read. Luckily most file filtering - needs are for file extensions. File filters installed with WinMerge have - many useful examples. + + File mask + + In this command-line example, the folder compare operation + includes only files with xml or + txt extensions. All other files are omitted: + + WinMergeU c:\project\docs c:\temp /f + *.xml;*.txt + +
      +
      + +
      + Using File filters<indexterm> + <primary>filters</primary> + + <secondary>file filters</secondary> + </indexterm><indexterm> + <primary>filtering</primary> - <para>WinMerge uses popular PCRE (Perl Compatible Regular Expressions) - regular expression engine. There are lots of resources for help with Perl - regular expression.</para> + <secondary>in folder comparisons</secondary> + </indexterm> -
      - Help with regexps + File filters are text files with an extension + of flt. They enable you to apply multiple filtering + rules to a folder comparison. Unlike file masks, file filters can either + include or exclude matches. - There are many guides and help sites in Web, for example: + + file filters + + template + WinMerge installs a number of predefined file filters. If + these file filters do not provide the filtering you need, you can create + your own. To make that task easier, WinMerge also provides a template file + named FileFilter.tmpl. This section describes how to + apply file filters to comparisons, and documents the file filter syntax. + describes how to add, edit, and manage + filters. + +
      + File filter locations<indexterm> + <primary>Filters folders</primary> + + <secondary>locations</secondary> + </indexterm><indexterm> + <primary>file filters</primary> + + <secondary>locations</secondary> + </indexterm> + + WinMerge automatically detects file filters in these + locations: - Good site devoted for regexps: + Filters subfolder in the WinMerge installation folder - http://www.regular-expressions.info/ + This is where the predefined file filters are installed. For + example, C:\Program Files\WinMerge\Filters. You + can create or copy filter files in this location to make them + available to all users on your system. + + Before creating a new file filter, see if the predefined ones + already contain what you need. If not, you might find useful rule + examples in the existing files. - Good HOWTO document for regexps: + Default private filter folder - http://www.amk.ca/python/howto/regex/ + The location of this folder is defined in the System page of + WinMerge options. By default, it is specified as a subfolder in your + user profile folder (for example, My + Documents\WinMerge\Filters in Windows XP). Filters that + are created or copied here are normally visible only to you. If you + create new file filters, you can copy them here to keep them + private. + + + Before you can apply file filters that exist in any other folder, + you must first install them. +
      + +
      + Applying file filters + + You can apply a file filter using any of these methods: + + + + When you launch a folder compare from the Select Files or + Folders dialog: + + + + After choosing the Left and + Right folders, click + Select next to the + Filter field. + + + + In the Filters dialog, use the Filefilters tab to choose a + file filter and load it in the Filter + field. + + + If a file filter is currently enabled, the selected file + filter is already loaded in the Filter + field. + + + + + Proceed with the compare operation. The file in the + Filter field is applied when you start the + operation. + + + + + + To change file filtering after you have already launched a + folder compare operation (for example, applying a different filter or + disabling filtering): + + + + Click + Tools + + Filters + . + + + + In the Filters dialog, configure your new file filter + setting, and click OK. + + + + The new filtering is not automatically applied when you + close the Filters dialog: press F5 to see the new + results in the Folder Compare window. + + + + + + When you launch a folder compare from the WinMerge command line, + use the flag to specify a file filter. + + + + Remember, you cannot apply both a file mask and a file filter in the + field or command line. +
      + +
      + File filter syntax<indexterm> + <primary>rules</primary> + + <secondary>file filter</secondary> + </indexterm><indexterm> + <primary>filters</primary> + + <secondary>file filter syntax</secondary> + </indexterm> + This section describes the syntax of WinMerge file filters and + provides guidelines for writing them. + + The comment delimiter is ##. After a comment delimiter, + all characters in a line are ignored. WinMerge ignores most whitespace + characters in rules. However, a comment must always be preceded by one or + more whitespace (space or tab) characters. To use ## as + characters in a rule, omit the whitespace prefix. + + The first two required lines of a file filter are: + + - Tutorial: + name - http://www.zvon.org/other/PerlTutorial/Output/index.html + The filter name that is listed in the Files dialog - PDF quick reference: + def - http://www.night-ray.com/regex.pdf + The type of filtering to be applied. Specify one of these + values: + + + + include + + + Includes everything except items matching the specified + rule. + + + + + exclude + + + Excludes everything except items matching the specified + rule. + + When you choose the exclude method, you must also add a + d (directory) rule that specifies the + subfolders. It's usually a good idea to specify all + subfolders, like this: + + d: \\*$ ## Subfolders + + + + + + Don't confuse these terms. Remember, in file filters, an + include rule does not specify what to + include, it specifies what not to include. + Similarly, exclude does not specify what to + exclude, it specifies what not to exclude. + + + Next, your file should contain one or more filter rules. You can add + as many rules as you like. There must be one rule per line, and each rule + must be entirely on one line (no line breaks are allowed in a rule). Each + rule consists of either an f: or a + d: type designator, followed by a reqular expression, + where: + + + + f: regexp + + + matches for files, or + + + + + d: regexp + + + matches for folders + + + + + Among the many regexp special characters, the following are + particularly important in file filter rules: + regular expressions + + special characters in filters + + regular expressions + + in file filters + + + + + ^ (beginning of line) + + + Frequently required for rules to work correctly. + + + + + $ (end of line) + + + Frequently required for rules to work correctly. For + example: + + \.c$ ## matches only file names with the extension, c. +\.c ## matches any extension beginning with c, like cpp and com. + + + + + \ (escape) + + + Forces special characters to match normal characters. For + example, to match a folder name, precede the folder backslash + delimiter with a backslash (\\). To match the dot in a + file name, specify a backslash followed by a dot + (\.). + + + + + No special characters or wildcards are used to match file names. To + match all filenames of a certain type, simply omit the filename. + + Rules are case-insensitive. For example, f: \.bat& + matches winmerge.bat and + compare.BAT. + + + File filter rule examples + + Some simple file filter rules: + + f: \.cpp$ ## Match *.cpp files +f: \.h$ ## Match *.h files +f: ^My ## Match My*.* files +f: Dlg\. ## Match *Dlg.* files +d: \\test$ ## Match test folders +d: ^\\Build$ ## Match Build folders +d: Temp$ ## Match *Temp folders (for example, FirstTemp) +d: Src ## Match *Src* folders + + Some rules with more complex regular expressions: + + f: ^\.#.*$ ## .#filename.version files +f: Dlg\.c(pp)?$ ## *Dlg.c and *Dlg.cpp files +f: ^I.*\.h$ ## I*.h files +f: Srv[1-9]\.def$ ## *Srv1.def to *Srv9.def files +f: ^[h,k,m] ## h*.*, k*.*, and m*.* files +
      -
      - File filters - - A file filter is a set of rules saved to one file. Every file and - folder is tested against all these rules before comparing. Files and - folders that match the rules are excluded if it is an inclusive filter, or - included if it is an exclusive filter. - - - Ignored items have "Skipped" status in folder - compare. User can select them to visible or hidden from - View menu. Usually its wise to keep skipped items - hidden. - - - WinMerge's filtering system allows only one filter set to be active - at a time. Active filter set can be selected from Open-dialog or from - menu: - Tools - - Filters - . Also empty filter can be selected when no folders or - files are ignored. - - Filtered out files get only minimal needed attention by the folder - compare. This means that WinMerge misses a lot of information it gets for - non-ignored files. For example there is no way to know if filtered file is - a text file or a binary file. The reason is simple: as user tolds WinMerge - one does not care about the file, WinMerge tries to minimize the effort - and time for the file. - -
      - Filter files - - Filter files are normal text files, with an extension of .flt. Files have defined format which is - explained later in this chapter. Filters-dialog allows creating new - filter files based on template file. Filter files can be created from - the scratch but using template file is the recommended way to create a - new filter. The template file is named - FileFilter.tmpl and can be modified if needed. The - template file is located in WinMerge/Filters -folder. - - Filter files have two possible locations: +
      + Using Line filters<indexterm> + <primary>filters</primary> + + <secondary>line filters</secondary> + </indexterm><indexterm> + <primary>filtering</primary> + + <secondary>in file comparisons</secondary> + </indexterm> + + In a file comparison, you can use line filters to ignore single lines. + For example, you might use line filters to ignore comments or certain type + of generated code, like version control system timestamps. Each line filter + is a rule, and you can apply any number of line filters to a file + comparison. + + To learn how to add, edit, and manage filters, see . + +
      + Applying line filters + + You can apply line filters using any of these methods: + + + + When you launch a file compare from the Select Files or Folders + dialog + + + + After choosing the Left and + Right files, click + Select next to the + Filter field. + + + + In the Filters dialog, use the Linefilters tab to enable the + line filters you want to use (if any), or to see what line filters + are currently enabled. + + + The Filter field does not indicate + what line filters are enabled. + + + + + Proceed with the file compare operation. The enabled line + filters are applied when you start the operation. + + + + + + After you have already launched a file compare operation (for + example, to apply different filters or disabling filtering) + + + + Click + Tools + + Filters + . + + + + Open the Filefilters tab. + + + + Check the individual line filters you want to apply, and + uncheck filters that you don't want to apply. + + You can also add, edit, and remove filters from the list by + using the New, Edit, + and Remove buttons. + + + + To turn on line filtering, check the Enable Line + Filters. To turn line filtering off, uncheck the + option. + + + + Click OK to dismiss the File Filters + dialog. + + + + Click F5 to apply your changes and refresh + the File Compare window. + + + + +
      + +
      + Line filter syntax<indexterm> + <primary>rules</primary> + + <secondary>line filter</secondary> + </indexterm><indexterm> + <primary>filters</primary> + + <secondary>line filter syntax</secondary> + </indexterm><indexterm> + <primary>regular expressions</primary> + + <secondary>in line filters</secondary> + </indexterm> + + A line filter is a rule that is evaluated against each single-line + difference in your compared files, if line filter rules are enabled. When + a rule matches a single-line difference, the difference is ignored. + + Ignored differences are marked in the File Compare window with the + Ignored Difference color (as defined in the Colors + page of WinMerge Options). This enables you to distinguish ignored + differences from other types. However, you cannot select or merge ignored + difference. + + Line filter matching can be described in terms of two ideas: - "Filters" subfolder in - the WinMerge program folder. E.g. C:\Program - Files\WinMerge\Filters. + When a rule matches any part of the line, the entire difference + is ignored. Therefore, you cannot filter just part of a line. For + example, suppose two files have the following single-line + difference: + + + File1: + + # Jean Sibelius + + + + File2: + + # Janne Sibelius + + + With no filtering, the line is detected as a difference. But if + we apply a line filter rule with the expression, ^#, the + lines are reported as identical, because the expression specifies only + the first character, which matches in both files. - User-defined folder. Selected in Options ( - Edit + A rule is applied to a multi-line difference only if all the + lines match. For example, consider this two-line difference: + + + File1: - Options + # Jean Sibelius +# Pekka Himanen + - System + + File2: - Filter Folder - ). By default it is My - Documents\WinMerge\Filters folder. + # Janne Sibelius +Pekka Himanen + + + The same ^# rule matches the first line, but not + the second line. Therefore, the difference is not ignored. - - With WinMerge 2.6.0 and later filter files are not anymore - loaded from profile folder like with earlier versions. Using - user-defined folder for filter files provides more flexibility and - easier access to filter files. - + + It's usually good practice to use the beginning of line ( + ^ ) and end of line ( & ) of line markers + to control your patterns precisely, because the rule is applied if any + part of a line matches the expression. + + + + Sample line filters + + ^MYTAG$ + + Filters lines that exactly match MYTAG + + ^:: + + Filters lines beginning with :: + + ^/\**.\*/$ + + Filters lines beginning with + /* and ending with + */ + + ^[1-5]00 + + Filters lines beginning with numbers 100, 200, 300, 400, and + 500 + + + + Line filter rule matching CVS Id lines + + Id lines look like this: + + // $Id$ + + ... and can be filtered with this rule: + + ^// \WId: .*\$ + + + + Filter line number comments in po files + + po line number comments look like this: + + #: src/filename.c:766 + + ... and can be filtered with this rule: - First part of filter file defines name and basic functionality of - the filter: + ^# + +
      +
      + +
      + Using the Filters dialog<indexterm> + <primary>Filters dialog</primary> + </indexterm><indexterm> + <primary>filters</primary> + + <secondary>managing and enabling</secondary> + </indexterm> + + This section describes the Filters dialog, which provides functions to + create and manage file filters and line filters. + + To open the Filters dialog, use either of these methods: + + + + In the Select Files or Folders dialog, click + Select to the right of the + Filter field. You use this method when you want to + apply a file filter to a folder compare operation. + + + + Click + Tools + + Filters + . This method can be used at any time except when the + Select Files or Folders dialog is open. + + + + The Filters dialog has a tab for each type of WinMerge filter: + + + + Filefilters + + + Choose this tab to work with file filters for folder compare + operations. + + - name: Example filter -def: includewhere def: is: + + Linefilters + + + Choose this tab to work with line filters for file compare + operations. + + + + +
      + Using the Filefilters tab<indexterm> + <primary>file filters</primary> + + <secondary>enabling</secondary> + </indexterm> + + The main part of this tab is a list of file filters that are + available for folder compare operations. The list includes shared, + private, and installed file filters that WinMerge knows about, as + described in . + +
      + Enabling and disabling file filters + + You must enable a file filter to make it available in a folder + comparison operation, or to disable a current filter to stop it from + being used: + + - include - inclusive filter. This filter - type filters out files and folders that match rules in - filter. + Open the Filters dialog, if it is not already open. - exclude - exclusive filter. This filter - type lets through files and folders that match rules in - filter. + Select a file filter or + <None> from the list. - When using exclusive filter its worth noting that the - filter must contain rule to include all wanted subfolders. Usually its - wise to use this rule to include all subfolders: - d: \\*$ ## Subfolders + + Click OK to dismiss the Filters + dialog. + + + + There are several ways to apply file filters after enabling them. + For details, see . +
      + +
      + Configuring file filters + + Use these buttons to manage your Filefilters + list and create new file filters: + + + + Test + + + Select a file filter in the list and click + Test to quickly see how the filter works. + See for details. + + + + + Install + + + Enables you to locate a file filter and adds it to the + Filters list. File filters that are not in either the shared or + default private folder are not detected unless you install + them. + + + + + New + + + Creates a new copy of a file template in either the shared + or private filter folders, and opens it in your default editor. + Edit the template and add your rules, as described in . + + + + + Edit + + + Select a file filter in the list and click + Edit to open the file in your default + editor. + + + + + Delete + + + Select a file filter in the list and click + Delete to delete the file and remove it + from the list. Yes, the file is really deleted! + + + + + Your changes are saved when you click OK to + dismiss the Filters dialog. +
      + +
      + Creating a file filter + + If the file filters that are installed with WinMerge do not + provide the filtering you need, you can create your own: + + + + Click + Tools - There can be one filter rule in one line. And rule cannot be split - to several lines. Common format for one filter line is like this: + Filters + . Or, from the Select Files or Folders dialog, click + Select to the right of the + Filter field. + - f: \.ext$ ## Match files *.ext + + In the Filters dialog Filefilters tab, click + New. + - or + + In the Shared or Private Filter dialog, choose + Shared Filter or Private + Filter (see for + their uses) and click OK. + + The Select filename for new filter dialog opens in the shared + or private files folder on your system (if the private folder does + not exist, WinMerge creates it). + - d: \\folder$ ## Match given folder name + + In the Select filename for new filter dialog, enter a new file + name and click Save. + + + Don't choose an existing file name: to edit an existing + file, go back to Step and + click Edit instead of New. + + + WinMerge initializes the new file with the contents of the + FileFilter.tmpl tempate, and opens it in your + default text editor. + - Rule begins with "f:" if it matches for - filenames and "d:" if it matches for folder names. - (d comes from "folder".) Filenames are given to filter as is, there are - no special characters added. Folder names have preceding backslash - before them (e.g. "\Folder name"). So if folder names are matched by the - beginning of the name, the filter must start with "\\" to match the - first backslash. "##" is a comment separator, all - characters in line after that are ignored by WinMerge. + + Follow the template instructions to edit the template, + updating the placeholder name and description and adding filter + rules as described in . + Save the file in your text editor. + + + If you want to quickly test a rule that you are defining, + try clicking Test in the Filters dialog. See for details. + + - - File filter rules are case-insensitive. Rule - .\bat$ matches to - winmerge.bat and - compare.BAT. - + + If you created your file filter in one of the standard + Filters folders, and the Filters dialog does + not list your new file filter, try clicking + OK to close it, then click + Tools + + Filters + again to reopen it. The + Filefilters list should now include the new + file filter. + + If you saved the file in an alternate location on your file + system), WinMerge cannot detect it unless you install it. To make a + file filter detectable anywhere on your system: + + + + Click Install in the Filters + dialog. + + + + In the Locate filter file to install dialog, navigate to + the flt file on your system, and click + Open. The Filefilters list should now + include the installed file filter. + + + + +
      - So simple filters can be for example: +
      + Testing file filter rules<indexterm> + <primary>file filters</primary> - <example> - <title>Simple filefilter rules - - f: \.cpp$ ## Match *.cpp files -f: \.h$ ## Match *.h files -f: ^My ## Match My*.* files -f: Dlg\. ## Match *Dlg.* files -d: \\test$ ## Match 'test' folders -d: ^\\Build$ ## Match 'Build' folders -d: Temp$ ## Match *Temp folders (e.g. FirstTemp) -d: Src ## Match *Src* folders - + testing + + testing file filters + - Line begin or -end marker ("^" or - "$") is usually required filter to work correctly. - Dot in filename must be "escaped" with "\" so - "\." means dot in filename. - - - Don't forget "$" at end. It marks end of - folder- or filename and without it rule may not work like expected. - While "\.c$" matches with only filenames having - extension .c - "\.c" matches all extensions beginning with - "c" (.cpp, - .com, etc). - - - Since file filter rules are regular expressions more complex rules - are also possible. Following few rules show some possibilities for more - complex rules: + Use the Test Filter dialog to quickly test a file filter against + sample data, to help you develop new rules or to understand how existing + rules work. It can be easier than running a full compare + operation. - - More complex file filter rules + Starting from the Filters dialog: - f: ^\.#.*$ ## .#filename.version files -f: Dlg\.c(pp)?$ ## *Dlg.c & *Dlg.cpp files -f: ^I.*\.h$ ## I*.h files -f: Srv[1-9]\.def$ ## *Srv1.def - *Srv9.def files -f: ^[h,k,m] ## h*.* & k*.* & m*.* files - + + + In the Filefilters tab, choose the file filter you want to + test. + + + + If you want to see the rules you will be testing,click + Edit now to open the file so that you can + view it during the next steps. + + + + Click Test. + - WinMerge ignores most whitespace characters in rules definition - lines. However comment must always start with one or more whitespace - character (space or tabulator) and comment-marker - (##). ## can be used as part - of rule if there is no whitespace character before it. + + In the Test Filter dialog, choose the type of rule to + test: + + + + To test an f: file rule in your file + filter, uncheck the Folder Name + option. + + + + To test a d: folder rule, check the + Folder Name option. + + + + + + Enter the text to test. + + The text should be appropriate for the type of rule you are + testing. For example, if you have checked the Folder + Name option, you probably want to enter a folder name, + such as \temp. + + The Result box displays your entry, + followed by its status: either + passed or + failed. + + +
      -
      -
      - Line filters +
      + Using the Linefilters tab<indexterm> + <primary>line filters</primary> - <para>Line filters can be used to ignore single lines from compared files. - Line filters are handy when user doesn't want to compare comments or - certain generated code. For example version control system - (time)stamps.</para> + <secondary>enabling</secondary> + </indexterm> - - Line filter rule ignores single line it matches. It is not - possible to ignore partial lines or several lines with file filter rule. - Also, all lines in difference must match the filter so that difference - is ignored. If only one line of several matches, the difference is not - ignored. - + Use this tab to configure and enable line filters for file compare + operations. The tab features a list of rules. Each rule contains a single + regular expression. You can apply any combination of rules from the list + to a file comparison. - In file compare ignored differences are shown with own colors to - differentiate them from other differences. User can see these differences - but cannot select or merge them. +
      + Configuring line filters - Line filter rules are regular expressions like file filter rules. - Since filter matches if any part of line matches it is usually recommended - to add begin ("^") or end ("$") - marker to rule. Or both markers if exact line is wanted to - filtered. + Below the Regular Expressions list is an edit + box and buttons that you can use to maintain the list at any time by + adding, editing, and removing rules. - Rules can be added and edited in Filters-dialog (Menu: - Tools + To add a new rule: - Filters - ). Type one rule per row to the list. At the beginning of - the row is a checkbox for enabling / disabling single rules. + + + Click New. Your edit cursor is + automatically enabled in the edit box. + - Compare results are not updated automatically after changing line - filter rules. User can update compare results by selecting - Edit + + Enter an expression in the edit box below the + Regular Expressions list. + - Refresh - or F5. + + Click Save to load the expression in a + new line in the list. + + - - Some example line filters + To edit an existing rule: - ^MYTAG$ + + + Select the line and click Edit. + - - Filters out lines being exactly - "MYTAG" + + Edit the expression in the edit box. + - ^:: + + Click Save when + you're done. + + - - Filters out lines beginning with - "::" + To delete an existing rule, select (check) the rule and click + Remove. +
      - ^/\**.\*/$ +
      + Enabling and disabling line filters<indexterm> + <primary>line filters</primary> - <para>- Filters out lines beginning with <constant>"/*"</constant> and - ending with <constant>"*/"</constant></para> + <secondary>list of available</secondary> + </indexterm> - ^[1-5]00 + + + In the Regular Expressions list, check + just the filters that you want to apply, and uncheck any filters you + do not want to apply. + - - Filters out lines beginning with numbers 100, 200, 300, 400 - & 500 - + + Check or uncheck the Enable Line Filters + option. If you turn filtering on, all the rules that are currently + checked in the Regular Expression list are + used. If filtering is off, no rules are used even if they are + checked. + - - Line filter rule matching CVS "Id:" -lines: + + Click OK to dismiss the Filters dialog + and save your settings. + + - Id-lines are like this: + There are several ways to apply file filters after enabling them. + For details, see . +
      +
      +
      + +
      + Getting help with regular expressions<indexterm> + <primary>regular expressions</primary> + + <secondary>getting help</secondary> + </indexterm> - // $Id$ + Regular expressions can be very complex. Fortunately, most file + filters in WinMerge involve simple extension expressions, as shown in the + examples in this topic. The filter files installed with WinMerge include + many other useful examples. - And they can be filtered with rule: + Finally, there are lots of resources on the Web for help with regexps, + including these sites: + + + + Good site devoted to regexps: + + + http://www.regular-expressions.info/ + + - ^// \WId: .*\$ - + + Good HOWTO for regexps: - - Filter out line number comments in po files: + + http://www.amk.ca/python/howto/regex/ + + - po line number comments are like this: + + Tutorial: - #: src/filename.c:766 + + http://www.zvon.org/other/PerlTutorial/Output/index.html + + - And they can be filtered out with rule: + + PDF quick reference: - ^# - + + http://www.night-ray.com/regex.pdf + + +
      -
      + \ No newline at end of file diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index b9363333f7e..41179c67b96 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -21,7 +21,9 @@ ]> - WinMerge 2.8 Manual + WinMerge <xi:include href="replaceables.xml" + xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="element(version)" /> + Help WinMerge From fc1243338c1011a8f3ab274f5c37503c90ae7fd1 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 4 Sep 2008 20:47:55 +0000 Subject: [PATCH 096/168] PATCH: [ 2056741 ] ignore EOL dialog fix Submitted by jwdevel --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Docs/Users/Contributors.txt | 1 + Src/Common/MessageBoxDialog.cpp | 3 +++ Src/Common/MessageBoxDialog.h | 3 ++- Src/MergeDoc.cpp | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index c2cd9a0463c..5835cb8364f 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -12,6 +12,8 @@ WinMerge 2.10 RC BugFix: Table of Contents in manual (#2071625) BugFix: ClearCase checkout/commit dialog translation error (#2051069) BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879) + BugFix: Could not reset EOL ignore after selecting it from query + dialog (#2056741) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt index 0411164289a..b99b4c8c269 100644 --- a/Docs/Users/Contributors.txt +++ b/Docs/Users/Contributors.txt @@ -134,6 +134,7 @@ Other Contributors (code, ideas, testing..): * Marvin Gouw * Robert Grange * Jan Hryz +* jwdevel * Ed_K * Alberto Kalb * Robert Knienider diff --git a/Src/Common/MessageBoxDialog.cpp b/Src/Common/MessageBoxDialog.cpp index d752fabb946..1ebcca8b4be 100644 --- a/Src/Common/MessageBoxDialog.cpp +++ b/Src/Common/MessageBoxDialog.cpp @@ -400,6 +400,9 @@ INT_PTR CMessageBoxDialog::DoModal ( ) // Check whether a result was retrieved. if ( nFormerResult != (-1) ) { + if ( ( m_nStyle & MB_IGNORE_IF_SILENCED ) ) + return IDIGNORE; + // Return the former result without displaying the dialog. return nFormerResult; } diff --git a/Src/Common/MessageBoxDialog.h b/Src/Common/MessageBoxDialog.h index b791d04e44e..4c0fde8a75d 100644 --- a/Src/Common/MessageBoxDialog.h +++ b/Src/Common/MessageBoxDialog.h @@ -47,8 +47,9 @@ #define MB_DONT_ASK_AGAIN 0x02000000L // Additional style. #define MB_YES_TO_ALL 0x04000000L // Additional style. #define MB_NO_TO_ALL 0x08000000L // Additional style. +#define MB_IGNORE_IF_SILENCED 0x10000000L // Additional style. -#define MB_DEFAULT_CHECKED 0x10000000L // Additional style. +#define MB_DEFAULT_CHECKED 0x10000000L // Additional style. #define MB_RIGHT_ALIGN 0x20000000L // Additional style. #define MB_NO_SOUND 0x40000000L // Additional style. diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 1bf0ad56fd0..80537ad32e5 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2197,7 +2197,7 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file // All lines will differ, that is not very interesting and probably not wanted. // Propose to turn off the option 'sensitive to EOL' String s = theApp.LoadString(IDS_SUGGEST_IGNOREEOL); - if (AfxMessageBox(s.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_SUGGEST_IGNOREEOL) == IDYES) + if (AfxMessageBox(s.c_str(), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN | MB_IGNORE_IF_SILENCED, IDS_SUGGEST_IGNOREEOL) == IDYES) { diffOptions.bIgnoreEol = TRUE; m_diffWrapper.SetOptions(&diffOptions); From 08a9b51d3e2c3a7e16e9c098e216d45d17ef8dff Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 4 Sep 2008 20:51:26 +0000 Subject: [PATCH 097/168] Bump manual revision to 1.4.6. --HG-- branch : R2_10 --- Docs/Users/Manual/WinMerge_help.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 41179c67b96..09a34c51ca9 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -27,7 +27,7 @@ WinMerge - Revision 1.4.5 + Revision 1.4.6 2004-2008 From 4f8b04931c59bfc74ea3724065401d9ed0b20f31 Mon Sep 17 00:00:00 2001 From: Jochen Tucht Date: Fri, 5 Sep 2008 06:43:12 +0000 Subject: [PATCH 098/168] Patch #2081779 - Revised command line processing --HG-- branch : R2_10 --- Src/ConflictFileParser.cpp | 14 +- Src/ConflictFileParser.h | 6 +- Src/MainFrm.cpp | 72 +++------ Src/MainFrm.h | 3 +- Src/Merge.cpp | 108 ++++---------- Src/Merge.h | 4 - Src/Merge.vcproj | 80 ---------- Src/MergeCmdLineInfo.cpp | 296 +++++++++++++++++++++++++++++++++---- Src/MergeCmdLineInfo.h | 31 ++-- 9 files changed, 332 insertions(+), 282 deletions(-) diff --git a/Src/ConflictFileParser.cpp b/Src/ConflictFileParser.cpp index d62d1a3a3ed..e2fb974fb25 100644 --- a/Src/ConflictFileParser.cpp +++ b/Src/ConflictFileParser.cpp @@ -48,13 +48,13 @@ static const TCHAR MineBegin[] = _T("<<<<<<< "); * @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) +bool IsConflictFile(LPCTSTR conflictFileName) { UniMemFile conflictFile; BOOL startFound = FALSE; // open input file - BOOL success = conflictFile.OpenReadOnly(conflictFileName.c_str()); + BOOL success = conflictFile.OpenReadOnly(conflictFileName); // Search for a conflict marker BOOL linesToRead = TRUE; @@ -89,8 +89,8 @@ bool IsConflictFile(const String &conflictFileName) * @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 ParseConflictFile(LPCTSTR conflictFileName, + LPCTSTR workingCopyFileName, LPCTSTR newRevisionFileName, bool &bNestedConflicts) { UniMemFile conflictFile; @@ -107,11 +107,11 @@ bool ParseConflictFile(const String &conflictFileName, bNestedConflicts = false; // open input file - BOOL success = conflictFile.OpenReadOnly(conflictFileName.c_str()); + BOOL success = conflictFile.OpenReadOnly(conflictFileName); // Create output files - BOOL success2 = workingCopy.Open(workingCopyFileName.c_str(), _T("wb")); - BOOL success3 = newRevision.Open(newRevisionFileName.c_str(), _T("wb")); + BOOL success2 = workingCopy.Open(workingCopyFileName, _T("wb")); + BOOL success3 = newRevision.Open(newRevisionFileName, _T("wb")); state = 0; BOOL linesToRead = TRUE; diff --git a/Src/ConflictFileParser.h b/Src/ConflictFileParser.h index 28079469d4c..2380af16674 100644 --- a/Src/ConflictFileParser.h +++ b/Src/ConflictFileParser.h @@ -32,10 +32,10 @@ #include "UnicodeString.h" -bool IsConflictFile(const String &conflictFileName); +bool IsConflictFile(LPCTSTR conflictFileName); -bool ParseConflictFile(const String &conflictFileName, - const String &workingCopyFileName, const String &newRevisionFileName, +bool ParseConflictFile(LPCTSTR conflictFileName, + LPCTSTR workingCopyFileName, LPCTSTR newRevisionFileName, bool &nestedConflicts); #endif // _CONFLICT_FILE_PARSER_H_ diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 6aaa0537ce5..69e3c570cd0 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -201,7 +201,6 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd) ON_COMMAND(ID_VIEW_RESIZE_PANES, OnResizePanes) ON_COMMAND(ID_FILE_OPENPROJECT, OnFileOpenproject) ON_MESSAGE(WM_COPYDATA, OnCopyData) - ON_MESSAGE(WM_USER, OnUser) ON_COMMAND(ID_WINDOW_CLOSEALL, OnWindowCloseAll) ON_UPDATE_COMMAND_UI(ID_WINDOW_CLOSEALL, OnUpdateWindowCloseAll) ON_COMMAND(ID_FILE_SAVEPROJECT, OnSaveProject) @@ -219,7 +218,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd) ON_COMMAND(ID_HELP_RELEASENOTES, OnHelpReleasenotes) ON_COMMAND(ID_HELP_TRANSLATIONS, OnHelpTranslations) ON_COMMAND(ID_FILE_OPENCONFLICT, OnFileOpenConflict) - ON_COMMAND(ID_PLUGINS_LIST, &CMainFrame::OnPluginsList) + ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -359,27 +358,31 @@ class StatusDisplay : public IStatusDisplay static StatusDisplay myStatusDisplay; +#ifdef _UNICODE +const TCHAR CMainFrame::szClassName[] = _T("WinMergeWindowClassW"); +#else +const TCHAR CMainFrame::szClassName[] = _T("WinMergeWindowClassA"); +#endif /** * @brief Change MainFrame window class name * see http://support.microsoft.com/kb/403825/ja */ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs) { - LPCTSTR lpzsNewName = _T("WinMergeWindowClass"); WNDCLASS wndcls; BOOL bRes = CMDIFrameWnd::PreCreateWindow(cs); HINSTANCE hInst = AfxGetInstanceHandle(); // see if the class already exists - if (!::GetClassInfo(hInst, lpzsNewName, &wndcls)) + if (!::GetClassInfo(hInst, szClassName, &wndcls)) { // get default stuff ::GetClassInfo(hInst, cs.lpszClass, &wndcls); // register a new class - wndcls.lpszClassName = lpzsNewName; + wndcls.lpszClassName = szClassName; wndcls.hIcon = ::LoadIcon(hInst, MAKEINTRESOURCE(IDR_MAINFRAME)); ::RegisterClass(&wndcls); } - cs.lpszClass = lpzsNewName; + cs.lpszClass = szClassName; return bRes; } @@ -2766,51 +2769,13 @@ void CMainFrame::OnFileOpenproject() LRESULT CMainFrame::OnCopyData(WPARAM wParam, LPARAM lParam) { COPYDATASTRUCT *pCopyData = (COPYDATASTRUCT*)lParam; - LPWSTR p = (LPWSTR)(pCopyData->lpData); - int argc = pCopyData->dwData; - TCHAR **argv = new (TCHAR *[argc]); - USES_CONVERSION; - - for (int i = 0; i < argc; i++) - { - argv[i] = new TCHAR[lstrlenW(p) * (sizeof(WCHAR)/sizeof(TCHAR)) + 1]; - lstrcpy(argv[i], W2T(p)); - while (*p) p++; - p++; - } - - PostMessage(WM_USER, (WPARAM)argc, (LPARAM)argv); - - return TRUE; -} - -LRESULT CMainFrame::OnUser(WPARAM wParam, LPARAM lParam) -{ - // MFC's ParseCommandLine method is working with __argc and __targv - // variables. We need to send MergeCmdLineInfo object rather than - // passing the command line as string. Until we do, we temporary - // change these variable values and restore then after parsing. - - int argc = __argc; - TCHAR **argv = __targv; - - __argc = wParam; - __targv = reinterpret_cast(lParam); - - MergeCmdLineInfo cmdInfo(*__targv); - theApp.ParseCommandLine(cmdInfo); + LPCTSTR pchData = (LPCTSTR)pCopyData->lpData; + // Bail out if data isn't zero-terminated + DWORD cchData = pCopyData->cbData / sizeof(TCHAR); + if (cchData == 0 || pchData[cchData - 1] != _T('\0')) + return FALSE; + MergeCmdLineInfo cmdInfo = pchData; theApp.ParseArgsAndDoOpen(cmdInfo, this); - - // Delete memrory allocated in OnCopyData method. - for (int i = 0; i < __argc; ++i) - { - delete[] __targv[i]; - } - delete __targv; - - __argc = argc; - __targv = argv; - return TRUE; } @@ -3459,15 +3424,14 @@ void CMainFrame::OnFileOpenConflict() BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile, bool checked) { BOOL conflictCompared = FALSE; - String confl = (LPCTSTR)conflictFile; if (!checked) { - bool confFile = IsConflictFile(confl); + bool confFile = IsConflictFile(conflictFile); if (!confFile) { CString message; - LangFormatString1(message, IDS_NOT_CONFLICT_FILE, confl.c_str()); + LangFormatString1(message, IDS_NOT_CONFLICT_FILE, conflictFile); AfxMessageBox(message, MB_ICONSTOP); return FALSE; } @@ -3484,7 +3448,7 @@ BOOL CMainFrame::DoOpenConflict(LPCTSTR conflictFile, bool checked) // Parse conflict file into two files. bool inners; - bool success = ParseConflictFile(confl, workFile, revFile, inners); + bool success = ParseConflictFile(conflictFile, workFile.c_str(), revFile.c_str(), inners); if (success) { diff --git a/Src/MainFrm.h b/Src/MainFrm.h index 081b5aca080..c7f1794c189 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -108,7 +108,7 @@ class CMainFrame : public CMDIFrameWnd BOOL m_bShowErrors; /**< Show folder compare error items? */ LOGFONT m_lfDiff; /**< MergeView user-selected font */ LOGFONT m_lfDir; /**< DirView user-selected font */ - + static const TCHAR szClassName[]; // Operations public: HMENU NewDirViewMenu(); @@ -318,7 +318,6 @@ class CMainFrame : public CMDIFrameWnd afx_msg void OnResizePanes(); afx_msg void OnFileOpenproject(); afx_msg LRESULT OnCopyData(WPARAM wParam, LPARAM lParam); - afx_msg LRESULT OnUser(WPARAM wParam, LPARAM lParam); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnWindowCloseAll(); afx_msg void OnUpdateWindowCloseAll(CCmdUI* pCmdUI); diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 97294f8058a..3bd1dc655b3 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -223,14 +223,11 @@ BOOL CMergeApp::InitInstance() } // Parse command-line arguments. - MergeCmdLineInfo cmdInfo(*__targv); - ParseCommandLine(cmdInfo); + MergeCmdLineInfo cmdInfo = GetCommandLine(); // If paths were given to commandline we consider this being an invoke from // commandline (from other application, shellextension etc). - BOOL bCommandLineInvoke = FALSE; - if (cmdInfo.m_nFiles > 0) - bCommandLineInvoke = TRUE; + BOOL bCommandLineInvoke = cmdInfo.m_Files.size() > 0; // Set default codepage DirScan_InitializeDefaultCodepage(); @@ -256,32 +253,16 @@ BOOL CMergeApp::InitInstance() WaitForSingleObject(hMutex, INFINITE); if (bSingleInstance && GetLastError() == ERROR_ALREADY_EXISTS) { - USES_CONVERSION; - // Activate previous instance and send commandline to it - HWND hWnd = FindWindow(_T("WinMergeWindowClass"), NULL); + HWND hWnd = FindWindow(CMainFrame::szClassName, NULL); if (hWnd) { if (IsIconic(hWnd)) ShowWindow(hWnd, SW_RESTORE); SetForegroundWindow(GetLastActivePopup(hWnd)); - - WCHAR *pszArgs = new WCHAR[_tcslen(__targv[0]) + _tcslen(m_lpCmdLine) + 3]; - WCHAR *p = pszArgs; - for (int i = 0; i < __argc; i++) - { - wcscpy(p, T2W(__targv[i])); - p += lstrlenW(p) + 1; - } - *p++ = _T('\0'); - COPYDATASTRUCT data = {0}; - data.cbData = (DWORD)(p - pszArgs) * sizeof(WCHAR); - data.lpData = pszArgs; - data.dwData = __argc; - SetLastError(ERROR_SUCCESS); - SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data); - delete[] pszArgs; - if (GetLastError() == ERROR_SUCCESS) + LPTSTR cmdLine = GetCommandLine(); + COPYDATASTRUCT data = { 0, (lstrlen(cmdLine) + 1) * sizeof(TCHAR), cmdLine}; + if (SendMessage(hWnd, WM_COPYDATA, NULL, (LPARAM)&data)) { ReleaseMutex(hMutex); CloseHandle(hMutex); @@ -305,7 +286,7 @@ BOOL CMergeApp::InitInstance() m_pOptions->SaveOption(OPT_FILEFILTER_CURRENT, filter); } - CSplashWnd::EnableSplashScreen(bDisableSplash==FALSE && cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew); + CSplashWnd::EnableSplashScreen(!bDisableSplash && !bCommandLineInvoke); // Initialize i18n (multiple language) support @@ -557,21 +538,10 @@ BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF BOOL bCompared = FALSE; m_bNonInteractive = cmdInfo.m_bNonInteractive; - SetOptionsFromCmdLine(cmdInfo); - - // Do not load or remember options (preferences). - if (cmdInfo.m_bNoPrefs) - { - // Turn off serializing to registry. - GetOptionsMgr()->SetSerializing(false); - // Load all default settings. - ResetOptions(); - } - // Set the global file filter. - if (!cmdInfo.m_sFileFilter.IsEmpty()) + if (!cmdInfo.m_sFileFilter.empty()) { - m_globalFileFilter.SetFilter(cmdInfo.m_sFileFilter); + m_globalFileFilter.SetFilter(cmdInfo.m_sFileFilter.c_str()); } // Unless the user has requested to see WinMerge's usage open files for @@ -593,78 +563,52 @@ BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF pMainFrame->m_strDescriptions[0] = cmdInfo.m_sLeftDesc; pMainFrame->m_strDescriptions[1] = cmdInfo.m_sRightDesc; - if (cmdInfo.m_nFiles > 2) + if (cmdInfo.m_Files.size() > 2) { - pMainFrame->m_strSaveAsPath = cmdInfo.m_Files[2]; - bCompared = pMainFrame->DoFileOpen(cmdInfo.m_Files[0], - cmdInfo.m_Files[1], cmdInfo.m_dwLeftFlags, + pMainFrame->m_strSaveAsPath = cmdInfo.m_Files[2].c_str(); + bCompared = pMainFrame->DoFileOpen(cmdInfo.m_Files[0].c_str(), + cmdInfo.m_Files[1].c_str(), cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, - cmdInfo.m_sPreDiffer); + cmdInfo.m_sPreDiffer.c_str()); } - else if (cmdInfo.m_nFiles > 1) + else if (cmdInfo.m_Files.size() > 1) { cmdInfo.m_dwLeftFlags |= FFILEOPEN_CMDLINE; cmdInfo.m_dwRightFlags |= FFILEOPEN_CMDLINE; - bCompared = pMainFrame->DoFileOpen(cmdInfo.m_Files[0], - cmdInfo.m_Files[1], cmdInfo.m_dwLeftFlags, + bCompared = pMainFrame->DoFileOpen(cmdInfo.m_Files[0].c_str(), + cmdInfo.m_Files[1].c_str(), cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, cmdInfo.m_bRecurse, NULL, - cmdInfo.m_sPreDiffer); + cmdInfo.m_sPreDiffer.c_str()); } - else if (cmdInfo.m_nFiles == 1) + else if (cmdInfo.m_Files.size() == 1) { - CString sFilepath = cmdInfo.m_Files[0]; - if (IsProjectFile(sFilepath)) + String sFilepath = cmdInfo.m_Files[0]; + if (IsProjectFile(sFilepath.c_str())) { - bCompared = LoadAndOpenProjectFile(sFilepath); + bCompared = LoadAndOpenProjectFile(sFilepath.c_str()); } - else if (IsConflictFile((LPCTSTR)sFilepath)) + else if (IsConflictFile(sFilepath.c_str())) { - bCompared = pMainFrame->DoOpenConflict(sFilepath); + bCompared = pMainFrame->DoOpenConflict(sFilepath.c_str()); } else { cmdInfo.m_dwRightFlags = FFILEOPEN_NONE; - bCompared = pMainFrame->DoFileOpen(sFilepath, _T(""), + bCompared = pMainFrame->DoFileOpen(sFilepath.c_str(), _T(""), cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, - cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer); + cmdInfo.m_bRecurse, NULL, cmdInfo.m_sPreDiffer.c_str()); } } } return bCompared; } -/** @brief Handle all command line arguments which are mapped to WinMerge options. */ -void CMergeApp::SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo) -{ - static const ArgSetting f_ArgSettings[] = - { - { _T("ignorews"), OPT_CMP_IGNORE_WHITESPACE }, - { _T("ignoreblanklines"), OPT_CMP_IGNORE_BLANKLINES }, - { _T("ignorecase"), OPT_CMP_IGNORE_CASE }, - { _T("ignoreeol"), OPT_CMP_IGNORE_EOL } - }; - - for (int i = 0; i < countof(f_ArgSettings); ++i) - { - const ArgSetting& argSetting = f_ArgSettings[i]; - LPCTSTR szCmdArgName = argSetting.CmdArgName; - LPCTSTR szOptionName = argSetting.WinMergeOptionName; - CString sValue; - - if (cmdInfo.m_Settings.Lookup(szCmdArgName, sValue)) - { - GetOptionsMgr()->SaveOption(szOptionName, sValue); - } - } -} - /** @brief Open help from mainframe when user presses F1*/ void CMergeApp::OnHelp() { GetMainFrame()->ShowHelp(); } - /** * @brief Is specified file a project file? * @param [in] filepath Full path to file to check. diff --git a/Src/Merge.h b/Src/Merge.h index 0d9aaf11fc3..4c804051f5a 100644 --- a/Src/Merge.h +++ b/Src/Merge.h @@ -105,7 +105,6 @@ class CMergeApp : public CWinApp virtual BOOL PreTranslateMessage(MSG* pMsg); void InitializeFileFilters(); BOOL ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame); - void SetOptionsFromCmdLine(const MergeCmdLineInfo& cmdInfo); // End MergeArgs.cpp bool LoadAndOpenProjectFile(LPCTSTR sFilepath); @@ -160,9 +159,6 @@ extern CMergeApp theApp; COptionsMgr * GetOptionsMgr(); CLogFile * GetLog(); -///////////////////////////////////////////////////////////////////////////// -CMergeDoc *GetDoc(); - //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj index ba67a608cab..c9bebab944b 100644 --- a/Src/Merge.vcproj +++ b/Src/Merge.vcproj @@ -587,43 +587,6 @@ PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6500,9 +6423,6 @@ - - diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp index 40142ae0bd7..0283221f85e 100644 --- a/Src/MergeCmdLineInfo.cpp +++ b/Src/MergeCmdLineInfo.cpp @@ -20,9 +20,9 @@ ///////////////////////////////////////////////////////////////////////////// /** - * @file CmdLineParser.h + * @file MergeCmdLineInfo.cpp * - * @brief CmdLineParser class implementation. + * @brief MergeCmdLineInfo class implementation. * */ @@ -33,33 +33,88 @@ #include // Required for PathFindFileName +#include "Paths.h" +#include "Merge.h" #include "MainFrm.h" #include "MergeCmdLineInfo.h" -#include "ClearCaseCmdLineParser.h" -#include "WinMergeCmdLineParser.h" +#include "OptionsDef.h" // MergeCmdLineInfo +/** + * @brief Eat and digest a command line parameter. + * @param [in] p Points into the command line. + * @param [out] param Receives the digested command line parameter. + * @param [out] flag Tells whether param is the name of a flag. + * @return Points to the remaining portion of the command line. + */ +LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String ¶m, bool *flag) +{ + if (p && *(p += StrSpn(p, _T(" \t"))) == '\0') + p = 0; + LPCTSTR q = PathGetArgs(p); + if (q > p && flag) + { + if (*p == _T('-') || *p == _T('/')) + { + *flag = true; + ++p; + if (LPCTSTR colon = StrRChr(p, q, _T(':'))) + q = colon; + } + else + { + *flag = false; + flag = 0; + } + } + param.assign(p, q - p); + if (q > p && flag) + { + CharLower(&*param.begin()); + } + // Strip any leading or trailing whitespace or quotes + param.erase(0, param.find_first_not_of(_T(" \t\""))); + param.erase(param.find_last_not_of(_T(" \t\"")) + 1); + return q; +} + +/** + * @brief Set WinMerge option from command line. + * @param [in] p Points into the command line. + * @param [in] key Name of WinMerge option to set. + * @param [in] value Default value in case none is specified. + * @return Points to the remaining portion of the command line. + */ +LPCTSTR MergeCmdLineInfo::SetOption(LPCTSTR q, LPCTSTR key, LPCTSTR value) +{ + String s; + if (*q == _T(':')) + { + q = EatParam(q, s); + value = s.c_str() + 1; + } + GetOptionsMgr()->SaveOption(key, value); + return q; +} + /** * @brief ClearCaseCmdLineParser's constructor. - * @param [in] szExeName Executable file name. Required in order to - * know which command line parser to create and use. + * @param [in] q Points to the beginning of the command line. */ -MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(), +MergeCmdLineInfo::MergeCmdLineInfo(LPCTSTR q): m_nCmdShow(SW_SHOWNORMAL), m_bClearCaseTool(false), m_bEscShutdown(false), m_bExitIfNoDiff(false), m_bRecurse(false), m_bNonInteractive(false), - m_bNoPrefs(false), m_bSingleInstance(false), m_bShowUsage(false), m_dwLeftFlags(FFILEOPEN_CMDLINE), - m_dwRightFlags(FFILEOPEN_CMDLINE), - m_nFiles(0) + m_dwRightFlags(FFILEOPEN_CMDLINE) { - m_Files.SetSize(2); + m_Files.reserve(2); // Rational ClearCase has a weird way of executing external // tools which replace the build-in ones. It also doesn't allow @@ -70,40 +125,219 @@ MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR *szExeName) : CCommandLineInfo(), // parse ClearCase's command line parameters and not the // "regular" parameters. More information can be found in // C:\Program Files\Rational\ClearCase\lib\mgrs\mgr_info.h file. - - LPTSTR szFileName = ::PathFindFileName(szExeName); - - if (lstrcmpi(szFileName, _T("xcompare")) && lstrcmpi(szFileName, _T("xmerge"))) + String exeName; + q = EatParam(q, exeName); + LPTSTR szFileName = PathFindFileName(exeName.c_str()); + if (lstrcmpi(szFileName, _T("xcompare")) == 0) + { + m_dwRightFlags |= FFILEOPEN_READONLY; + ParseClearCaseCmdLine(q); + } + else if (lstrcmpi(szFileName, _T("xmerge")) == 0) { - m_pCmdLineParser = new WinMergeCmdLineParser(*this); + ParseClearCaseCmdLine(q); } else { - m_bClearCaseTool = true; - m_pCmdLineParser = new ClearCaseCmdLineParser(*this, szFileName); + ParseWinMergeCmdLine(q); } } /** - * @brief Destructor. + * @brief Parse a command line passed in from ClearCase. + * @param [in] p Points into the command line. */ -MergeCmdLineInfo::~MergeCmdLineInfo() +void MergeCmdLineInfo::ParseClearCaseCmdLine(LPCTSTR q) { - delete m_pCmdLineParser; + String sBaseFile; /**< Base file path. */ + String sBaseDesc; /**< Base file description. */ + String sOutFile; /**< Out file path. */ + if (m_dwRightFlags & FFILEOPEN_READONLY) + { + // Compare tool doesn't have a common ancestor file description. We + // put a phony description so the command line parser will skip it. + sBaseDesc = _T(""); + } + m_bClearCaseTool = true; + String param; + bool flag; + while ((q = EatParam(q, param, &flag)) != 0) + { + if (!flag) + { + // Not a flag + param = paths_GetLongPath(param.c_str()); + m_Files.push_back(param); + } + else if (param == _T("base")) + { + // -base is followed by common ancestor file description. + q = EatParam(q, sBaseFile); + } + else if (param == _T("out")) + { + // -out is followed by merge's output file name. + q = EatParam(q, sOutFile); + } + else if (param == _T("fname")) + { + // -fname is followed by file description. + if (sBaseDesc.empty()) + q = EatParam(q, sBaseDesc); + else if (m_sLeftDesc.empty()) + q = EatParam(q, m_sLeftDesc); + else if (m_sRightDesc.empty()) + q = EatParam(q, m_sRightDesc); + else + q = EatParam(q, param); // ignore excess arguments + } + } + if (!sOutFile.empty()) + { + String path = paths_GetLongPath(sOutFile.c_str()); + m_Files.push_back(path); + } } /** - * @brief Parser function. - * This functino overrides CCommandLineInfo's parser function and calls - * WinMerge's parser function. - * @param [in] pszParam The parameter or flag to parse. - * @param [in] bFlag Is the item to parse a flag? - * @param [in] bLast Is the item to parse a last of items? + * @brief Parse native WinMerge command line. + * @param [in] p Points into the command line. */ -void MergeCmdLineInfo::ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast) +void MergeCmdLineInfo::ParseWinMergeCmdLine(LPCTSTR q) { - // Give our base class a chance to figure out what is the parameter. - CCommandLineInfo::ParseParam(pszParam, bFlag, bLast); + String param; + bool flag; + while ((q = EatParam(q, param, &flag)) != 0) + { + if (!flag) + { + // Not a flag + // If shortcut, expand it first + if (paths_IsShortcut(param.c_str())) + param = ExpandShortcut(param.c_str()); + param = paths_GetLongPath(param.c_str()); + m_Files.push_back(param); + } + else if (param == _T("?")) + { + // -? to show common command line arguments. + m_bShowUsage = true; + } + else if (param == _T("dl")) + { + // -dl "desc" - description for left file + q = EatParam(q, m_sLeftDesc); + } + else if (param == _T("dr")) + { + // -dr "desc" - description for right file + q = EatParam(q, m_sRightDesc); + } + else if (param == _T("e")) + { + // -e to allow closing with single esc press + m_bEscShutdown = true; + } + else if (param == _T("f")) + { + // -f "mask" - file filter mask ("*.h *.cpp") + q = EatParam(q, m_sFileFilter); + } + else if (param == _T("r")) + { + // -r to compare recursively + m_bRecurse = true; + } + else if (param == _T("s")) + { + // -s to allow only one instance + m_bSingleInstance = true; + } + else if (param == _T("noninteractive")) + { + // -noninteractive to suppress message boxes & close with result code + m_bNonInteractive = true; + } + else if (param == _T("noprefs")) + { + // -noprefs means do not load or remember options (preferences) + // Turn off serializing to registry. + GetOptionsMgr()->SetSerializing(false); + // Load all default settings. + theApp.ResetOptions(); + } + else if (param == _T("minimize")) + { + // -minimize means minimize the main window. + m_nCmdShow = SW_MINIMIZE; + } + else if (param == _T("maximize")) + { + // -maximize means maximize the main window. + m_nCmdShow = SW_MAXIMIZE; + } + else if (param == _T("prediffer")) + { + // Get prediffer if specified (otherwise prediffer will be blank, which is default) + q = EatParam(q, m_sPreDiffer); + } + else if (param == _T("wl")) + { + // -wl to open left path as read-only + m_dwLeftFlags |= FFILEOPEN_READONLY; + } + else if (param == _T("wr")) + { + // -wr to open right path as read-only + m_dwRightFlags |= FFILEOPEN_READONLY; + } + else if (param == _T("ul")) + { + // -ul to not add left path to MRU + m_dwLeftFlags |= FFILEOPEN_NOMRU; + } + else if (param == _T("ur")) + { + // -ur to not add right path to MRU + m_dwRightFlags |= FFILEOPEN_NOMRU; + } + else if (param == _T("u") || param == _T("ub")) + { + // -u or -ub (deprecated) to add neither right nor left path to MRU + m_dwLeftFlags |= FFILEOPEN_NOMRU; + m_dwRightFlags |= FFILEOPEN_NOMRU; + } + else if (param == _T("x")) + { + // -x to close application if files are identical. + m_bExitIfNoDiff = true; + } + else if (param == _T("ignorews")) + { + q = SetOption(q, OPT_CMP_IGNORE_WHITESPACE); + } + else if (param == _T("ignoreblanklines")) + { + q = SetOption(q, OPT_CMP_IGNORE_BLANKLINES); + } + else if (param == _T("ignorecase")) + { + q = SetOption(q, OPT_CMP_IGNORE_CASE); + } + else if (param == _T("ignoreeol")) + { + q = SetOption(q, OPT_CMP_IGNORE_EOL); + } + } + if (m_bShowUsage) + { + m_bNonInteractive = false; + } +} - m_pCmdLineParser->ParseParam(pszParam, bFlag, bLast); +/** + * @brief Destructor. + */ +MergeCmdLineInfo::~MergeCmdLineInfo() +{ } diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h index 680067d04c7..6fb6c8ee33a 100644 --- a/Src/MergeCmdLineInfo.h +++ b/Src/MergeCmdLineInfo.h @@ -32,21 +32,17 @@ // ID line follows -- this is updated by SVN // $Id$ -class CmdLineParser; - /** * @brief WinMerge's command line handler. * This class calls command line parser(s) and allows reading parsed values * from public member variables. */ -class MergeCmdLineInfo : public CCommandLineInfo +class MergeCmdLineInfo { public: - MergeCmdLineInfo(const TCHAR *szExeName); + MergeCmdLineInfo(LPCTSTR); ~MergeCmdLineInfo(); - virtual void ParseParam(const TCHAR* pszParam, BOOL bFlag, BOOL bLast); - public: int m_nCmdShow; /**< Initial state of the application's window. */ @@ -56,32 +52,29 @@ class MergeCmdLineInfo : public CCommandLineInfo bool m_bExitIfNoDiff; /**< Exit after telling the user that files are identical. */ bool m_bRecurse; /**< Include sub folder in directories compare. */ bool m_bNonInteractive; /**< Suppress user's notifications. */ - bool m_bNoPrefs; /**< Do not load or remember preferences. */ bool m_bSingleInstance; /**< Allow only one instance of WinMerge executable. */ bool m_bShowUsage; /**< Show a brief reminder to command line arguments. */ DWORD m_dwLeftFlags; /**< Left side file's behavior options. */ DWORD m_dwRightFlags; /**< Right side file's behavior options. */ - CString m_sLeftDesc; /**< Left side file's description. */ - CString m_sRightDesc; /**< Right side file's description. */ - - CString m_sFileFilter; /**< File filter mask. */ - CString m_sPreDiffer; /**< Pre-differ name. */ + String m_sLeftDesc; /**< Left side file's description. */ + String m_sRightDesc; /**< Right side file's description. */ - /** Command line arguments which are mapped to WinMerge's preferences. */ - CMapStringToString m_Settings; + String m_sFileFilter; /**< File filter mask. */ + String m_sPreDiffer; /**< Pre-differ name. */ - CStringArray m_Files; /**< Files (or directories) to compare. */ - - int m_nFiles; /**< Number of files (or directories) in m_Files. */ + std::vector m_Files; /**< Files (or directories) to compare. */ private: + static LPCTSTR EatParam(LPCTSTR, String &, bool *flag = 0); + static LPCTSTR SetOption(LPCTSTR, LPCTSTR key, LPCTSTR value = _T("1")); + void ParseClearCaseCmdLine(LPCTSTR); + void ParseWinMergeCmdLine(LPCTSTR); + /** Operator= is not implemented. */ MergeCmdLineInfo& operator=(const MergeCmdLineInfo& rhs); - - CmdLineParser *m_pCmdLineParser; /**< The command line parser instance. */ }; #endif // _MERGE_CMD_LINE_INFO_INCLUDED_ From 07349e4b75b975d2c731576912c5b79ad95f02f2 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 5 Sep 2008 16:51:39 +0000 Subject: [PATCH 099/168] PATCH: [ 2091055 ] Doc edit: Filters.xml Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Configuration.xml | 4 +-- Docs/Users/Manual/Open_paths.xml | 52 ++++++++++++----------------- Docs/Users/Manual/Quick_start.xml | 51 ++++++++++++++++------------ 3 files changed, 52 insertions(+), 55 deletions(-) diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index aeb2c991004..58cac1ae10d 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -1125,7 +1125,7 @@ (default): Files and folders that you - deletein a Folder Compare window are moved to the Recycle Bin, if it + delete in a Folder Compare window are moved to the Recycle Bin, if it is available. @@ -1265,7 +1265,7 @@
      Filter Folder<indexterm> - <primary>filtering, folder used</primary> + <primary> Filter folders, specifying default private folder</primary> </indexterm> Use this field to specify your own private folder for file filters. diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index bfa6a608004..8d27802ca16 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -68,43 +68,33 @@
      -
      - Selecting filters +
      + Specifying filters - The third edit field in the Select Files or Folders dialog, - Filter, enables you to restrict the files that are - included in a folder compare. You can specify a list of file extensions to - include, or a file filter. A list is one or more extensions separated by - spaces, commas, colons or semicolons, using this syntax: + The Filter edit field enables you to restrict + the files to be included in your folder compare. You can specify one or + more file masks, or a single file filter (not both). - *.[extension][delimiter *.extension ...] + A mask is a simple expression based on file extensions. For example, + this list of file masks includes only files with the specified extensions; + all others are excluded from the selection when the compare operation + starts: - - Extension list + *.h;*.cpp *.txt,*.ini - *.h;*.cpp *.txt,*.ini - + File masks are practical for simple filtering; for more advanced + selecting, use filter files. Filter files are collections of regular + expressions that can either include or exclude files. WinMerge installs a + number of predefined filter files in its Filters + folder, and you can create your own, too. - - *. (star, dot and no extension) selects files - without any extension, for example "README". - + To specify a filter, click the Select button + next to the Filters field to choose from a list of + available filters. Or, click the Filter drop-down list and choose a + recently-used filter file. - A file extension list can be used only for simple selections; for - more advanced selecting, use file filters. Different extensions can be - separated by spaces, commas, colons, or semicolons. - - You can also enter a file filter name in the - Filter field. The easiest way is to click - Select and use the Filters dialog to select a file - filter. You can also create, edit, and delete filter files using the - Filters dialog. - - - If the specified filter cannot be found or if the extension list - is not valid, WinMerge selects all files (that is, it uses uses the - default *.* extension list). - + For full information about filter masks and filter files, see .
      diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index fce3c952b0b..5ac07836a2a 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -25,15 +25,7 @@ - Double-click the - - - - - - WinMerge desktop shortcut - - WinMerge desktop shortcut. + Double-click the WinMerge desktop shortcut. @@ -173,30 +165,45 @@ If you are comparing folders, you can use the Filter field to eliminate some files from the operation. The field specifies a subset of files in the selected paths - that are to be included; all unspecified files are excluded. There are - two methods of filtering: + that are to be included; all unspecified files are excluded. + + You can enter file masks to filter files with certain extensions. + For example, this expression includes only C and C++ source files; all + other file types are eliminated from your selection. + + *.cpp;*.hpp;*.c;*.h + + For more robust filtering, enter a filter file instead of file + masks: click the Select button next to the + Filters field to choose from a list of available + filters. File filters contain any number of rules to either include or + exclude files. WinMerge installs a set of filter files, which you can + edit or augment with your own files. + + See for full details about file masks + and filter files. + From 895e89b5beb053644e4242ebde58b1304c3c30eb Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 5 Sep 2008 16:58:24 +0000 Subject: [PATCH 100/168] PATCH: [ 2093796 ] Manual: WinMerge version is 2.10 --HG-- branch : R2_10 --- Docs/Users/Manual/replaceables.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/Users/Manual/replaceables.xml b/Docs/Users/Manual/replaceables.xml index db10b3c0d2a..e65bdbfb2c5 100644 --- a/Docs/Users/Manual/replaceables.xml +++ b/Docs/Users/Manual/replaceables.xml @@ -15,13 +15,13 @@ Current version (minor) - 2.8.6 + 2.10.0 Current version (major) - 2.8 + 2.10 From a77eb56363760a8381c2ada7cc1df1edebbde169 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 6 Sep 2008 07:07:13 +0000 Subject: [PATCH 101/168] Changelog: Improved command line handling (#2081779) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 5835cb8364f..98e4a324888 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 RC Add icon for "Plugins->List" menu item (#2060771) Use external editor to edit plugins (#2082774) + Improved command line handling (#2081779) Plugins: Show processing instructions in XML plugin (#1979321) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) From 50af8ed6399c6ed9883742de4010ee021dcd12c2 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 6 Sep 2008 07:14:09 +0000 Subject: [PATCH 102/168] PATCH: [ 2095854 ] Manual: Add Denis Bradford as author --HG-- branch : R2_10 --- Docs/Users/Manual/WinMerge_help.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 09a34c51ca9..7328a2012aa 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -49,6 +49,12 @@ Kimmo + + Bradford + + Denis + + Grimm From c627341ded5e91404c3a0f8dbbd692bbe42079cd Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 7 Sep 2008 09:51:05 +0000 Subject: [PATCH 103/168] Fixed wrong translation. --HG-- branch : R2_10 --- Src/Languages/Japanese.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Languages/Japanese.po b/Src/Languages/Japanese.po index 9b2547def01..8e648707520 100644 --- a/Src/Languages/Japanese.po +++ b/Src/Languages/Japanese.po @@ -823,12 +823,12 @@ msgstr " #: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" -msgstr "ɃRs[Ďɐi(&T)\tAlt+Ctrl+Left" +msgstr "EɃRs[Ďɐi(&O)\tAlt+Ctrl+Right" #: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" -msgstr "EɃRs[Ďɐi(&O)\tAlt+Ctrl+Right" +msgstr "ɃRs[Ďɐi(&T)\tAlt+Ctrl+Left" #: Merge.rc:439 #, c-format From 957d9e569e6fa55ebae1c33d124f8c807b960339 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 7 Sep 2008 16:06:38 +0000 Subject: [PATCH 104/168] BUG: [ 2098626 ] Displays a blank time when last modified time is 00:00:00 --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/locality.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 98e4a324888..ee16e5a49a4 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -15,6 +15,8 @@ WinMerge 2.10 RC BugFix: Highlight ShowUnInstDetails keyword for NSIS files (#2084879) BugFix: Could not reset EOL ignore after selecting it from query dialog (#2056741) + BugFix: Displayed a blank time when file last modified time is 00:00:00 + (#2098626) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Src/locality.cpp b/Src/locality.cpp index 2d6725bb47b..d4484f102e8 100644 --- a/Src/locality.cpp +++ b/Src/locality.cpp @@ -143,11 +143,13 @@ String TimeString(const __int64 * tim) return String(); if (odt.GetStatus() == COleDateTime::invalid) return theApp.LoadString(AFX_IDS_INVALID_DATETIME); - COleVariant var; - // Don't need to trap error. Should not fail due to type mismatch - AfxCheckError(VarBstrFromDate(odt.m_dt, LANG_USER_DEFAULT, 0, &V_BSTR(&var))); - var.vt = VT_BSTR; - return OLE2CT(V_BSTR(&var)); + SYSTEMTIME sysTime; + odt.GetAsSystemTime(sysTime); + TCHAR buff[128]; + int len = GetDateFormat(LOCALE_USER_DEFAULT, LOCALE_NOUSEROVERRIDE, &sysTime, NULL, buff, countof(buff)); + buff[len - 1] = ' '; + GetTimeFormat(LOCALE_USER_DEFAULT, LOCALE_NOUSEROVERRIDE, &sysTime, NULL, buff + len, countof(buff) - len - 1); + return buff; } }; // namespace locality From 245b2dc2acf9593a8793a7fd8a475271ae0273fa Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 7 Sep 2008 17:16:01 +0000 Subject: [PATCH 105/168] Changelog: fix line about editing filters with external editor --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index ee16e5a49a4..ba4af8c83eb 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,7 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 RC Add icon for "Plugins->List" menu item (#2060771) - Use external editor to edit plugins (#2082774) + Use external editor to edit file filters (#2082774) Improved command line handling (#2081779) Plugins: Show processing instructions in XML plugin (#1979321) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) From 202f7b19afcb6fb4abc301fd20c87a65304a2041 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 7 Sep 2008 22:25:05 +0000 Subject: [PATCH 106/168] PATCH: [ 2081779 ] Revised command line processing (2) - Fixed the bug related to plug-in. --HG-- branch : R2_10 --- Src/MainFrm.cpp | 14 ++++++++++++-- Src/MainFrm.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 69e3c570cd0..11d768eb6d6 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -201,6 +201,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd) ON_COMMAND(ID_VIEW_RESIZE_PANES, OnResizePanes) ON_COMMAND(ID_FILE_OPENPROJECT, OnFileOpenproject) ON_MESSAGE(WM_COPYDATA, OnCopyData) + ON_MESSAGE(WM_USER, OnUser) ON_COMMAND(ID_WINDOW_CLOSEALL, OnWindowCloseAll) ON_UPDATE_COMMAND_UI(ID_WINDOW_CLOSEALL, OnUpdateWindowCloseAll) ON_COMMAND(ID_FILE_SAVEPROJECT, OnSaveProject) @@ -2769,13 +2770,22 @@ void CMainFrame::OnFileOpenproject() LRESULT CMainFrame::OnCopyData(WPARAM wParam, LPARAM lParam) { COPYDATASTRUCT *pCopyData = (COPYDATASTRUCT*)lParam; - LPCTSTR pchData = (LPCTSTR)pCopyData->lpData; // Bail out if data isn't zero-terminated DWORD cchData = pCopyData->cbData / sizeof(TCHAR); - if (cchData == 0 || pchData[cchData - 1] != _T('\0')) + if (cchData == 0 || ((LPCTSTR)(pCopyData->lpData))[cchData - 1] != _T('\0')) return FALSE; + LPTSTR pchData = new TCHAR[cchData]; + memcpy(pchData, pCopyData->lpData, pCopyData->cbData); + PostMessage(WM_USER, (WPARAM)pchData, (LPARAM)0); + return TRUE; +} + +LRESULT CMainFrame::OnUser(WPARAM wParam, LPARAM lParam) +{ + LPCTSTR pchData = (LPCTSTR)wParam; MergeCmdLineInfo cmdInfo = pchData; theApp.ParseArgsAndDoOpen(cmdInfo, this); + delete pchData; return TRUE; } diff --git a/Src/MainFrm.h b/Src/MainFrm.h index c7f1794c189..a9ee5c2aaee 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -318,6 +318,7 @@ class CMainFrame : public CMDIFrameWnd afx_msg void OnResizePanes(); afx_msg void OnFileOpenproject(); afx_msg LRESULT OnCopyData(WPARAM wParam, LPARAM lParam); + afx_msg LRESULT OnUser(WPARAM wParam, LPARAM lParam); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnWindowCloseAll(); afx_msg void OnUpdateWindowCloseAll(CCmdUI* pCmdUI); From d5503961c7fd6501e802cfd132a34e9b5b1659fe Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 8 Sep 2008 16:02:49 +0000 Subject: [PATCH 107/168] PATCH: [ 2099169 ] Update css for HTML Help Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/build/build_htmlhelp.bat | 2 +- Docs/Users/Manual/css/help.css | 127 +-------------------- 2 files changed, 4 insertions(+), 125 deletions(-) diff --git a/Docs/Users/Manual/build/build_htmlhelp.bat b/Docs/Users/Manual/build/build_htmlhelp.bat index 1126f3cf9da..4d8fd4b316b 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.bat +++ b/Docs/Users/Manual/build/build_htmlhelp.bat @@ -25,7 +25,7 @@ copy "..\art\*.*" "%docbook_outputdir%\art\." echo Copy stylesheets... if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" -copy "..\css\help.css" "%docbook_outputdir%\css\help.css" +copy "..\css\*.css" "%docbook_outputdir%\css\." echo Create HTML files... %docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ diff --git a/Docs/Users/Manual/css/help.css b/Docs/Users/Manual/css/help.css index 79e5666727b..dcbe34924a1 100644 --- a/Docs/Users/Manual/css/help.css +++ b/Docs/Users/Manual/css/help.css @@ -1,125 +1,4 @@ -body,th,td { - font-family: Verdana,Helvetica,Arial,sans-serif; - font-size: 80%; -} +@import url("all.css") screen; +@import url("print.css") print; -pre,code,tt { - font-family: "Courier New",Courier,monospace; - font-size: 100%; -} - -ul { - list-style-type: square; -} - -/* Default link style */ -a:link { color:#3366CC; text-decoration:underline; } -a:visited { color:#003399; text-decoration:underline; } -a:focus { color:#3366CC; text-decoration:none; } -a:hover { color:#3366CC; text-decoration:none; } -a:active { color:#003399; text-decoration:none; } - -a[name]:hover { color:black; text-decoration:none; } - -.mediaobject { - margin-top: 10px; -} - -.screen { - padding: 5px; - background-color: #EEEEEE; - border-left: 10px solid #CCCCCC; -} - -.caution { - background-color: #FFDDAA; - border: 1px solid olive; -} -.important { - background-color: #FFFFDD; - border: 1px solid olive; -} -.note { - background-color: #DDDDFF; - border: 1px solid blue; -} -.tip { - background-color: #DDFFDD; - border: 1px solid green; -} -.warning { - background-color: #FFDDDD; - border: 1px solid red; -} - -/* Examples */ -.example,.informalexample { - padding-left: 7px; - border-left: 3px solid black; -} - -/* Command synopsis */ -.cmdsynopsis p { - padding: 5px; - color: gray; - background-color: #EEEEEE; - border-left: 10px solid #CCCCCC; -} - -.command,.option,.replaceable { - color: black; -} - -/* GUI elements */ -.guimenu,.guisubmenu,.guimenuitem,.guilabel { - font-style: italic; -} - -/* FAQ */ -.question { - font-weight: bold; -} - -/* tables */ -.table table { - border-collapse: collapse; - border: 1px solid black; -} - -.table th { - padding: 2px; - text-align: left; - color: white; - background: black; - border: 1px solid black; -} - -.table td { - padding: 2px; - border: 1px solid black; -} - -/* variablelist */ -.variablelist dl { - margin-left: 2em; -} -.variablelist dt { - font-weight: bold; -} -.variablelist dd { - margin-left: 2em; -} -.variablelist dd p { - margin-top: 0.5em; -} - -/* authorgroup */ -.authorgroup { - margin-left: 2em; -} -.author h3 { - margin: 0; - margin-bottom: 0.25em; - padding: 0; - font-size: 100%; -} \ No newline at end of file +/* Add any HTML Help specific rules below */ \ No newline at end of file From cfbe31b5505ae1b443c6cfb9dd5335f853741509 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 8 Sep 2008 16:23:58 +0000 Subject: [PATCH 108/168] PATCH: [ 2099303 ] Release notes for 2.10 RC release --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReleaseNotes.html | 53 ++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index ba4af8c83eb..7294ad72d6f 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.10 RC Add icon for "Plugins->List" menu item (#2060771) Use external editor to edit file filters (#2082774) Improved command line handling (#2081779) + Release notes update(#2099303) Plugins: Show processing instructions in XML plugin (#1979321) BugFix: Didn't select word-diff cyclically by pressing F4 key (#1989858) BugFix: Crash when generating a folder comparison report (#2008581) diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html index 682d03b0747..098f4331d32 100644 --- a/Docs/Users/ReleaseNotes.html +++ b/Docs/Users/ReleaseNotes.html @@ -51,36 +51,71 @@ -

      WinMerge 2.9.10 Beta Release Notes

      +

      WinMerge 2.10 Release Candidate Release Notes

       -

      August 2008

      +

      September 2008

      About This Release

      -

      -This is a WinMerge beta release which is meant for preview the current state of -the WinMerge development. This release is not recommended for the production. +

      +This is a release candidate release for 2.10 stable release. This release +contains all the new features that will be in 2.10 version. There are no big +bugs left, and in general this release is safe to test and use.

      Please submit bug reports to our bug-tracker. +

      + +

      What Is New in 2.10 RC?

      +

      +WinMerge 2.10 does not have many new features. Instead many existing features +are improved and optimized. And some long-standing problems are fixed. +

      -

      What Is New in 2.9.10?

      For a complete changelog history, see the ChangeLog.txt file located in the Docs folder under the WinMerge program folder.

      +

      Improved user manual

      +

      +The user manual has been improved a lot. The content has been practically +rewritten. There are more screenshots which visualize the features. There are +more index terms and internal linking. +

      + +

      Improved Command Line handling

      -WinMerge 2.9.x will not have many new features. Instead many existing features -will be improved and optimized. And some long-standing problems will be fixed. +Command Line handling was rewritten and several bugs were fixed in the process. +WinMerge had several long-standing bugs to handle certain kinds of paths and +their combinations. This new implementation fixes these problems.

      +

      Bugs fixed:

      +
        +
      • Crash when generating a folder comparison report
        • +
      • ClearCase checkout/commit dialog translation did not work
        • +
      + +

      Translation updates

      +
        +
      • Brazilian
        • +
      • German
        • +
      • Greek
        • +
      • Japanese
        • +
      • Russian
        • +
      • Swedish
        • +
      + +

      What Is New in 2.9.10 Beta?

      +

      Regular expressions

      Regular expression library (PCRE, http://www.pcre.org/) From 2054bbf8166e7911b991b9844d28ff8915a71758 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 8 Sep 2008 21:03:12 +0000 Subject: [PATCH 109/168] PATCH: [ 2086711 ] Edit text encoding Help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Compare_dirs.xml | 84 ++++++++++++++---------- Docs/Users/Manual/Compare_files.xml | 2 + Docs/Users/Manual/Configuration.xml | 43 +++++++++++-- Docs/Users/Manual/Install.xml | 6 +- Docs/Users/Manual/Text_encoding.xml | 99 ++++++----------------------- Docs/Users/Manual/WinMerge_help.xml | 3 - 6 files changed, 114 insertions(+), 123 deletions(-) diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index 8a68a529c2f..b73ecd8dd73 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -7,6 +7,8 @@ This topic describes how to compare and merge folders using the Folder Compare window. + +

      Starting a folder compare operation @@ -46,41 +48,57 @@ - Recursive mode is useful for detecting and manipulating different - files in an entire folder structure. However, it can be slow if there are - many subfolders and files. + Tips - Nonrecursive mode has the advantage of speed when there are many - subfolders that need not be examined. Also, the display can be easier to - manage because it shows items in only selected folders. - + + + Recursive mode - - Compare by Quick Contents option - - The Quick Contents method for file comparison, - described in , can be useful when you - compare big binary files; and it is automatically used to compare files - bigger than 4 MB. Possible disadvantages are that line filters do not - work, and there is no difference counts information in the Folder Compare - window. This should not matter In most cases, because such large files are - usually binary. - - To use this method, configure it before your compare operation: in - the Compare page of the WinMerge options, click the File Compare - method drop-down menu and choose Quick - Contents. - - - - For advanced users - - You can change the 4 MB file size limit of the Compare by - Quick Contents, for example if you have a lot of very big text - files. To do so, run the Windows regedit command, - navigate to this keyword, and modify its value: HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimitAs - usual, be careful when changing values directly in the registry! - + + Recursive mode is useful for detecting and manipulating + different files in an entire folder structure. However, it can be + slow if there are many subfolders and files. + + Nonrecursive mode has the advantage of speed when there are + many subfolders that need not be examined. Also, the display can be + easier to manage because it shows items in only selected + folders. + + + + + Quick Contents comparisons + + + The Quick Contents method for file + comparison, described in , can be + useful when you compare big binary files; and it is automatically + used to compare files bigger than 4 MB. Possible disadvantages are + that line filters do not work, and there is no difference counts + information in the Folder Compare window. This should not matter In + most cases, because such large files are usually binary. + + To use this method, configure it before your compare + operation: in the Compare page of the WinMerge options, click the + File Compare method drop-down menu and choose + Quick Contents. + + + + + For advanced users + + + You can change the 4 MB file size limit of the + Compare by Quick Contents, for example if you + have a lot of very big text files. To do so, run the Windows + regedit command, navigate to this keyword, and + modify its value: HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimitAs + usual, be careful when editing the registry! + + + +
      Folder Compare Progress window<indexterm> diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index ba673f3522c..0d6604d4652 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -9,6 +9,8 @@ used here, we suggest you read read <xref linkend="IntroductDiffing" /> first.</para> + <xi:include href="Text_encoding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <section id="Compare_files_starting"> <title>Starting a file compare operation diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index 58cac1ae10d..4f6d40b52e9 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -712,7 +712,7 @@
      Filter Comments<indexterm> - <primary>filtering</primary> + <primary>filters</primary> <secondary>comments</secondary> </indexterm> @@ -1265,7 +1265,9 @@
      Filter Folder<indexterm> - <primary> Filter folders, specifying default private folder</primary> + <primary>Filters folders</primary> + + <secondary>specifying default private folder</secondary> </indexterm> Use this field to specify your own private folder for file filters. @@ -1422,9 +1424,40 @@ VCS integration? My installation had an option to integrate with TortoiseSVN.--> options - This page allow you to specify the codepage that WinMerge uses for - ANSI files, and whether the codepage of certain file formats should be - detected from the contents of the files. + This page allows you to specify the codepage that the ANSI version of + WinMerge uses for ANSI files. , and whether the codepage of certain file + formats should be detected from the contents of the files. + + + The ANSI version of WinMerge (WinMerge.exe) is + normally installed only on Windows 9X and WME. On all other, newer Windows + systems, the Unicode version (WinMergeU.exe) is + installed. The Unicode version of WinMerge handles encoding transparently. + You should not need to change any settings in this page unless you are + running the ANSI version. + + + + A full explanation of text encoding and Windows codepages is beyond + the scope of WinMerge documentation. Fortunately, there is lots of + information about them on the Internet. For example, here are some places + to start: + + + + Wikipedia: + Code pages, Character + encoding + + + + Microsoft: + Code Pages Supported by Windows + + +
      Default codepage for ANSI files diff --git a/Docs/Users/Manual/Install.xml b/Docs/Users/Manual/Install.xml index a4ec3b47472..433d7b6b627 100644 --- a/Docs/Users/Manual/Install.xml +++ b/Docs/Users/Manual/Install.xml @@ -71,14 +71,16 @@ shows all the available components. You can modify the default configuration by checking or unchecking components. For example, if you want to use a WinMerge localization for a different language than - English, select the Languages component. + English, select the Languages component. WinMerge core files - WinMerge executable, Help, and other needed files. Cannot be + WinMerge executable (WinMerge.exe on + Windows 9X and WME; WinMergeU.exe on all + other Windows versions), Help, and other needed files. Cannot be unchecked. diff --git a/Docs/Users/Manual/Text_encoding.xml b/Docs/Users/Manual/Text_encoding.xml index d403e6beabc..be232983f0a 100644 --- a/Docs/Users/Manual/Text_encoding.xml +++ b/Docs/Users/Manual/Text_encoding.xml @@ -1,80 +1,19 @@ -
      - Text Encoding (codepages) -
      - Common scenarios - - - Comparing English files coded in ASCII - You may easily use WinMerge.exe. You may also use WinMergeU.exe (if you are on NT/2000/XP/2003), but it will be slower due to encoding conversion. - - - Comparing western European files coded in the common windows codepage - (See FAQ: How do I tell what encoding my file uses) You may easily use WinMerge.exe. You may also use WinMergeU.exe (if you are on NT/2000/XP/2003), but it will be slower due to encoding conversion. - - - Comparing Unicode files - You should use WinMergeU.exe -(if you are on NT/2000/XP/2003) as it will be at least as fast, -and may be faster than WinMerge.exe, in this -scenario. Also, WinMergeU.exe correctly -handles UTF-8 files, unlike WinMerge.exe. -If you are on Win95/98/ME, or if your files are all in English -or a western European language, you may get by with -WinMerge.exe. - - - Comparing multilingual files - You should use WinMergeU.exe (if you are on NT/2000/XP/2003) in order to be able to see the characters from different languages simultaneously. If you are on Win95/98/ME, then you may attempt to view the files in WinMerge.exe, but it is recommended that you do not attempt to merge them. - - - Comparing East Asian files - You should use WinMergeU.exe (if you are on NT/2000/XP/2003) in order to correctly display double-wide characters. See the Font section for font recommendations. If you are on Win95/98/ME, then you may attempt to view the files in WinMerge.exe, but it is recommended that you do not attempt to merge them. - - -
      -
      - Explanation - Characters (such as "a" or "1" or "&") are represented by computers as numbers, and there is more than one way to do this. A text encoding method is a way to encode the characters into the numbers (bytes) of which a file is comprised. There are four main text encoding families: - - - ASCII - Each character is one byte in the file. This is an old encoding which only supports English letters, numbers, and puncuation. - - - Windows codepages - Each character is one byte in the file. These are used by default by versions of the Windows operating system. Examples include: - - - 1252 (windows-1252) Western European (supports many western European languages including English, French, Spanish, and German) - - - 1251 (windows-1251) Cyrillic (supports Cyrillic languages including Russian and Bulgarian) - - - 1250 (windows-1250) Central European (supports central European Latin-scrypt languages including Polish) - - - 1253 (windows-1253) Greek (supports Greek) - - - - - ISO codepages - Each character is one byte in the file. These have names such as "ISO-8859-1". Some windows codepages approximate some of these. Examples include: - - - ISO-8851-1 ("Latin-1") This is approximated by windows-1252 - - - - - UCS-2LE (Microsoft's style of Unicode) - Each character is two bytes in the file. This supports Unicode 2.0, which is most of the characters in the Unicode character set. - - - UTF-8 - Each character may be one, two, three, four, five, or six bytes in the file. This supports the full range of Unicode 3.x. - - -
      -
      + + + + Important note for ANSI WinMerge users + + In the ANSI version of WinMerge (WinMerge.exe) that is typically + installed on older versions of windows, comparisons are set by default to use + the default Windows ANSI codepages on your system - for example, Windows-1252 + on many Western European systems). If the files you are comparing all use this + format, the default settings are fine. + + However, if you plan to compare files with different encodings (for + example, UTF or another Windows codepage), you might need to change the + default codepage settings, as described in . If you are running the Unicode version of + WinMerge (WinMergeU.exe), comparisons handle different encodings + transparently, and so codepage settings do not affect you. + \ No newline at end of file diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 7328a2012aa..cd0dca62a60 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -10,7 +10,6 @@ - @@ -103,8 +102,6 @@ &Configuration; - &TextEncoding; - &Locales; &Plugins; From 8d949d85d90cce3a72cbc2cd8b55733d4f2aa57c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 9 Sep 2008 13:50:30 +0000 Subject: [PATCH 110/168] WinMerge 2.10 RC release (SVN revision 5933) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 7294ad72d6f..dfd94d1c832 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,7 +3,7 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.10 RC +WinMerge 2.10 RC - 2008-09-09 (r5933) Add icon for "Plugins->List" menu item (#2060771) Use external editor to edit file filters (#2082774) Improved command line handling (#2081779) From d29e2eb3429d4f570782177bcbf4f88246273e6c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 10 Sep 2008 22:20:38 +0000 Subject: [PATCH 111/168] PATCH: [ 2103709 ] Copy edit Command_line Help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Command_line.xml | 313 +++++++++++++++++++---------- 1 file changed, 210 insertions(+), 103 deletions(-) diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml index 70f785ddedb..401e4cf40dd 100644 --- a/Docs/Users/Manual/Command_line.xml +++ b/Docs/Users/Manual/Command_line.xml @@ -1,17 +1,28 @@
      - <indexterm> - <primary>Command line</primary> - </indexterm>Command Line + Command line<indexterm> + <primary>command line</primary> - <para>WinMerge accepts several parameters from command line, in addition to + <secondary>syntax</secondary> + </indexterm><indexterm> + <primary>WinMerge command line</primary> + </indexterm> + + The WinMerge command line accepts several parameters in addition to the paths to compare. Most of these parameters are intended for using WinMerge as - an external compare application. Or for starting from batch files. + an external compare application or starting a compare operation from a batch + file. - Syntax for the command line is: + Use one of these formats for the WinMerge command: - WinMerge + WinMergeU + + + + + + WinMergeU @@ -54,155 +65,251 @@ rep="norepeat">outputpath - All parameters start with "/" or with "-" prefix character. Pathnames - don't have any prefix character. + + WinMergeU + + conflictfile + + + The command has two forms: + + + + WinMergeU + + + Use WinMergeU if you are running the Unicode + version of WinMerge, typically installed on recent Windows + systems. + + + + + WinMerge + + + Use WinMerge only if you are running the ANSI + version of WinMerge, typically installed only on Windows + 9x and WME systems. + + + + + Entering the command with no parameters or pathnames simply opens the + WinMerge window. Parameters are prefixed with either a forward slash ( + / ) or dash ( - ) character. Pathnames + have no prefix character. - opens this help. + opens WinMerge Help at this topic. + + + + + recursive folder compare + + + compares all files in all subfolders (recursive + compare). Unique folders (occurring only on one side) are listed in the + compare result as separate items. Note that including subfolders can + increase compare time significantly. Without this parameter, WinMerge + lists only files and subfolders at the top level of the two target + folders. It does not compare the subfolders. - tells WinMerge to compare folders recursively - . Normally WinMerge does not compare subfolder contents but does the - "flat" compare showing the files in compared folders and subfolders as - separate items. Using /r tells WinMerge to compare all files in all - subfolders. When subfolders are included, only unique subfolders are - visible as separate items in compare results. Note that including - subfolders can increase compare time remarkably. + + WinMerge window + + closing + + + enables you to close WinMerge with a single + Esc key press. This is useful when you use WinMerge as an + external compare application: you can close WinMerge quickly, like a + dialog. Without this parameter, you might have to press + Esc multiple times to close all its windows. - allows WinMerge to be closed with a single - Esc keypress. This is useful when using WinMerge as an - external compare application. WinMerge can act like an dialog which is - easy and fast to close. + + filters + + applying + + + applies a specified filter to restrict the + comparison. The filter can be a filemask like *.h + *.cpp, or the name of a file filter like + XML/HTML Devel. Add quotation marks around a filter + mask or name that contains spaces. - allows selecting filter used. Filter can be - filemask like "*.h *.cpp" or name of filefilter like - "XML/HTML Devel". Quotation marks must be used if - filter mask or name contains spaces. + closes WinMerge (after displaying an information + dialog) when you start a comparison of identical files. The parameter has + no effect after the comparison, for example if the files become identical + as a result of merging or editing. This parameter is useful when you use + WinMerge as an external compare application, or when you want to eliminate + unnecessary steps by ignoring files that don't have any + differences. - closes WinMerge if opened files are identical - (after information dialog is shown). This parameter is useful when - WinMerge is used as an external compare application. It helps to faster - process and/or ignore files which don't have any differences. Note that - this option does not apply when files become identical when - merging/editing them. + + WinMerge window + + limiting instances + + + limits WinMerge windows to a single instance. + For example, if WinMerge is already running, a new compare opens in the + same instance. Without this parameter, multiple windows are allowed: + depending on other settings, a new compare might open in the existing + window or in a new window. - enables single-instance behavior. If there is - already WinMerge running new compare is opened to that same instance. - Depending on other settings (if multiple windows are allowed) new compare - is opened to existing or new window. + + MRU list + + + prevents WinMerge from adding the left path to + the Most Recently Used (MRU) list. External applications should not add + paths to the MRU list in the Select Files or Folders dialog. - tells WinMerge to not add left path to MRU. - External applications should not add paths to Open-dialog's MRU - lists. + prevents WinMerge from adding the right path to + the Most Recently Used (MRU) list. External applications should not add + paths to the MRU list in the Select Files or Folders dialog. - tells WinMerge to not add right path to MRU. - External applications should not add paths to Open-dialog's MRU - lists. + prevents WinMerge from adding either path (left + or right) to the Most Recently Used (MRU) list. External applications + should not add paths to the MRU list in the Select Files or Folders + dialog. - (or ) tells WinMerge to - not add both paths to MRU. External applications should not add paths to - Open-dialog's MRU lists. + + protecting files + + + opens the left side as read-only. Use this when + you don't want to change left side items in the compare. - initially opens left side as read-only. Use - this when you don't want to change left-side items in compare. + opens the right side as read-only. Use this + when you don't want to change right side items in the compare. - initially opens right side as read-only. Use - this when you don't want to change right-side items in compare. + + WinMerge window + + opening minimized or maximized + + + starts WinMerge as a minimized window. + This option can be useful during lengthy compares. - starts WinMerge as minimized. This - option can be used to start WinMerge minimized for lengthy - compares. + starts WinMerge as a maximized + window. - starts WinMerge as - maximized. + specifies a description in the left side title + bar, overriding the default folder or filename text. For example: + /dl "Version 1.0" or /dl + WorkingCopy. Use quotation marks around descriptions that + contain spaces. - adds a description for left side shown - instead of folder / filename. This allows showing version number or label - for compared items. Like "Version 1.0" or "Work Copy". + specifies a description in the right side title + bar, just like . - adds a description for right side shown - instead of folder / filename. This allows showing version number or label - for compared items. Like "Version 1.0" or "Work Copy". + specifies the + folder, file, or project file to open on the left side. - leftpath is the folder or filename to - open on the left side. + specifies the + folder, file, or project file to open on the right side. + + WinMerge cannot compare files to folders, so both path parameters + ( and + ) must point to the + same target type (either folders or files). If WinMerge cannot find either + of the specified paths, it opens the Select Files or Folders dialog, where + you can browse for the correct paths. + + + In file comparisons, you can specify a folder name in one of the + path parameters, as long as the folder contains a file with the same + name as the one specified in the other, file path. + + For example, consider this command: + + WinMergeU C:\Folder\File.txt + C:\Folder2 + + If C:\Folder2 contains a + file named File.txt: WinMerge implicitly resolves + the second path as a file specification, and compares the two files. Of + course, the command is invalid if C:\Folder2 does not + contain a file named File.txt. + - rightpath is the folder or filename to - open on the right side. + + merging differences + + result file + + + Specifies an + optional output folder where you want merged result files to be + saved. + + The third, output path is rarely needed when you start WinMerge from + the command line. It is meant to be used with version control tools, where + you might need to specify a third path for the + result file. If you specify a third path, + WinMerge still shows only two files in the File Compare window. However, + if you save either of these files, it is written to the third path, + leaving the two source files intact. + + Version control systems typically refer to the source and result + files using terms like theirs, + mine, and either merged or + resolved. If you specify a third path on the + WinMerge command line, and are working with a version control system, you + should list the files in that order. - outputpath is an optional output - folder where you want merged files to be saved. + + conflict files + + + Specifies a + conflict file, typically generated by a Version control system. The + conflict file opens in the File Compare window, where you can merge and + resolve conflicts, as described in . Note that no other paths can be used + with a conflict file. - - - WinMerge accepts filename and folder name as path parameters, as - long as the given folder contains file with same name than in first - parameter. - - For example, one can give a command: WinMerge - C:\Folder\File.txt C:\Folder2. If C:\Folder2 contains file named - File.txt WinMerge now compares files - C:\Folder\File.txt and C:\Folder2\File.txt - Usually WinMerge requires that both path parameters - (leftpath and rightpath) - point to folders or files. It is not possible to compare folder to file - (except in case described in above note). If WinMerge cannot find any of given - paths, it opens Open-dialog. - - Third path given in command line is rarely needed when WinMerge is - started from command line. It is meant to be used with many version control - tools which use third path as a "result" file. WinMerge - always shows two files in file compare, the third path is a path where any of - these files gets saved into, leaving other two paths intact. - - Usually these tools use terms like "theirs", - "mine" and "merged "/ " - resolved" about these three files. And those paths should - be given in that order for WinMerge. - -
      - Conflict File - - Conflict file can be given to command line as one path to the conflict - file. There cannot be second or third path with conflict file. After - WinMerge opens the given conflict file, it can be resolved like described in - . -
      -
      + \ No newline at end of file From de140e32f67a5ea5f1031e5d22ecd3454d5b2f32 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 13 Sep 2008 09:01:25 +0000 Subject: [PATCH 112/168] PATCH: [ 2105596 ] Edit Version_control Help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Version_control.xml | 247 ++++++++++++++++++++------ 1 file changed, 191 insertions(+), 56 deletions(-) diff --git a/Docs/Users/Manual/Version_control.xml b/Docs/Users/Manual/Version_control.xml index a75348b690c..563d3ca5a1a 100644 --- a/Docs/Users/Manual/Version_control.xml +++ b/Docs/Users/Manual/Version_control.xml @@ -1,100 +1,235 @@
      - Version control integration + Version control integration<indexterm> + <primary>version control systems</primary> - <para>WinMerge provides basic integration with Visual SourceSafe and - ClearCase version control systems. Integration means WinMerge checkouts file - edited from version control. User can later checkin changed file with - version control system's tools. WinMerge does not provide history or checkin - tools.</para> + <secondary>integration with</secondary> + </indexterm><indexterm> + <primary>integration</primary> - <para>Version control support relies on fact that files in version control - system are read-only in local disk. So if local file is read-only and - version control integration is enabled WinMerge assumes file is version - controlled and shows checkout dialog.</para> + <secondary>with version control systems</secondary> + </indexterm> -
      - Visual SourceSafe + WinMerge provides optional, basic integration with some version control + system (VCS) tools. By default, WinMerge is not integrated with any version + control system. You can configure VCS integration both during and after + installing WinMerge: - To enable Visual SourceSafe integration for version controlled - directory: + If the WinMerge installer detects whether TortoiseSVN, TortoiseCVS, or + Rational ClearCase are present on your system, the Setup Additional Tasks page + contains options to enable any of the WinMerge integrations. + + After installation, you can open the Options dialog and configure either + the ClearCase or Visual SourceSafe integration, as described in . + + + Only the ClearCase integration can be configured using both methods. + You can configure TortoiseSVN and TortoiseCVS only during installation; + conversely, you can configure Visual SourceSafe (which is not detected by + the installer) only in the Options dialog. + + + Each WinMerge version control integration has one of these basic types + of interaction: + + + + WinMerge launches VCS file checkout - - Enable Visual SourceSafe integration from - Edit + With version control systems that lock files (ClearCase and Visual + Source Safe), WinMerge opens the VCS's checkout dialog before saving a + file. It is up to you to check out the file, and then to check in the + file later using the version control system's tools. WinMerge does not + provide checkin or history tools. + + - Options + + VCS use WinMerge as its diff tool - Versioning System - + + When you start a diff operation using TortoiseSVN and TortoiseCVS, + the integration opens WinMerge instead of the native VCS diff + utility. + + + + + TortoiseSVN integration<indexterm> + <primary>TortoiseSVN integration</primary> + </indexterm> + + TortoiseSVN is a Windows client for Subversion (SVN), an open source + version control system. TortoiseSVN provides its own diff utility. The + WinMerge integration with this VCS enables you to use WinMerge to compare + files instead of the TortoiseSVN diff tool. + One of the main uses of TortoiseSVN's diff is to see the most recent + changes to a file that is under version control: that is, a file that you + have checked out into a working copy. The following procedure illustrates + such an operation using the WinMerge integration with TortoiseSVN. The + integration with TortoiseCVS is similar. + + - Open version controlled file/directory to WinMerge + In Windows Explorer, navigate to a Subversion working copy that + you have checked out. - Edit version controlled file + Right-click a file that is under Subversion management (usually + indicated by a distinct TortoiseSVN icon), and click + TortoiseSVN in the context menu. + + + + If the file has not been modified, the context menu contains + the shortcut, Diff with previous version. + This command compares the checked-out version of the file with the + previous version that was checked in to the repository. + + + + If you have modified the file, the context menu contains the + same Diff with previous version shortcut, + plus the Diff shortcut. This command + compares your revision to the current version (the one you checked + out). It is useful for reviewing the changes you have made. + + - Save changes - now WinMerge detects file is read-only and - assumes it is under version control. WinMerge shows following - dialog: + Choose either the Diff with previous + version or Diff shortcut. The + WinMerge window opens, with the target file versions loaded In the File + Compare window. - - - - - + The + TortoiseSVN - WinMerge searches for SourceSafe databases from system and fills - them to first dropdown list in dialog. So you first have to select right - database if there are more than one databases in your system. + Diff + shortcut is available for comparing any two files in your + file system, not just files that are managed by Subversion. To illustrate + how the WinMerge integration works in this case: - Project path is file path relative to SourceSafe database base path. - Be careful with this since most errors are because of wrong project path. - Keep in mind that when you change folder you have to change project path - too! + + + In Windows explorer, hold Ctrl, select any two + files, and right-click. + - WinMerge remembers password for current session, but does not store - it. So you don't need to retype password again in same session. But after - closing WinMerge you have to retype password. This is to keep your - password safe! + + Choose + TortoiseSVN + + Diff + in the context menu. - Apply to all items -checkbox allows to checkout several files when - copying files in directory compare. All files must reside in same - directory to use this feature. + The WinMerge window opens, with the selected files loaded In the + File Compare window. + + + + + + Visual Source Safe integration<indexterm> + <primary>Visual SourceSafe integration</primary> + </indexterm> + + This example demonstrates the file checkout type of VCS + integration. + + + + Launch a WinMerge file or folder comparison whose left or right + target is under version control + + + + In WinMerge, edit a version-controlled file + + + + Save your changes. WinMerge detects that the file is read-only, + and assumes that it is under Visual Source Safe version control. + WinMerge opens a Visual Source Save dialog, like this: + + + + + + + + + + In the Database dropdown list, choose the + correct Visual SourceSafe database if there is more than one on your + system. + + + + The Project field shows the selected file's + location relative to the Visual SourceSafe database path. Verify that + the path is correct: most errors are caused by the wrong project path. + If you change folders, remember to change the project path, too! + + + + Enter your password if required. WinMerge remembers your password + for the current session, but for your security does not store it. + Therefore, you don't need to retype the password during a session, but + you must retype the password each time you open WinMerge. + + + + Optionally, enable one or both of these options: + + + + Link to Destination VSS project + + + + Apply to all items. This option enables + you to check out multiple files in a single directory when you copy + files in a folder compare operation. + + + + - Unfortunately, VSS is horribly silent about error conditions (other - than the fact that one occurred). If an operation fails, one of the - following conditions could be at fault: + Unfortunately, VSS provides very little information about error + conditions beyond the fact that they occurr. If an operation fails, causes + might include any of the following conditions: - Another user may have the file checked out with exclusive - access + Another user might have the file checked out with exclusive + access. - You may have specified the wrong project + You might have specified the wrong project. - You may have entered the project name incorrectly + You might have entered the project name incorrectly. - Did you use VSS path syntax (ie: - $/MyProject/res) + You might not have used a valid VSS path (for example, this is + incorrect: $/MyProject/res). - Your connection to the VSS server computer may be hosed + Your connection to the VSS server computer might be broken. -
      -
      + + \ No newline at end of file From 429c3afb99f396960e3a12abc54933360dd1eba6 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 13 Sep 2008 20:40:10 +0000 Subject: [PATCH 113/168] PATCH: [ 2108847 ] Edit of Shortcut_keys Help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Shortcut_keys.xml | 51 +++++++++++++++-------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/Docs/Users/Manual/Shortcut_keys.xml b/Docs/Users/Manual/Shortcut_keys.xml index d084a640f0b..e156bb95e10 100644 --- a/Docs/Users/Manual/Shortcut_keys.xml +++ b/Docs/Users/Manual/Shortcut_keys.xml @@ -1,9 +1,11 @@ - Shortcut keys + Shortcut keys<indexterm> + <primary>shortcut keys</primary> + </indexterm> - Most common shortcut keys familiar from other Windows applications - work in WinMerge. + WinMerge includes most of the familiar shortcut keys commonly used in + other Windows applications. Folder compare @@ -11,7 +13,7 @@ - Key + Keys Function @@ -21,14 +23,14 @@ Enter - Open selected item (if folder, open it) + Open selected file or folder Backspace - Open parent folder if possible (only available when - subfolders are not included in compare) + Open parent folder if possible (available only when subfolders + are not included in compare) @@ -44,7 +46,7 @@ Home - Go to first different file/folder + Go to first different file or folder @@ -54,7 +56,7 @@ End - Go to last different file/folder + Go to last different file or folder @@ -64,8 +66,7 @@ Enter - Go to currently selected item (if scrolled - off-screen) + Go to currently selected item (if scrolled off-screen) @@ -75,7 +76,7 @@ Up Arrow - Go to previous different file/folder + Go to previous different file or folder @@ -85,7 +86,7 @@ Down Arrow - Go to next different file/folder + Go to next different file or folder @@ -117,7 +118,7 @@ - Key + Keys Function @@ -163,7 +164,7 @@ F9 - Turn Merge mode on/off + Merge Mode on or off (toggle) @@ -205,7 +206,7 @@ - Key + Keys Function @@ -317,7 +318,7 @@ - Key + Keys Function @@ -383,7 +384,7 @@ - Key + Keys Function @@ -397,7 +398,7 @@ F - Find text + Find text (opens Find dialog) @@ -407,13 +408,13 @@ H - Replace text with another text + Replace text (opens Replace dialog) F3 - Find/Replace again. + Find next @@ -423,7 +424,7 @@ F3 - Find/Replace upwards in file + Find previous @@ -457,7 +458,7 @@ - Key + Keys Function @@ -501,7 +502,7 @@ F2 - Clear All Bookmarks + Clear all Bookmarks @@ -713,7 +714,7 @@ - Key + Keys Function From 07f1c2518dcd8c11059d111522300015c3964c51 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 14 Sep 2008 12:47:59 +0000 Subject: [PATCH 114/168] PATCH: [2110218] Customized colors aren't used in some areas. --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/LocationView.cpp | 4 ++++ Src/MergeDiffDetailView.cpp | 8 ++++---- Src/MergeEditView.cpp | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index dfd94d1c832..e0e3b1b2d9f 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -18,6 +18,7 @@ WinMerge 2.10 RC - 2008-09-09 (r5933) dialog (#2056741) BugFix: Displayed a blank time when file last modified time is 00:00:00 (#2098626) + BugFix: Customized colors weren't used in some areas (#2110218) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp index db63c91bd7a..245f1391509 100644 --- a/Src/LocationView.cpp +++ b/Src/LocationView.cpp @@ -40,6 +40,7 @@ #include "MergeLineFlags.h" #include "Bitmap.h" #include "memdc.h" +#include "SyntaxColors.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -303,8 +304,11 @@ void CLocationView::OnDraw(CDC* pDC) // Draw bar outlines CPen* oldObj = (CPen*)dc.SelectStockObject(BLACK_PEN); + CBrush brush(m_view[0]->GetColor(COLORINDEX_WHITESPACE)); + CBrush* oldBrush = (CBrush*)dc.SelectObject(&brush); dc.Rectangle(m_leftBar); dc.Rectangle(m_rightBar); + dc.SelectObject(oldBrush); dc.SelectObject(oldObj); // Iterate the differences list and draw differences as colored blocks. diff --git a/Src/MergeDiffDetailView.cpp b/Src/MergeDiffDetailView.cpp index 27f879f5263..9d9ec6e53f6 100644 --- a/Src/MergeDiffDetailView.cpp +++ b/Src/MergeDiffDetailView.cpp @@ -290,8 +290,8 @@ void CMergeDiffDetailView::GetLineColors2(int nLineIndex, DWORD ignoreFlags, // If no syntax hilighting if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT)) { - crBkgnd = GetSysColor (COLOR_WINDOW); - crText = GetSysColor (COLOR_WINDOWTEXT); + crBkgnd = GetColor (COLORINDEX_BKGND); + crText = GetColor (COLORINDEX_NORMALTEXT); bDrawWhitespace = FALSE; } else @@ -301,8 +301,8 @@ void CMergeDiffDetailView::GetLineColors2(int nLineIndex, DWORD ignoreFlags, } if (nLineIndex < m_lineBegin || nLineIndex > m_lineEnd) { - crBkgnd = GetSysColor (COLOR_WINDOW); - crText = GetSysColor (COLOR_WINDOW); + crBkgnd = GetColor (COLORINDEX_WHITESPACE); + crText = GetColor (COLORINDEX_WHITESPACE); bDrawWhitespace = FALSE; } } diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index ae352c7c67d..da2d898f3e6 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -510,8 +510,8 @@ void CMergeEditView::GetLineColors2(int nLineIndex, DWORD ignoreFlags, COLORREF if (!GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT)) { // If no syntax hilighting, get windows default colors - crBkgnd = GetSysColor (COLOR_WINDOW); - crText = GetSysColor (COLOR_WINDOWTEXT); + crBkgnd = GetColor (COLORINDEX_BKGND); + crText = GetColor (COLORINDEX_NORMALTEXT); bDrawWhitespace = FALSE; } else From faeca1c9aa7f692a17c286c3a15bb71f2fb6b027 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 14 Sep 2008 14:25:53 +0000 Subject: [PATCH 115/168] BUG: [ 2110350 ] Files are extracted into wrong folder --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 5 ++++- Src/Environment.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e0e3b1b2d9f..0c497148682 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,6 +3,10 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.10 + BugFix: Customized colors weren't used in some areas (#2110218) + BugFix: Zip files were extracted into wrong folder (#2110350) + WinMerge 2.10 RC - 2008-09-09 (r5933) Add icon for "Plugins->List" menu item (#2060771) Use external editor to edit file filters (#2082774) @@ -18,7 +22,6 @@ WinMerge 2.10 RC - 2008-09-09 (r5933) dialog (#2056741) BugFix: Displayed a blank time when file last modified time is 00:00:00 (#2098626) - BugFix: Customized colors weren't used in some areas (#2110218) Translation updates: - Brazilian (#2059836) - German (#2045666) diff --git a/Src/Environment.cpp b/Src/Environment.cpp index 88568b9baff..c9521a6847c 100644 --- a/Src/Environment.cpp +++ b/Src/Environment.cpp @@ -45,6 +45,8 @@ LPCTSTR env_GetTempPath(int * pnerr) else { strTempPath = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH); + if (!paths_EndsWithSlash(strTempPath.c_str())) + strTempPath += '\\'; } strTempPath = paths_GetLongPath(strTempPath.c_str()); } From 28996b350d316eaa47712f24a576b621bb6e0c7f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 15 Sep 2008 19:26:07 +0000 Subject: [PATCH 116/168] Change Manual url to http://winmerge.org/docs/manual/ --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Constants.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 0c497148682..a2d6114a55e 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -4,6 +4,7 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 + Change Manual url to http://winmerge.org/docs/manual/ (r5957) BugFix: Customized colors weren't used in some areas (#2110218) BugFix: Zip files were extracted into wrong folder (#2110350) diff --git a/Src/Constants.h b/Src/Constants.h index 357dcd75414..fbff08a2363 100644 --- a/Src/Constants.h +++ b/Src/Constants.h @@ -17,7 +17,7 @@ const TCHAR WinMergeURL[] = _T("http://winmerge.org/"); * @brief URL to help index in internet. * We use internet help when local help file is not found (not installed). */ -const TCHAR DocsURL[] = _T("http://winmerge.org/2.8/manual/index.html"); +const TCHAR DocsURL[] = _T("http://winmerge.org/docs/manual/index.html"); /** @brief URL to translations page in internet. */ const TCHAR TranslationsUrl[] = _T("http://winmerge.org/translations/"); From 5a226954ffd4479aacfed5aaf692c6fc70c40190 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 15 Sep 2008 21:28:57 +0000 Subject: [PATCH 117/168] PATCH: [ 2107529 ] Edit of Faq Help topic, related css tweak docedit-faq-5955.7z Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Faq.xml | 506 +++++++++++++++++++++----------------- 1 file changed, 275 insertions(+), 231 deletions(-) diff --git a/Docs/Users/Manual/Faq.xml b/Docs/Users/Manual/Faq.xml index 34d3b6f6e85..d45f4137b26 100644 --- a/Docs/Users/Manual/Faq.xml +++ b/Docs/Users/Manual/Faq.xml @@ -10,33 +10,49 @@ Why are there two executable files, WinMerge.exe and - WinMergeU.exe? + WinMergeU.exe? + WinMerge executables, Unicode and ANSI + + Unicode + + WinMerge support + + ANSI + + WinMerge support + + They support the different character encoding capabilities of + older and newer versions of Windows. + WinMerge.exe is an ANSI (8-bit) - executable which works in all 32-bit Windows systems. It does not + executable that works in all 32-bit Windows systems. It does not have Unicode support. Internally, it stores only ANSI characters (256 possibilities). If you open a Unicode file, the characters must be - converted to the ANSI codepage. As there are over 100,000 Unicode - characters, and only 256 can be represented in the ANSI codepage, - data loss may occur. Conversion may be approximative (accents are - lost), or impossible (characters appear as "?"). - - WinMerge.exe also can not open files - with names outside the current ANSI codepage (e.g., WinMerge.exe - can not open a file with a Hebrew name, if run on an English - system. WinMergeU.exe can open such files. + converted to the ANSI codepage. Because there are over 100,000 + Unicode characters, and only 256 can be represented in the ANSI + codepage, data loss can occur. Conversion might be approximate + (for example, accents are lost) or impossible: characters are + replaced by question marks ( ? ). + + WinMerge.exe also cannot open files + with names outside the current ANSI codepage. For example, + WinMerge.exe running on an English system cannot open a file with + a Hebrew name. - WinMergeU.exe is a Unicode enabled - executable which works on Windows NT4, Windows 2000, and newer - systems. + WinMergeU.exe is a Unicode-enabled + executable that works on Windows NT4, Windows 2000, and newer + systems. Because it supports Unicode, it has none of the + limitations listed above for + WinMerge.exe. @@ -48,154 +64,192 @@ - From menu, select + In the WinMerge menu, click Edit - Options... - - General - - Disable Splash Screen - + Options + . In the Options window General page, deselect + (uncheck) the option, Disable Splash + Screen. - When wanting to compare folders, I cannot select a folder in - Browse-dialog? + I want to compare folders, but I cannot select a folder in the + Browse dialog. + folders + + selecting in Select Files or Folders dialog + - Browse to the folder you want to compare (folder contents is - shown in the dialog). Do not select any of the files or subfolders, - just select the Open-button when - "Folder Selection" is shown in filename editbox. - If you already selected any of the files or subfolders, just write - some nonsense to the filename editbox and select the Open-button. When - the filename editbox doesn't contain any existing filename then + Browse in the folder contents to the folder you want to compare. + Do not select any of the files or subfolders, just click + Open when Folder Selection + is displayed in the File name field. If you + already selected a files or subfolders, just type a random string in + the File name field and click + Open. If the file name you enter is not found, WinMerge opens the folder. - Does WinMerge support merging three files? Sometimes it is - called 3-way merge, where one file is ancestor. This would be useful - for version control! + Does WinMerge support merging three files (sometimes called + 3-way merge), where one file is the ancestor? + This would be useful for version control! - Unfortunately not. We acknowledge it would be good feature but - have no plans to implement it in near future. This can be somewhat - worked around by using two WinMerge instances. Or using third path - parameter given from command line. See - for more information. + Unfortunately not. We recognize that it would be a good feature, + but have no plans to implement it in near future. You can work around + this limitation somewhat by using two WinMerge instances, or by using + a third path parameter on the command line. See for more information. - Do you have any plans to support other operating systems than + Do you have any plans to support other operating systems besides Windows? - Not currently. If somebody wants to help/work with - cross-platform support (using wxWidgets for example) we are + Not currently. If somebody wants to help with cross-platform + support (using wxWidgets, for example) we are interested, of course. - There is no CVS integration?! + Why is there no CVS integration? + version control systems + + integration with + + integration + + with version control systems + - Which kind of CVS integration WinMerge should have? Adding CVS - client features to WinMerge is questionable since there are many good - CVS clients already. WinMerge can resolve conflict files, see . + Providing an integration with CVS is of questionable value + because there already are so many good CVS clients. However, WinMerge + does provide an integration with the diff function of one of those + clients, TortoiseCVS (as described in ). Also, WinMerge can resolve conflict + files (see ). - What is MRU (list)? What it means? + What is an MRU list? + MRU list + - MRU is the abbreviation for "Most Recently Used", and means the - history lists in the Open-dialog which contain the 20 last used - files/paths per side. + MRU is an abbreviation for Most Recently Used, + and refers to the history lists in the Select Files or Folders dialog. + The list contain the last twenty paths used on each side. - Can WinMerge open Open Office files? + Can WinMerge open OpenOffice files? + OpenOffice, opening files in WinMerge + - Yes, enable Detect archive type from file - signature option in Archive - Options. + OpenOffice files are archives. To be able to open them in + WinMerge, you have to configure archive support: + + + + Install archive support, as described in . + + + + In WinMerge, click the Options button + (or click + Edit + + Options + ). In the Archive Support page, enable the + Detect archive type from file signature + option + + - Why do large files sometimes show as different in the folder - view, but come up as identical in the merge editor? + Why do large files sometimes show up as different in the Folder + Compare window, but identical in the File Compare window? - This is because WinMerge uses the "Quick - Compare" method for large files always. It allows WinMerge - to compare large files more efficiently. To test if this is causing - the behavior you're seeing, you could raise the limit for the - Quick Compare threshold for large files. It is - stored in the registry as: - - HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge\Settings\QuickMethodLimit - - You may consider raising this limit if you constantly compare - large text files. Be careful to not raise it too much "for just to be - sure". 100 MB is too much. - - The default value for the limit is 4MB (0x400000). + This is because WinMerge always uses the Quick + Contents file compare method for large files. This method + enables WinMerge to compare large files more efficiently. To test if + this is causing the behavior you're seeing, you can try raising the + Quick Contents threshold for large files. See the + discussion of this method in + to learn how. WinMerge shows an error (or even crashes!) complaining it cannot - load CompareMSWordFiles.dll and/or CompareMSExcelFiles.dll! + load CompareMSWordFiles.dll or + CompareMSExcelFiles.dll! + Visual Basic dlls for plugins + + plugins + + Visual Basic dlls + + CompareMSWordFiles.dll plugin file + + CompareMSExcelFiles.dll plugin file + - Mentioned files are plugins written with Visual Basic (6.0). - WinMerge installer does not contain Visual Basic runtime files so - those plugins cannot be loaded. You can: + These files are plugins written with Visual Basic (6.0). The + WinMerge installer does not contain Visual Basic runtime files, so + those plugins cannot be loaded. You can address the problem using one + of these options: - + - Remove those files from WinMerge/Plugins -folder or + Remove these files from the WinMerge/Plugins folder. Download the Visual Basic 6.0 runtime distribution from Microsoft:http://support.microsoft.com/kb/290887 - and install it. Or download just the one needed file from: http://www.dll-files.com/dllindex/dll-files.shtml?msvbvm60 - and copy it to the WinMerge - folder. + and copy them to the WinMerge folder. - + @@ -208,36 +262,40 @@ WinMerge does not start and complains about missing DLL files - (mfc71.dll, mfc71u.dll, msvcr71.dll, msvcp71.dll) + (mfc71.dll, mfc71u.dll, + msvcr71.dll, and + msvcp71.dll) - When installing from archive (zip, 7z) file you need also - Runtimes-package, which contains those files. See the . + When installing WinMerge from an archive (zip or 7z) file, you + also need the runtime package containing those files. See the in the installation Help topic for + details.
      - File Comparing + File comparing - Why my files have all lines marked different (colored) even if I - know all lines are not different? + Why do my files have all lines marked as different (colored), + even though I know all the lines are not different? - Maybe your files have different line-ending styles (e.g. Windows - and Unix?). WinMerge by default compares also line-ending styles, but - you can disable it from + Maybe your files have different line ending styles (for example, + Windows and Unix). By default, WinMerge compares line ending styles. + To disable it, click Edit Options - / Compare / Ignore carriage return differences. + . In the Compare page, enable (check) the option, + Ignore carriage return differences. @@ -249,82 +307,89 @@ - Some characters are cut in half? + Why are some characters cut in half? - Try selecting a different font from menu + Try clicking View - Select Font... - + Select Font + and selecting a different font. - I see question marks instead of letters in files? + I see question marks instead of letters in files. - This is what we call a "lossy" conversion. + This is what we call a lossy + conversion. For Unicode files (UCS-2, UTF-8), use WinMergeU.exe. - For ANSI files, this is probably due to code-page problems. If - "Use codepage info" is selected from - Options, turn that off and see if it + For ANSI files, this is probably due to code-page problems. To + troubleshoot, click + Edit + + Options + . Then in the Codepages page, see if the option + Detect codepage info is checked. If it is, + deselect the option, click OK, and see if that helps. - I cannot select proportional fonts for editor? + I cannot select proportional fonts for editor. - Unfortunately WinMerge supports only non-proportional + Unfortunately, WinMerge supports only non-proportional fonts. - What is delaying of (automatic) rescan? Why it is needed? + What is delay of automatic rescan? Why it + is needed? - When Automatic Rescan is enabled, WinMerge - delays rescanning while user edits files. So there is no rescanning - happening when user types text but shortly after user has finished - typing. Without this delaying WinMerge would do rescan after every - typed letter and editing files would become slow. This delaying - especially improves editing of bigger files which can take several - seconds to rescan. + When Automatic Rescan is enabled (in the + Editor page of Options), WinMerge delays rescanning while you edit + files. That is, no rescanning occurs until shortly after you stop + typing. Without this delay, WinMerge would rescan after every typed + character, making the editing process too slow. The delay especially + improves editing bigger files, which can take several seconds to + rescan. - Can I print files from editor? + Can I print files from the File panes in the Compare Files + window? - There is basic printing support in WinMerge 2.6.0 and later - versions. Select + Yes, there is basic printing support: click File - Print... - from the menu. + Print + . - Can I hide similar lines in editor (so that only different lines - are visible)? + Can I hide similar lines in a file comparison, so that only + different lines are visible? @@ -347,30 +412,31 @@ - Use command line switch. + Open WinMerge from the command line, and include the + switch. - I don't want to see the "Files Are - Identical" -messagebox when I compare identical files, I - just want WinMerge to quit. + I don't want to see the Files Are Identical + message when I compare identical files, I just want WinMerge to + quit. - Use command line switch. + Use the command line switch. - How can I avoid temporary paths filling Open-dialog history - lists? + How can I avoid filling the Select Files or Folders dialog + history lists with temporary paths? - Tell your external program to invoke WinMerge with the + Have your external program invoke WinMerge with the option, which tells WinMerge to not add the files to the MRU. @@ -378,12 +444,12 @@ - But the program I'm using doesn't allow commandline + But the program I'm using doesn't allow command line parameters! - Create a batch file where you add one of these lines (but not + Create a batch file that contains one of these lines (but not both): @@ -396,7 +462,7 @@ - And then call this batch file from program. + Call this batch file from your program. @@ -408,37 +474,48 @@ - I installed 7-Zip but archive support does not work? + I installed 7-Zip but archive support does not work. - Do you have plugin installed and or the plugin version matches - 7-Zip version? If not, see Installing chapter for instructions for - installing. - + You might have one of these problems: - - If the error is something like: "7-zip x.xx missing / - Plugin present", then you probably have installed 7-Zip - using MSI-installer. There are 7-Zip MSI installers that do not - install all the files WinMerge needs (namely - 7zip_pad.xml in 7-Zip program folder). Download - and run the EXE version of the 7-Zip installer. + + + Do you have the plugin installed, and does the plugin + version match the 7-Zip version? If not, see the instructions for + in the installation + topic. + + + + If the error is something like: 7-zip + x.xx missing / Plugin present, then you + probably installed 7-Zip using the MSI installer. Some 7-Zip MSI + installers do not install all the files that WinMerge needs + (specifically, 7zip_pad.xml in the 7-Zip + program folder). Download and run the EXE + version of the 7-Zip installer. + + - How can I open "Perry-style" patch files WinMerge developers use - when submitting patches? + How can I open the Perry-style patch files that WinMerge + developers use when submitting patches? + patch files, Perry-style + - "Perry-style" patches are zip-files containing original and + Perry-style patches are zip files containing original and changed files in different directories. WinMerge has internal support - (surprise?) for handling these files. Just select zip file in question - to left side and right side and WinMerge opens zip files contents to - folder compare comparing original and altered files. + (surprise!) for handling these files: just launch a compare operation, + selecting the zip file for both the left and right sides. WinMerge + opens the contents of the zip file in a Folder Compare window, + comparing the original and changed files. @@ -460,26 +537,35 @@ - Yes, enable Detect archive type from file - signature option in Archive - Options. + Yes: click the Options button (or click + + Edit + + Options + ). In the Archive Support page, enable the + Detect archive type from file signature + option.
      - Text encoding (codepages) + Text encoding (codepages)<indexterm> + <primary>ANSI</primary> + + <secondary>detecting in files using Notepad</secondary> + </indexterm> How do I tell if my file is coded - in the local windows (ie, ANSI) codepage? + in the local Windows (ANSI) codepage? - Open the file with Windows notepad (eg. + Open the file in Windows Notepad (for example, click Start (All) Programs @@ -487,107 +573,66 @@ Accessories Notepad - . Choose + ). Click File Save As - , and in the Save As dialog which appears, look at the - dropdown list at the very bottom, labelled - "Encoding". + , and in the Save As dialog, scroll to the + Encoding item at the dropdown list. The possible + values include: - If it says "ANSI", the file is - (apparently) in the local windows codepage. If the file is - entirely in English and normal punctuation, then the file is also - in ASCII. + ANSI: The file is apparently in the + local Windows codepage. If the file is entirely in English and + normal punctuation, then the file is also in ASCII. - If it says "Unicode", the file is - (probably) in the default Windows Unicode encoding - "UCS-2LE". + Unicode: The file is probably in the + default Windows Unicode encoding, UCS-2LE. - If it says "UTF-8", the file is in the - cross-platform Unicode encoding "UTF-8". + UTF-8: The file is in the + cross-platform Unicode encoding, UTF-8. - If it says "Unicode big endian", the - file is in a different Unicode encoding not much used or supported - under Windows, probably "UCS-2BE". + Unicode big endian: The file is in a + different Unicode encoding that is little used or supported in + Windows, probably UCS-2BE. - - - - How do I compare UTF-8 files? WinMerge is not showing them - correctly. - - - - Using WinMerge encoding detection. - - - - If they are XML files, they should have an encoding - attribute in the XML declaration, which should say "UTF-8". For - example: <?xml version="1.0" encoding="UTF-8"?> - - - - If they are HTML files, they should have the encoding - embedded in a content attribute in a meta tag in the header. For - example: <meta http-equiv="content-type" content="text/html; charset=UTF-8"> - - - - For WinMerge to read encodings specified in XML or HTML (or - Windows RC resource) files, the option checkbox Detect - codepage info for... in Codepage - options ( - Edit - - Options - from main menu) must be checked. - - - - - - For all other cases, to instruct WinMerge to assume that all - documents are UTF-8, set the default WinMerge codepage to 65001 (which - is Microsoft's code for UTF-8) in Codepage - options ( - Edit - - Options - from main menu) and then Custom - Codepage. - -
      - Patch files + Patch files<indexterm> + <primary>patch files</primary> + + <secondary>creating with diffutils</secondary> + </indexterm><indexterm> + <primary>diffutils</primary> + + <secondary>WinMerge patches compatible with</secondary> + </indexterm> - Is there way to create patch files from the commandline? + Is there way to create patch files from the command line? - No. It may be added in later versions but until then Win32 port - of diffutils can be used. The Win32 port of diffutils (and patch) can - be downloaded from GnuWin32 project from - SourceForge: - http://sourceforge.net/projects/gnuwin32 + No. It might be added in later versions. Until then, you can use + the Win32 port of diffutils. The latest version + of diffutils (and patch) can be downloaded from + the SourceForge GnuWin32 project page: + + http://sourceforge.net/projects/gnuwin32. @@ -597,13 +642,12 @@ - No. The patch tool from GnuWin32 project can be used for patch - applying since WinMerge produces GNU/diffutils compatible patch files. - See above question. + No. However, you can apply patches using the patch tool from the + GnuWin32 project, because WinMerge produces patch files that are + compatible with GNU/diffutils. Also, see the preceding + question. - -
      - + \ No newline at end of file From 6fd7e6924505cc368ab5a1524eb62127066fdb41 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 16 Sep 2008 20:08:12 +0000 Subject: [PATCH 118/168] PATCH: [ 2112128 ] Final pass for minor fixes: typos, index entries, etc. Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/Manual/About_Doc.xml | 10 +-- Docs/Users/Manual/Command_line.xml | 8 ++- Docs/Users/Manual/Compare_dirs.xml | 33 +++++++-- Docs/Users/Manual/Compare_files.xml | 13 ++-- Docs/Users/Manual/Configuration.xml | 32 ++++++--- Docs/Users/Manual/Filters.xml | 57 ++++++++++----- Docs/Users/Manual/Install.xml | 62 +++++++++++++--- Docs/Users/Manual/Intro_diffs.xml | 22 ++++-- Docs/Users/Manual/Introduction.xml | 12 ++-- Docs/Users/Manual/Locales.xml | 24 ++++--- Docs/Users/Manual/Open_paths.xml | 76 +++++++++++++++----- Docs/Users/Manual/Plugins.xml | 105 +++++++++++++++++++++------- Docs/Users/Manual/Quick_start.xml | 16 +++-- Docs/Users/Manual/WinMerge_help.xml | 6 +- 15 files changed, 358 insertions(+), 119 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index a2d6114a55e..000214a29de 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 Change Manual url to http://winmerge.org/docs/manual/ (r5957) + Manual updates BugFix: Customized colors weren't used in some areas (#2110218) BugFix: Zip files were extracted into wrong folder (#2110350) diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index 383785854c2..89483589469 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -1,13 +1,13 @@
      - About WinMerge online Help + About WinMerge Help - This is online Help for WinMerge This is Help for WinMerge .
      - Audience + Audience and scope WinMerge Help is intended for both new and experienced users. It explains how to use WinMerge, and documents its capabilities and @@ -180,7 +180,9 @@
      - Documentation conventions + Documentation conventions<indexterm> + <primary>conventions, documentation</primary> + </indexterm> diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml index 401e4cf40dd..4b2a1e7144c 100644 --- a/Docs/Users/Manual/Command_line.xml +++ b/Docs/Users/Manual/Command_line.xml @@ -2,10 +2,10 @@
      Command line<indexterm> <primary>command line</primary> - - <secondary>syntax</secondary> </indexterm><indexterm> <primary>WinMerge command line</primary> + + <see>command line</see> </indexterm> The WinMerge command line accepts several parameters in addition to the @@ -137,7 +137,7 @@ filters - applying + applying in command line applies a specified filter to restrict the @@ -302,6 +302,8 @@ conflict files + + specifying on command line Specifies a diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index b73ecd8dd73..dc87597c1fa 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -7,7 +7,8 @@ This topic describes how to compare and merge folders using the Folder Compare window. - +
      Starting a folder compare operation @@ -29,7 +30,7 @@ all files in the folders, and is nonrecursive (does not include subfolders). To change any of these options and for more details about the Select Files or Folder dialog, see . + linkend="OpenPaths" />. @@ -52,7 +53,9 @@ - Recursive mode + Recursive mode + recursive folder compare + Recursive mode is useful for detecting and manipulating @@ -144,6 +147,14 @@ I get the partial list, but no Abort indicator.--> Folder Compare window Compare windows + + Compare windows + + Folder + + subfolders + + in Folder Compare window The Folder Compare window shows the result of a folder compare in a @@ -325,7 +336,11 @@ I get the partial list, but no Abort indicator.-->
      - Working with multiple Folder Compare windows + Working with multiple Folder Compare windows<indexterm> + <primary>Folder Compare window</primary> + + <secondary>using multiple</secondary> + </indexterm> By default, the WinMerge window displays a single Folder Compare window. That is, if you start another file comparison while a Folder Compare @@ -408,6 +423,10 @@ I get the partial list, but no Abort indicator.--> file operations in Folder Compare window + + Folder Compare window + + file operations The Folder Compare window supports common operations on files, like @@ -642,6 +661,12 @@ I get the partial list, but no Abort indicator.--> Folder Compare window protecting files in + + protecting files + + read-only files + + protecting files To protect the files and folders on either side of a compare from diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index 0d6604d4652..a3f7800c95e 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -6,10 +6,11 @@ This topic describes how to use the WinMerge File Compare window to compare and merge files. To understand the basic concepts about differences - used here, we suggest you read read + used here, we suggest you read first. - +
      Starting a file compare operation @@ -51,6 +52,10 @@ File Compare window Compare windows + + Compare windows + + File The File Compare window displays compared files in two File panes, @@ -1162,7 +1167,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637-->
      - Merging Differences<indexterm> + <title>Merging differences<indexterm> <primary>merging differences</primary> </indexterm> @@ -1483,7 +1488,7 @@ https://sourceforge.net/forum/forum.php?thread_id=2001747&forum_id=41637-->
      - Resolving Conflict Files<indexterm> + <title>Resolving conflict files<indexterm> <primary>conflict files</primary> </indexterm> diff --git a/Docs/Users/Manual/Configuration.xml b/Docs/Users/Manual/Configuration.xml index 4f6d40b52e9..5c6b466b009 100644 --- a/Docs/Users/Manual/Configuration.xml +++ b/Docs/Users/Manual/Configuration.xml @@ -139,7 +139,7 @@
      Disable splash screen<indexterm> - <primary>splash screen, disabling</primary> + <primary>splash screen, enabling and disabling</primary> </indexterm> @@ -209,7 +209,7 @@ Allow only one instance to run<indexterm> <primary>WinMerge window</primary> - <secondary>opening multiple</secondary> + <secondary>limiting instances</secondary> </indexterm> @@ -284,7 +284,9 @@
      - Open-dialog Auto-Completion + Open-dialog Auto-Completion<indexterm> + <primary>MRU list</primary> + </indexterm> Choose one of these options: @@ -1042,9 +1044,9 @@
      Download 7-zip Plugin<indexterm> - <primary>7-Zip archive support</primary> + <primary>7-Zip archives</primary> - <secondary>options</secondary> + <secondary>configuring support after installation</secondary> </indexterm> If WinZip is already installed on your system, WinMerge @@ -1057,7 +1059,11 @@
      - Enable archive file support + Enable archive file support<indexterm> + <primary>7-Zip archives</primary> + + <secondary>enabling and disabling integration</secondary> + </indexterm> This option controls how WinMerge handles archive files (based on 7-Zip integration). @@ -1090,7 +1096,9 @@
      - Detect archive type from file signature + Detect archive type from file signature<indexterm> + <primary>detecting archive types</primary> + </indexterm> @@ -1144,9 +1152,9 @@
      Add to explorer context menu<indexterm> - <primary>shell integration</primary> + <primary>integration</primary> - <secondary>enabling and disabling</secondary> + <secondary>with Windows shell</secondary> </indexterm> @@ -1383,7 +1391,11 @@ Version Control options<indexterm> <primary>version control systems</primary> - <secondary>integration configuration</secondary> + <secondary>configuring after installation</secondary> + </indexterm><indexterm> + <primary>integration</primary> + + <secondary>with version control systems</secondary> </indexterm>
      - Including Subfolders + Including Subfolders<indexterm> + <primary>recursive folder compare</primary> + + <secondary>specifying in Select Files or Folders dialog</secondary> + </indexterm><indexterm> + <primary>subfolders</primary> + + <seealso>recursive folder compare</seealso> + </indexterm> By default, WinMerge does not include subfolders in compare operations. To change the default behavior, enable Include @@ -299,7 +333,7 @@ to compare one file/folder against several files/folders. -->
      <indexterm> - <primary>drag and drop</primary> + <primary>drag and drop, in WinMerge window</primary> </indexterm>Drag and drop From any Windows source that allows you to drag objects, such as @@ -346,6 +380,10 @@ to compare one file/folder against several files/folders. -->
      <indexterm> <primary>project files</primary> + </indexterm><indexterm> + <primary>command line</primary> + + <secondary>specifying project files</secondary> </indexterm>Project files You can save the currently open paths and filters in a project file. @@ -353,20 +391,17 @@ to compare one file/folder against several files/folders. --> Project files are handy if you compare the same files repeatedly.
      - Project files + Using project files - You can specify a project file as a command line argument, just like - a normal file. In the WinMerge window, click + To use a project file In the WinMerge window, click File Open Project . WinMerge reads the paths from the project file. If the project file has two paths, both paths are opened. If only one path is given or one of paths is invalid, WinMerge opens the Select Files or - Folders dialog, where you can add or correct the path information. - - A project file can also be opened in the Select Files or Folders - dialog. Here are a few things to consider: + Folders dialog, where you can add or correct the path information. Here + are a few things to consider: @@ -390,6 +425,9 @@ to compare one file/folder against several files/folders. --> file are compared. + + To specify a project file on the command line, simply enter it as a + single file path.
      diff --git a/Docs/Users/Manual/Plugins.xml b/Docs/Users/Manual/Plugins.xml index 0df6c6d4e88..dbc9e1c64cd 100644 --- a/Docs/Users/Manual/Plugins.xml +++ b/Docs/Users/Manual/Plugins.xml @@ -1,6 +1,8 @@
      - Plugins + Plugins<indexterm> + <primary>plugins</primary> + </indexterm> WinMerge plugins are custom dlls or scriptlets, written in the COM API, that preprocess data before a comparison. For example, you can use a plugin to @@ -9,7 +11,9 @@ provide are of interest to only a few users, or because they do not fit into the WinMerge architecture. - Each plugin is: + Each plugin is: + installing plugins + @@ -37,7 +41,9 @@ - Editor complement + Editor complement + editor complement plugins + This type of plugin performs custom operations on selected text @@ -46,7 +52,9 @@ - Unpacker: transform a file to a text format + Unpacker: transform a file to a text format + unpacker plugins + This type of plugin transforms a compressed file to a viewable @@ -80,7 +88,9 @@ - Prediffer: preprocess files to hide some differences + Prediffer: preprocess files to hide some differences + prediffer plugins + This type of plugin does not operate on the source files @@ -199,14 +209,14 @@ To apply plugins when automatic unpacking is set, simply launch a compare operation on a file in the Folder Compare window. If the file's type suggested unpacker plugin (if any) preprocesses the file before - WinMerge opens it in the File Compare window. + WinMerge opens it in the File Compare window. For example, suppose you right-click an MS Word doc file and choose Compare (also assume that the plugin is available). WinMerge converts the doc file (or rather, a copy of it ) to a plain text file and opens it in - the File Compare window. + the File Compare window.
      @@ -220,7 +230,7 @@ - Select the file you want to compare. + Select the file you want to compare. @@ -228,7 +238,7 @@ Plugins Edit with Unpacker - . + . This menu item is enabled only if the selected file's type is supported by an available unpacking plugin. @@ -314,10 +324,18 @@
      - Available plugins + Available plugins<indexterm> + <primary>Visual Basic dlls for plugins</primary> + </indexterm><indexterm> + <primary>plugins</primary> + + <secondary>Visual Basic dlls</secondary> + </indexterm>
      - <filename>CompareMSExcelFiles.dll</filename> + <filename>CompareMSExcelFiles.dll<indexterm> + <primary>CompareMSExcelFiles.dll plugin file</primary> + </indexterm></filename> Displays the text contents of a Microsoft Excel @@ -346,7 +364,9 @@
      - <filename>CompareMSWordFiles.dll</filename> + <filename>CompareMSWordFiles.dll<indexterm> + <primary>CompareMSWordFiles.dll plugin file</primary> + </indexterm></filename> Displays the text content of a Microsoft Word @@ -377,7 +397,9 @@
      - <filename>DisplayXMLFiles.dll</filename> + <filename>DisplayXMLFiles.dll<indexterm> + <primary>DisplayXMLFiles.dll plugin file</primary> + </indexterm></filename> This plugin pretty-prints XML files nicely by inserting tabs and line breaks. This is useful for XML files that do not have line returns in @@ -401,7 +423,9 @@
      - <filename>editor addin.sct</filename> + <filename>editor addin.sct<indexterm> + <primary>editor addin.sct plugin file</primary> + </indexterm></filename> Adds two functions to the Edit @@ -431,7 +455,9 @@
      - <filename>IgnoreColumns.dll</filename> + <filename>IgnoreColumns.dll<indexterm> + <primary>IgnoreColumns.dll plugin file</primary> + </indexterm></filename> This plugin ignores characters at specified columns. The first column is number 1 @@ -500,7 +526,9 @@
      - <filename>IgnoreCommentsC.dll</filename> + <filename>IgnoreCommentsC.dll<indexterm> + <primary>IgnoreCommentsC.dll plugin file</primary> + </indexterm></filename> The plugin ignores comments within //... and /* ... */ delimiters in C, C++, @@ -526,7 +554,9 @@
      - <filename>IgnoreFieldsComma.dll</filename> + <filename>IgnoreFieldsComma.dll<indexterm> + <primary>IgnoreFieldsComma.dll plugin file</primary> + </indexterm></filename> This plugin is for files with fields and commas as delimiters (CSV files, for example). It ignores the delimiter characters. The first field @@ -550,7 +580,9 @@
      - <filename>IgnoreFieldsTab.dll</filename> + <filename>IgnoreFieldsTab.dll<indexterm> + <primary>IgnoreFieldsTab.dll plugin file</primary> + </indexterm></filename> This plugin is for files that use fields and tabs as delimiters (for examle, Excel files saved in the
      - <filename>IgnoreLeadingLineNumbers.dll</filename> + <filename>IgnoreLeadingLineNumbers.dll<indexterm> + <primary>IgnoreLeadingLineNumbers.dll plugin file</primary> + </indexterm></filename> This plugin ignores the leading line numbers in text files (for example, NC and BASIC files). @@ -598,7 +632,9 @@
      - <filename>insert datetime.sct</filename> + <filename>insert datetime.sct<indexterm> + <primary>insert datetime.sct plugin file</primary> + </indexterm></filename> Adds two functions to the Edit @@ -629,7 +665,10 @@
      <filename>RCLocalizationHelper.dll</filename>, - <filename>RCLocalizationHelperU.dll</filename> + RCLocalizationHelperU.dll + RCLocalizationHelper.dll, RCLocalizationHelperU.dll plugin + files + This plugin preprocesses RC files by stripping out localized strings, to enable comparing different language versions of the same RC @@ -653,7 +692,10 @@
      <filename>WatchBeginningOfLog.dll</filename>, - <filename>WatchEndOfLog.dll</filename> + WatchEndOfLog.dll + WatchBeginningOfLog.dll, WatchEndOfLog.dll plugin + files + For long LOG files, often only in the first lines or in the last lines are significant. @@ -693,7 +735,11 @@
      - Requirements + Requirements<indexterm> + <primary>plugins</primary> + + <secondary>Windows Script Host requirement</secondary> + </indexterm>
      Windows Script Host @@ -710,7 +756,18 @@
      - <application>Visual Basic</application> runtime library + <application>Visual Basic</application> runtime library<indexterm> + <primary>Visual Basic dlls for plugins</primary> + </indexterm><indexterm> + <primary>plugins</primary> + + <secondary>Visual Basic dlls</secondary> + </indexterm><indexterm> + <primary>msvbvm60.dll plugin file</primary> + </indexterm><indexterm> + <primary>Run-Time Redistribution Pack, for Visual Basic + library</primary> + </indexterm> Some plugins require the Visual Basic runtime library to work. diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index 5ac07836a2a..b2f4f0559e0 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -6,10 +6,10 @@ <indexterm> <primary>getting started with WinMerge</primary> </indexterm><indexterm> - <primary>opening files and folders</primary> + <primary>choosing files and folders</primary> <secondary>getting started</secondary> - </indexterm>Opening files and folders + Selecting files and folders to compare After you have installed WinMerge, step through the procedure and discussions in this topic to learn basic WinMerge operations and concepts. @@ -21,7 +21,9 @@ Open the WinMerge window. Here are some of the methods you can - use: + use: + WinMerge window + @@ -241,7 +243,13 @@
      - Other ways to open files and folders + Other ways to open files and folders<indexterm> + <primary>project files</primary> + </indexterm><indexterm> + <primary>command line</primary> + + <secondary>opening files and folders</secondary> + </indexterm> The Select Files or Folders dialog is the main interface for opening files and folders. But you can use many other ways, too: diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index cd0dca62a60..dc3cf22b136 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -84,6 +84,10 @@ + + &AboutDoc; &QuickStart; @@ -116,5 +120,5 @@ &ShortCuts; - + From 210cebf104fee149a6fb19c3a425baba507960b6 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 16 Sep 2008 20:10:12 +0000 Subject: [PATCH 119/168] Manual: bump revision number to 1.4.7. --HG-- branch : R2_10 --- Docs/Users/Manual/WinMerge_help.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index dc3cf22b136..f222df51c2e 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -26,7 +26,7 @@ WinMerge - Revision 1.4.6 + Revision 1.4.7 2004-2008 From 9f498a47333310391c3f85a130e0f14dbd37561f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 17 Sep 2008 17:34:57 +0000 Subject: [PATCH 120/168] PATCH: [ 2114998 ] Release notes for 2.10 stable release --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReleaseNotes.html | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 000214a29de..6488f780c66 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10 Change Manual url to http://winmerge.org/docs/manual/ (r5957) Manual updates + Changelog update (#2114998) BugFix: Customized colors weren't used in some areas (#2110218) BugFix: Zip files were extracted into wrong folder (#2110350) diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html index 098f4331d32..81f4c8daa50 100644 --- a/Docs/Users/ReleaseNotes.html +++ b/Docs/Users/ReleaseNotes.html @@ -51,9 +51,10 @@ -

      WinMerge 2.10 Release Candidate Release Notes

      +

      WinMerge 2.10 Release Notes

      • About This Release
        • +
      • What Is New in 2.10?
      • What Is New in 2.10 RC?
      • What Is New in 2.9.10 Beta?
      • Known Issues
        • @@ -63,9 +64,8 @@

        WinMerge 2.10 Release Candidate Release Notes

        About This Release

        -This is a release candidate release for 2.10 stable release. This release -contains all the new features that will be in 2.10 version. There are no big -bugs left, and in general this release is safe to test and use. +This is a 2.10 stable release. This release replaces earlier stable releases +as a recommended release.

        @@ -73,17 +73,23 @@

        About This Release

        "https://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-tracker.

        -

        What Is New in 2.10 RC?

        +

        What Is New in 2.10?

        WinMerge 2.10 does not have many new features. Instead many existing features are improved and optimized. And some long-standing problems are fixed.

        +

        2.10 stable release has only couple of changes after release candidate. +Those changes are couple of bug fixes and manual improvements. See the 2.10 RC +and beta release changes below for more complete change list in this release. +

        +

        For a complete changelog history, see the ChangeLog.txt file located in the Docs folder under the WinMerge program folder.

        +

        What Is New in 2.10 RC?

        Improved user manual

        The user manual has been improved a lot. The content has been practically From ebac93ca4c7992a5a20d4f2a728f586af052c544 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 17 Sep 2008 17:39:57 +0000 Subject: [PATCH 121/168] WinMerge 2.10.0 release (SVN revision 5967) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 6488f780c66..0ac92278809 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,7 +3,7 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.10 +WinMerge 2.10 - 2008-09-17 (r5967) Change Manual url to http://winmerge.org/docs/manual/ (r5957) Manual updates Changelog update (#2114998) From 7d5e86753d941a7b3f1f6b7fa68325ec3abe7d31 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Thu, 25 Sep 2008 15:02:03 +0000 Subject: [PATCH 122/168] PATCH: [ 1991259 ] Convert editor find/replace to use PCRE regexps - case-sensitive regexp search didn't work. --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 3 +++ Src/editlib/ccrystaltextview.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 0ac92278809..deba15e8218 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,6 +3,9 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.10.2 + BugFix: Case-sensitive regexp search didn't work (#1991259) + WinMerge 2.10 - 2008-09-17 (r5967) Change Manual url to http://winmerge.org/docs/manual/ (r5957) Manual updates diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp index c6229583f17..a8314803141 100644 --- a/Src/editlib/ccrystaltextview.cpp +++ b/Src/editlib/ccrystaltextview.cpp @@ -4532,22 +4532,21 @@ FindStringHelper (LPCTSTR pszFindWhere, LPCTSTR pszFindWhat, DWORD dwFlags, } int ovector[30]; - char compString[200] = {0}; + int compStringBufLen = _tcslen(pszFindWhere) * sizeof(TCHAR) + 1; + char *compString = new char[compStringBufLen]; int stringLen = 0; - TCHAR * tempName = _tcsdup(pszFindWhere); // Create temp copy for conversions - TCHAR * cmpStr = _tcsupr(tempName); #ifdef UNICODE - stringLen = TransformUcs2ToUtf8(cmpStr, _tcslen(cmpStr), - compString, sizeof(compString)); + stringLen = TransformUcs2ToUtf8(pszFindWhere, _tcslen(pszFindWhere), + compString, compStringBufLen); + compString[stringLen] = '\0'; #else - strcpy(compString, cmpStr); + strncpy(compString, pszFindWhere, compStringBufLen); stringLen = strlen(compString); #endif int result = pcre_exec(regexp, pe, compString, stringLen, 0, 0, ovector, 30); - free(tempName); if (result >= 0) { @@ -4562,6 +4561,7 @@ FindStringHelper (LPCTSTR pszFindWhere, LPCTSTR pszFindWhat, DWORD dwFlags, else pos = -1; + delete [] compString; pcre_free(regexp); pcre_free(pe); return pos; From ce74f4b157d6c00a1809cb02aa517281d0d6d83a Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 27 Sep 2008 17:25:48 +0000 Subject: [PATCH 123/168] PATCH: [ 2131753 ] Updated Ukrainian Translation Submitted by Warrior --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 + Src/Languages/Ukrainian.po | 440 +++++++++++++++++++++++-------------- 2 files changed, 278 insertions(+), 164 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index deba15e8218..123f457083d 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,8 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.2 BugFix: Case-sensitive regexp search didn't work (#1991259) + Translation updates: + - Ukrainian (#2131753) WinMerge 2.10 - 2008-09-17 (r5967) Change Manual url to http://winmerge.org/docs/manual/ (r5957) diff --git a/Src/Languages/Ukrainian.po b/Src/Languages/Ukrainian.po index ed875e2bada..560bc6a9f40 100644 --- a/Src/Languages/Ukrainian.po +++ b/Src/Languages/Ukrainian.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-05-18 00:10+0200\n" +"PO-Revision-Date: 2008-09-26 22:47+0200\n" "Last-Translator: Warrior \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" @@ -175,7 +175,7 @@ msgstr " #: Merge.rc:349 #, c-format msgid "&Edit" -msgstr "&" +msgstr "&" #: Merge.rc:125 #: Merge.rc:211 @@ -203,7 +203,7 @@ msgstr " #: Merge.rc:388 #, c-format msgid "Use Default F&ont" -msgstr " & " +msgstr " & " #: Merge.rc:132 #: Merge.rc:227 @@ -217,21 +217,21 @@ msgstr " #: Merge.rc:411 #, c-format msgid "&None" -msgstr "&" +msgstr "&" #: Merge.rc:135 #: Merge.rc:230 #: Merge.rc:412 #, c-format msgid "&Small" -msgstr "& " +msgstr "& " #: Merge.rc:136 #: Merge.rc:231 #: Merge.rc:413 #, c-format msgid "&Big" -msgstr "& " +msgstr "& " #: Merge.rc:138 #: Merge.rc:233 @@ -245,7 +245,7 @@ msgstr "& #: Merge.rc:416 #, c-format msgid "Ta&b Bar" -msgstr " " +msgstr " " #: Merge.rc:141 #: Merge.rc:237 @@ -287,7 +287,7 @@ msgstr "& #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&..." #: Merge.rc:152 #: Merge.rc:269 @@ -315,7 +315,7 @@ msgstr " #: Merge.rc:462 #, c-format msgid "&Reload plugins" -msgstr "& " +msgstr "& " #: Merge.rc:159 #: Merge.rc:276 @@ -364,7 +364,7 @@ msgstr " #: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" -msgstr " &\tF6" +msgstr " &\tF6" #: Merge.rc:171 #: Merge.rc:288 @@ -442,7 +442,7 @@ msgstr "&GNU General Public License" #: Merge.rc:490 #, c-format msgid "&About WinMerge..." -msgstr "& WinMerge..." +msgstr " & WinMerge..." #: Merge.rc:200 #: Merge.rc:333 @@ -511,12 +511,12 @@ msgstr " #: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" -msgstr "&\tF5" +msgstr "&\tF5" #: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" -msgstr " &\tCtrl+F5" +msgstr " &\tCtrl+F5" #: Merge.rc:242 #: Merge.rc:424 @@ -563,7 +563,7 @@ msgstr " #: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" -msgstr " & \tAlt+Right" +msgstr " & \tAlt+Right" #: Merge.rc:254 #: Merge.rc:434 @@ -805,7 +805,7 @@ msgstr " #: Merge.rc:405 #, c-format msgid "W&rap Lines" -msgstr " " +msgstr " " #: Merge.rc:407 #, c-format @@ -994,7 +994,7 @@ msgstr "ҳ #: Merge.rc:554 #, c-format msgid "&Refresh" -msgstr "&" +msgstr "&" #: Merge.rc:566 #, c-format @@ -1081,12 +1081,12 @@ msgstr " #: Merge.rc:670 #, c-format msgid "Contributors" -msgstr "" +msgstr "" #: Merge.rc:677 #, c-format msgid "Select Files or Folders" -msgstr " ..." +msgstr " ..." #: Merge.rc:680 #: Merge.rc:1595 @@ -1100,7 +1100,7 @@ msgstr "&˳ #: Merge.rc:1020 #, c-format msgid "&Browse..." -msgstr "&..." +msgstr "&..." #: Merge.rc:685 #: Merge.rc:1599 @@ -1112,7 +1112,7 @@ msgstr "& #: Merge.rc:1031 #, c-format msgid "Bro&wse..." -msgstr "&..." +msgstr "&..." #: Merge.rc:690 #: Merge.rc:1603 @@ -1140,7 +1140,7 @@ msgstr " #: Merge.rc:1606 #, c-format msgid "&Include Subfolders" -msgstr "& " +msgstr "& " #: Merge.rc:700 #, c-format @@ -1175,7 +1175,7 @@ msgstr " #: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" -msgstr " " +msgstr " " #: Merge.rc:711 #, c-format @@ -1294,7 +1294,7 @@ msgstr " #: Merge.rc:1618 #, c-format msgid "&Folder compare" -msgstr " &" +msgstr " &" #: Merge.rc:777 #: Merge.rc:1620 @@ -1467,7 +1467,7 @@ msgstr " #: Merge.rc:892 #, c-format msgid "Edit" -msgstr "" +msgstr "" #: Merge.rc:893 #, c-format @@ -1558,7 +1558,7 @@ msgstr " #: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" -msgstr " " +msgstr " " #: Merge.rc:989 #, c-format @@ -1578,7 +1578,7 @@ msgstr " #: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" -msgstr " " +msgstr " " #: Merge.rc:996 #, c-format @@ -1593,28 +1593,28 @@ msgstr "&Գ #: Merge.rc:1001 #, c-format msgid "B&rowse..." -msgstr "" +msgstr "" #: Merge.rc:1002 #, c-format msgid "Temporary files folder" -msgstr " " +msgstr " " #: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" -msgstr " Temp" +msgstr " Temp" #: Merge.rc:1005 #, c-format msgid "C&ustom folder:" -msgstr " :" +msgstr " :" #: Merge.rc:1008 #: Merge.rc:1024 #, c-format msgid "Br&owse..." -msgstr "..." +msgstr "..." #: Merge.rc:1014 #, c-format @@ -1674,12 +1674,12 @@ msgstr " #: Merge.rc:1042 #, c-format msgid "I&gnore changes" -msgstr " " +msgstr " " #: Merge.rc:1044 #, c-format msgid "Ig&nore all" -msgstr " " +msgstr " " #: Merge.rc:1046 #, c-format @@ -1744,7 +1744,7 @@ msgstr " #: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" -msgstr " " +msgstr " " #: Merge.rc:1117 #: Merge.rc:1874 @@ -1760,7 +1760,7 @@ msgstr " #: Merge.rc:1123 #, c-format msgid "Items compared:" -msgstr ":" +msgstr ":" #: Merge.rc:1124 #, c-format @@ -1821,27 +1821,27 @@ msgstr " #: Merge.rc:1157 #, c-format msgid "&Ignore change" -msgstr " " +msgstr " " #: Merge.rc:1159 #, c-format msgid "I&gnore all" -msgstr " & " +msgstr " & " #: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" -msgstr " &" +msgstr " &" #: Merge.rc:1163 #, c-format msgid "Ignore &case" -msgstr " &" +msgstr " &" #: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr " (Win/Unix/Mac)" +msgstr " (Win/Unix/Mac)" #: Merge.rc:1168 #, c-format @@ -1856,7 +1856,7 @@ msgstr " #: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" -msgstr " , 3 " +msgstr " , 3 " #: Merge.rc:1175 #, c-format @@ -2060,12 +2060,12 @@ msgstr " msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." -msgstr " 7-Zip 3.11 , WinMerge." +msgstr " 7-Zip 3.11 , WinMerge." #: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." -msgstr " (Merge7z*.dll)" +msgstr " (Merge7z*.dll)" #: Merge.rc:1297 #, c-format @@ -2123,7 +2123,7 @@ msgstr " #: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" -msgstr " 7-Zip WinMerge:" +msgstr " 7-Zip WinMerge:" #: Merge.rc:1319 #, c-format @@ -2137,8 +2137,12 @@ msgstr " #: Merge.rc:1321 #, c-format -msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" -msgstr " .\n( )" +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" +msgstr "" +" .\n" +"( )" #: Merge.rc:1325 #, c-format @@ -2221,12 +2225,12 @@ msgstr " #: Merge.rc:1409 #, c-format msgid "Bold" -msgstr "" +msgstr "" #: Merge.rc:1417 #, c-format msgid "Folder Compare Report" -msgstr " " +msgstr " " #: Merge.rc:1420 #, c-format @@ -2239,7 +2243,7 @@ msgstr "& #: Merge.rc:1628 #, c-format msgid "Browse..." -msgstr "..." +msgstr "..." #: Merge.rc:1424 #, c-format @@ -2280,7 +2284,7 @@ msgstr "ϳ #: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" -msgstr "ϳ 7-Zip:" +msgstr "ϳ 7-Zip:" #: Merge.rc:1455 #, c-format @@ -2300,12 +2304,12 @@ msgstr "& #: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" -msgstr "& 7-Zip WinMerge" +msgstr "& 7-Zip WinMerge" #: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" -msgstr "& / " +msgstr "& " #: Merge.rc:1471 #, c-format @@ -2315,7 +2319,7 @@ msgstr " #: Merge.rc:1474 #, c-format msgid "Folders:" -msgstr ":" +msgstr ":" #: Merge.rc:1475 #, c-format @@ -2436,7 +2440,7 @@ msgstr " #: Merge.rc:1547 #, c-format msgid "&Folder Name" -msgstr "" +msgstr "" #: Merge.rc:1549 #, c-format @@ -2522,12 +2526,12 @@ msgstr " #: Merge.rc:1623 #, c-format msgid "&Original file's folder" -msgstr " & " +msgstr " & " #: Merge.rc:1625 #, c-format msgid "&Global backup folder:" -msgstr " & :" +msgstr " & :" #: Merge.rc:1629 #, c-format @@ -2578,12 +2582,12 @@ msgstr "ͳ" #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "& " #. StringFileInfo.Block #: Merge.rc:1691 @@ -2949,13 +2953,17 @@ msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" -" \n" -" " +" \n" +" " #: Merge.rc:1828 #, c-format -msgid "Automatically resize panes\nLock Panes" -msgstr " \n " +msgid "" +"Automatically resize panes\n" +"Lock Panes" +msgstr "" +" \n" +" " #: Merge.rc:1834 #, c-format @@ -3018,13 +3026,41 @@ msgstr "" #: Merge.rc:1860 #, c-format -msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" -msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge " +msgid "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" +msgstr "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge " #: Merge.rc:1861 #, c-format -msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" -msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge " +msgid "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" +msgstr "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge " #: Merge.rc:1868 #, c-format @@ -3044,8 +3080,12 @@ msgstr " #: Merge.rc:1888 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -msgstr ":\nij (Dean Grimm), ˳ (Christian List), ʳ (Kimmo Varis), (Jochen Tucht), ҳ (Tim Gerundt), (Takashi Sawanaki), (Gal Hammer), (Alexander Skinner)" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgstr "" +":\n" +"ij (Dean Grimm), ˳ (Christian List), ʳ (Kimmo Varis), (Jochen Tucht), ҳ (Tim Gerundt), (Takashi Sawanaki), (Gal Hammer), (Alexander Skinner)" #: Merge.rc:1889 #, c-format @@ -3070,12 +3110,12 @@ msgstr " #: Merge.rc:1899 #, c-format msgid "&Ignore" -msgstr "&" +msgstr "&" #: Merge.rc:1900 #, c-format msgid "Ignore &all" -msgstr " &" +msgstr " &" #: Merge.rc:1901 #, c-format @@ -3346,7 +3386,7 @@ msgid "" msgstr "" " !\n" "\n" -" %1 :\n" +" %1 :\n" "%2." #: Merge.rc:2016 @@ -3357,10 +3397,10 @@ msgid "" "\n" "Please make sure the folder exists and is writable." msgstr "" -" :\n" +" :\n" "%1\n" "\n" -", ." +", ." #: Merge.rc:2018 #, c-format @@ -3369,9 +3409,9 @@ msgid "" "\n" "Please select filter folder in Options/System." msgstr "" -" !\n" +" !\n" "\n" -" ." +" ." #: Merge.rc:2020 #, c-format @@ -3400,7 +3440,7 @@ msgid "" msgstr "" " .\n" "\n" -" ." +" ." #: Merge.rc:2025 #, c-format @@ -3414,8 +3454,14 @@ msgstr " #: Merge.rc:2037 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"Գ . ?\n" +"\n" +" , ͳ ." #: Merge.rc:2043 #, c-format @@ -3430,7 +3476,7 @@ msgstr "& #: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" -msgstr " " +msgstr " " #: Merge.rc:2051 #, c-format @@ -3465,7 +3511,7 @@ msgstr " #: Merge.rc:2062 #, c-format msgid "Opening selection" -msgstr "³ " +msgstr "³ " #: Merge.rc:2063 #, c-format @@ -3510,12 +3556,12 @@ msgstr " #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr " 䳿..." #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr " 䳿..." #: Merge.rc:2078 #, c-format @@ -3571,17 +3617,17 @@ msgstr " #: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" -msgstr " ײ " +msgstr " ײ " #: Merge.rc:2099 #, c-format msgid "Folder Selection" -msgstr " " +msgstr " " #: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." -msgstr " " +msgstr " " #: Merge.rc:2101 #, c-format @@ -3606,7 +3652,7 @@ msgstr " #: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" -msgstr " !" +msgstr " !" #: Merge.rc:2111 #, c-format @@ -3638,8 +3684,14 @@ msgstr " #: Merge.rc:2115 #, c-format -msgid "The file\n%1\nis not a conflict file." -msgstr "\n%1\n " +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." +msgstr "" +"\n" +"%1\n" +" " #: Merge.rc:2121 #, c-format @@ -3761,7 +3813,7 @@ msgstr "" "%1\n" " WinMerge.\n" "\n" -" , ." +" , ." #: Merge.rc:2134 #, c-format @@ -3807,7 +3859,7 @@ msgstr " #: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" -msgstr " VSS . ?" +msgstr " VSS . ?" #: Merge.rc:2152 #, c-format @@ -3858,24 +3910,24 @@ msgstr "Visual SourceSafe (5.0 #: Merge.rc:2165 #, c-format msgid "Break at whitespace" -msgstr " " +msgstr " " #: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" -msgstr " " +msgstr " " #: Merge.rc:2172 #: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" -msgstr " " +msgstr " " #: Merge.rc:2173 #: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" -msgstr " " +msgstr " " #: Merge.rc:2176 #, c-format @@ -3979,27 +4031,27 @@ msgstr " #: Merge.rc:2200 #, c-format msgid "Select destination folder" -msgstr " " +msgstr " " #: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" -msgstr "˳ - :" +msgstr "˳ - :" #: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" -msgstr " - :" +msgstr " - :" #: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" -msgstr "(%1 )" +msgstr "(%1 )" #: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" -msgstr "(%1 %2 )" +msgstr "(%1 %2 )" #: Merge.rc:2214 #, c-format @@ -4035,7 +4087,7 @@ msgid "" msgstr "" " !\n" "\n" -" , \n" +" , \n" "%1\n" " .\n" "\n" @@ -4044,17 +4096,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr " :" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr " %d :" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "ϳ " #: Merge.rc:2227 #, c-format @@ -4144,12 +4196,12 @@ msgstr " #: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" -msgstr " " +msgstr " " #: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" -msgstr " " +msgstr " " #: Merge.rc:2258 #, c-format @@ -4159,7 +4211,7 @@ msgstr " #: Merge.rc:2259 #, c-format msgid "Folder" -msgstr "" +msgstr "" #: Merge.rc:2260 #, c-format @@ -4264,7 +4316,7 @@ msgstr " #: Merge.rc:2290 #, c-format msgid "Ignored Diff." -msgstr ". " +msgstr ". " #: Merge.rc:2291 #, c-format @@ -4295,7 +4347,7 @@ msgstr " #: Merge.rc:2301 #, c-format msgid "Folder skipped" -msgstr " " +msgstr " " #: Merge.rc:2302 #, c-format @@ -4355,12 +4407,12 @@ msgstr " #: Merge.rc:2325 #, c-format msgid "Filename or folder name." -msgstr "' " +msgstr "' " #: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." -msgstr " , " +msgstr " , " #: Merge.rc:2327 #, c-format @@ -4465,7 +4517,7 @@ msgstr " #: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." -msgstr "ʳ . ֳ WinMerge ." +msgstr "ʳ . ֳ WinMerge ." #: Merge.rc:2358 #, c-format @@ -4554,12 +4606,18 @@ msgstr "" "\n" ", ( ) ?\n" "\n" -": , ' ' ." +": , ' ' ." #: Merge.rc:2384 #, 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 " (Windows/Unix/Mac) '%1'.\n .\n , , ?" +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 "" +" (Windows/Unix/Mac) '%1'.\n" +" .\n" +" , , ?" #: Merge.rc:2385 #, c-format @@ -4569,7 +4627,7 @@ msgstr " #: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." -msgstr " ." +msgstr " ." #: Merge.rc:2387 #, c-format @@ -4578,8 +4636,18 @@ msgstr " #: Merge.rc:2388 #, 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 " .\n\n :\n%1\n ?" +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" +msgstr "" +" .\n" +"\n" +" :\n" +"%1\n" +" ?" #: Merge.rc:2394 #, c-format @@ -4660,12 +4728,12 @@ msgstr " #: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" -msgstr "1. " +msgstr "1. " #: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" -msgstr "2. " +msgstr "2. " #: Merge.rc:2435 #, c-format @@ -4675,7 +4743,7 @@ msgstr " #: Merge.rc:2436 #, c-format msgid "[%1 files selected]" -msgstr "[%1 ]" +msgstr "[%1 ]" #: Merge.rc:2437 #, c-format @@ -4715,7 +4783,7 @@ msgstr " #: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." -msgstr " " +msgstr " " #: Merge.rc:2445 #, c-format @@ -4731,12 +4799,12 @@ msgstr "" #: Merge.rc:2446 #, c-format msgid "Folder does not exist." -msgstr " " +msgstr " " #: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." -msgstr " ." +msgstr " ." #: Merge.rc:2452 #, c-format @@ -5228,22 +5296,22 @@ msgstr " #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr " " #: Merge.rc:2628 #, c-format @@ -5268,12 +5336,12 @@ msgstr " #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr " \" \" " #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr " \" \" " #: Merge.rc:2634 #, c-format @@ -5342,8 +5410,8 @@ msgid "" "Refresh display\n" "Refresh (F5)" msgstr "" -" \n" -" (F5)" +" \n" +" (F5)" #: Merge.rc:2649 #, c-format @@ -5353,7 +5421,7 @@ msgstr " #: Merge.rc:2650 #, c-format msgid "Refresh selected items" -msgstr " " +msgstr " " #: Merge.rc:2651 #, c-format @@ -5444,7 +5512,7 @@ msgid "" "Revert to using the default system font for view\n" "Default Font" msgstr "" -" \n" +" \n" " " #: Merge.rc:2673 @@ -5465,17 +5533,25 @@ msgstr " #: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" -msgstr " " +msgstr " " #: Merge.rc:2677 #, c-format -msgid "Select the current user interface language\nLanguage" -msgstr " \n" +msgid "" +"Select the current user interface language\n" +"Language" +msgstr "" +" \n" +"" #: Merge.rc:2678 #, c-format -msgid "Shows differences inside lines with different colors\nShow Line Difference" -msgstr " \n " +msgid "" +"Shows differences inside lines with different colors\n" +"Show Line Difference" +msgstr "" +" \n" +" " #: Merge.rc:2679 #, c-format @@ -5526,28 +5602,48 @@ msgstr " #: Merge.rc:2691 #, c-format -msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" -msgstr " \n (Alt+Up)" +msgid "" +"Scroll to the previous difference\n" +"Previous Difference (Alt+Up)" +msgstr "" +" \n" +" (Alt+Up)" #: Merge.rc:2692 #, c-format -msgid "Scroll to the next difference\nNext Difference (Alt+Down)" -msgstr " \n (Alt+Down)" +msgid "" +"Scroll to the next difference\n" +"Next Difference (Alt+Down)" +msgstr "" +" \n" +" (Alt+Down)" #: Merge.rc:2693 #, c-format -msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" -msgstr " \n (Alt+Home)" +msgid "" +"Scroll to the first difference\n" +"First Difference (Alt+Home)" +msgstr "" +" \n" +" (Alt+Home)" #: Merge.rc:2694 #, c-format -msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" -msgstr " \n (Alt+Enter)" +msgid "" +"Scroll to the current difference\n" +"Current Difference (Alt+Enter)" +msgstr "" +" \n" +" (Alt+Enter)" #: Merge.rc:2695 #, c-format -msgid "Scroll to the last difference\nLast Difference (Alt+End)" -msgstr " \n (Alt+End)" +msgid "" +"Scroll to the last difference\n" +"Last Difference (Alt+End)" +msgstr "" +" \n" +" (Alt+End)" #: Merge.rc:2696 #, c-format @@ -5606,17 +5702,17 @@ msgstr "" #: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" -msgstr " " +msgstr " " #: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" -msgstr " ( , )" +msgstr " ( , )" #: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" -msgstr " " +msgstr " " #: Merge.rc:2710 #, c-format @@ -5636,12 +5732,12 @@ msgstr " #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr " " #: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" -msgstr " ( 䳺 )" +msgstr " ( )" #: Merge.rc:2720 #, c-format @@ -5675,8 +5771,12 @@ msgstr " #: Merge.rc:2731 #, c-format -msgid "Activates next visible file\nActivate next File" -msgstr " \n " +msgid "" +"Activates next visible file\n" +"Activate next File" +msgstr "" +" \n" +" " #: Merge.rc:2732 #, c-format @@ -5685,8 +5785,12 @@ msgstr " #: Merge.rc:2738 #, c-format -msgid "Opens the WinMerge Help\nWinMerge Help" -msgstr "³ WinMerge\n WinMerge" +msgid "" +"Opens the WinMerge Help\n" +"WinMerge Help" +msgstr "" +"³ WinMerge\n" +" WinMerge" #: Merge.rc:2739 #, c-format @@ -5705,13 +5809,21 @@ msgstr " #: Merge.rc:2742 #, c-format -msgid "Opens the release notes document\nRelease Notes" -msgstr "³ \n " +msgid "" +"Opens the release notes document\n" +"Release Notes" +msgstr "" +"³ \n" +" " #: Merge.rc:2743 #, c-format -msgid "Opens the translations website\nTranslations" -msgstr " \n" +msgid "" +"Opens the translations website\n" +"Translations" +msgstr "" +" \n" +"" #: Merge.rc:2749 #, c-format @@ -5791,7 +5903,7 @@ msgstr " #: Merge.rc:2780 #, c-format msgid "Disabled" -msgstr "" +msgstr "" #: Merge.rc:2781 #, c-format @@ -5806,7 +5918,7 @@ msgstr " #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr " " #: Merge.rc:2789 #, c-format @@ -5971,10 +6083,10 @@ msgstr " #: Merge.rc:2825 #, c-format msgid "Show small toolbar" -msgstr " " +msgstr " " #: Merge.rc:2826 #, c-format msgid "Show big toolbar" -msgstr " " +msgstr " " From da27b2c8e5d0411c5893ee084f10dbdf1aac63f1 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 30 Sep 2008 21:35:18 +0000 Subject: [PATCH 124/168] PATCH: [ 2136765 ] Change DownloadUrl[] constant to current URL --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Constants.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 123f457083d..7370dcab2cf 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -4,6 +4,7 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.2 + Change download URL to current URL (#2136765) BugFix: Case-sensitive regexp search didn't work (#1991259) Translation updates: - Ukrainian (#2131753) diff --git a/Src/Constants.h b/Src/Constants.h index fbff08a2363..881a2e0af81 100644 --- a/Src/Constants.h +++ b/Src/Constants.h @@ -26,7 +26,7 @@ const TCHAR TranslationsUrl[] = _T("http://winmerge.org/translations/"); const TCHAR LicenceUrl[] = _T("http://www.gnu.org/licenses/gpl-2.0.html"); /** @brief WinMerge download page URL. */ -const TCHAR DownloadUrl[] = _T("http://winmerge.org/downloads.php"); +const TCHAR DownloadUrl[] = _T("http://winmerge.org/downloads/"); /** @brief Relative (to WinMerge executable ) path to local help file. */ const TCHAR DocsPath[] = _T("\\Docs\\WinMerge.chm"); From 9d3dddfefb4dbc3832ae64f7f52c2208d548d22e Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 6 Oct 2008 19:31:59 +0000 Subject: [PATCH 125/168] PATCH: [ 2120685 ] Galician translation Submitted by Medulio --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/Contributors.txt | 5 +- .../Languages/Brazilian_Portuguese.isl | 1 + Installer/InnoSetup/Languages/Bulgarian.isl | 1 + Installer/InnoSetup/Languages/Catalan.isl | 1 + .../Languages/Chinese_Simplified.isl | 1 + .../Languages/Chinese_Traditional.isl | 1 + Installer/InnoSetup/Languages/Croatian.isl | 1 + Installer/InnoSetup/Languages/Czech.isl | 1 + Installer/InnoSetup/Languages/Danish.isl | 1 + Installer/InnoSetup/Languages/Dutch.isl | 1 + Installer/InnoSetup/Languages/English.isl | 1 + Installer/InnoSetup/Languages/French.isl | 1 + Installer/InnoSetup/Languages/Galician.isl | 382 + Installer/InnoSetup/Languages/German.isl | 1 + Installer/InnoSetup/Languages/Greek.isl | 1 + Installer/InnoSetup/Languages/Hungarian.isl | 1 + Installer/InnoSetup/Languages/Italian.isl | 1 + Installer/InnoSetup/Languages/Japanese.isl | 1 + Installer/InnoSetup/Languages/Korean.isl | 1 + Installer/InnoSetup/Languages/Norwegian.isl | 1 + Installer/InnoSetup/Languages/Polish.isl | 1 + Installer/InnoSetup/Languages/Portuguese.isl | 1 + Installer/InnoSetup/Languages/Romanian.isl | 1 + Installer/InnoSetup/Languages/Russian.isl | 1 + Installer/InnoSetup/Languages/Slovak.isl | 1 + Installer/InnoSetup/Languages/Slovenian.isl | 1 + Installer/InnoSetup/Languages/Spanish.isl | 1 + Installer/InnoSetup/Languages/Swedish.isl | 1 + Installer/InnoSetup/Languages/Turkish.isl | 1 + Installer/InnoSetup/Languages/Ukrainian.isl | 1 + Installer/InnoSetup/WinMerge.iss | 5 + Src/Languages/Galician.po | 6503 +++++++++++++++++ 33 files changed, 6923 insertions(+), 1 deletion(-) create mode 100644 Installer/InnoSetup/Languages/Galician.isl create mode 100644 Src/Languages/Galician.po diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 7370dcab2cf..e8cd5915585 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.2 Change download URL to current URL (#2136765) BugFix: Case-sensitive regexp search didn't work (#1991259) + New translation: Galician (#2120685) Translation updates: - Ukrainian (#2131753) diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt index b99b4c8c269..8799076d472 100644 --- a/Docs/Users/Contributors.txt +++ b/Docs/Users/Contributors.txt @@ -57,7 +57,10 @@ Localization: Gil Andre Laurent Ganier Matthieu Pupat - + +* Galician: + Medulio + * German: Tim Gerundt Winfried Peter diff --git a/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl b/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl index df105128b6a..62a9b070c4c 100755 --- a/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl +++ b/Installer/InnoSetup/Languages/Brazilian_Portuguese.isl @@ -344,6 +344,7 @@ CzechLanguage=Menus e di DanishLanguage=Menus e dilogos dinamarqueses DutchLanguage=Menus e dilogos holandeses FrenchLanguage=Menus e dilogos franceses +GalicianLanguage=Galician menus and dialogs GermanLanguage=Menus e dilogos alemes GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Bulgarian.isl b/Installer/InnoSetup/Languages/Bulgarian.isl index 1382b9b6ae9..b435c6d6a2c 100755 --- a/Installer/InnoSetup/Languages/Bulgarian.isl +++ b/Installer/InnoSetup/Languages/Bulgarian.isl @@ -346,6 +346,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Catalan.isl b/Installer/InnoSetup/Languages/Catalan.isl index 0d61903cc8e..5b9158b90ae 100755 --- a/Installer/InnoSetup/Languages/Catalan.isl +++ b/Installer/InnoSetup/Languages/Catalan.isl @@ -329,6 +329,7 @@ CzechLanguage=Men DanishLanguage=Mens i dilegs en Dans DutchLanguage=Mens i dilegs en Neerlands FrenchLanguage=Mens i dilegs en Francs +GalicianLanguage=Galician menus and dialogs GermanLanguage=Mens i dilegs en Alemany GreekLanguage=Greek menus and dialogs HungarianLanguage=Mens i dilegs en Hongars diff --git a/Installer/InnoSetup/Languages/Chinese_Simplified.isl b/Installer/InnoSetup/Languages/Chinese_Simplified.isl index e7b7d55ca55..ef8a1b673c0 100755 --- a/Installer/InnoSetup/Languages/Chinese_Simplified.isl +++ b/Installer/InnoSetup/Languages/Chinese_Simplified.isl @@ -336,6 +336,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Chinese_Traditional.isl b/Installer/InnoSetup/Languages/Chinese_Traditional.isl index 4a83794d59a..dae64dc8e10 100755 --- a/Installer/InnoSetup/Languages/Chinese_Traditional.isl +++ b/Installer/InnoSetup/Languages/Chinese_Traditional.isl @@ -343,6 +343,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Croatian.isl b/Installer/InnoSetup/Languages/Croatian.isl index 508750ac568..a3c572f7ef0 100644 --- a/Installer/InnoSetup/Languages/Croatian.isl +++ b/Installer/InnoSetup/Languages/Croatian.isl @@ -339,6 +339,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Czech.isl b/Installer/InnoSetup/Languages/Czech.isl index b15d43d3065..4c03f1ce474 100755 --- a/Installer/InnoSetup/Languages/Czech.isl +++ b/Installer/InnoSetup/Languages/Czech.isl @@ -344,6 +344,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Danish.isl b/Installer/InnoSetup/Languages/Danish.isl index d251b706cfd..c53fa887078 100755 --- a/Installer/InnoSetup/Languages/Danish.isl +++ b/Installer/InnoSetup/Languages/Danish.isl @@ -345,6 +345,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Dutch.isl b/Installer/InnoSetup/Languages/Dutch.isl index 8a66eca3165..8f5a50bb609 100755 --- a/Installer/InnoSetup/Languages/Dutch.isl +++ b/Installer/InnoSetup/Languages/Dutch.isl @@ -323,6 +323,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/English.isl b/Installer/InnoSetup/Languages/English.isl index 5a586e42293..4a79de5713e 100755 --- a/Installer/InnoSetup/Languages/English.isl +++ b/Installer/InnoSetup/Languages/English.isl @@ -346,6 +346,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/French.isl b/Installer/InnoSetup/Languages/French.isl index 597c88674aa..83d2eed1c97 100755 --- a/Installer/InnoSetup/Languages/French.isl +++ b/Installer/InnoSetup/Languages/French.isl @@ -338,6 +338,7 @@ CzechLanguage=Menus et dialogues Tch DanishLanguage=Menus et dialogues Danois DutchLanguage=Menus et dialogues Nerlandais FrenchLanguage=Menus et dialogues Franais +GalicianLanguage=Galician menus and dialogs GermanLanguage=Menus et dialogues Allemand GreekLanguage=Greek menus and dialogs HungarianLanguage=Menus et dialogues Hongrois diff --git a/Installer/InnoSetup/Languages/Galician.isl b/Installer/InnoSetup/Languages/Galician.isl new file mode 100644 index 00000000000..17a0afcd88d --- /dev/null +++ b/Installer/InnoSetup/Languages/Galician.isl @@ -0,0 +1,382 @@ +; *** Inno Setup version 5.1.11+ Galician messages *** +; +; Translated by Jos Antonio Cidre Bardels (Medulio) - (medulio@ciberirmandade.org) +; +; To download user-contributed translations of this file, go to: +; http://www.jrsoftware.org/is3rdparty.php +; +; Note: When translating this text, do not add periods (.) to the end of +; messages that didn't have them already, because on those messages Inno +; Setup adds the periods automatically (appending a period would result in +; two periods being displayed). + +[LangOptions] +; The following three entries are very important. Be sure to read and +; understand the '[LangOptions] section' topic in the help file. +LanguageName=Galego +LanguageID=$0456 +LanguageCodePage=1252 +; If the language you are translating to requires special font faces or +; sizes, uncomment any of the following entries and change them accordingly. +;DialogFontName= +;DialogFontSize=8 +;WelcomeFontName=Verdana +;WelcomeFontSize=12 +;TitleFontName=Arial +;TitleFontSize=29 +;CopyrightFontName=Arial +;CopyrightFontSize=8 + +[Messages] + +; *** Application titles +SetupAppTitle=Instalacin +SetupWindowTitle=Instalacin de %1 +UninstallAppTitle=Desinstalacin +UninstallAppFullTitle=Desinstalacin de %1 + +; *** Misc. common +InformationTitle=Informacin +ConfirmTitle=Confirmacin +ErrorTitle=Erro + +; *** SetupLdr messages +SetupLdrStartupMessage=Vaise instalar %1. Queres continuar? +LdrCannotCreateTemp=Non se puido crear un arquivo temporal. Instalacin cancelada +LdrCannotExecTemp=Non se puido executa-lo arquivo no directorio temporal. Instalacin cancelada + +; *** Startup error messages +LastErrorMessage=%1.%n%nErro %2: %3 +SetupFileMissing=Non se atopou o arquivo %1 no directorio da instalacin. Por favor, corrixe o problema ou consegue unha nova copia do programa. +SetupFileCorrupt=Os arquivos de instalacin estn danados. Por favor, consegue unha nova copia do programa. +SetupFileCorruptOrWrongVer=Os arquivos de instalacin estn danados ou sonche incompatibles con esta versin do Instalador. Por favor, corrixe o problema ou consegue unha nova copia do programa. +NotOnThisPlatform=Este programa non funcionar baixo %1. +OnlyOnThisPlatform=Este programa s funcionar baixo %1. +OnlyOnTheseArchitectures=Este programa s se pode instalar en versins do Windows deseadas para as seguintes arquitecturas de procesadores:%n%n%1 +MissingWOW64APIs=A versin do Windows que ests a utilizar non incle as funcionalidades requeridas polo Instalador para efectuar unha instalacin de 64 bits. Para corrixir este problema, por favor, instala o Service Pack %1. +WinVersionTooLowError=Este programa require %1 versin %2 ou posterior. +WinVersionTooHighError=Este programa non se pode instalar baixo %1 versin %2 ou posterior. +AdminPrivilegesRequired=Ts que entrar no sistema coma administrador para poder instalar este programa. +PowerUserPrivilegesRequired=Ts que entrar no sistema coma administrador ou ben coma membro do grupo de usuarios con privilexios para poder instalar este programa. +SetupAppRunningError=O Instalador detectou que %1 est executndose nestes intres.%n%nPor favor, pecha o programa e logo preme Aceptar para continuar ou Cancelar para sair. +UninstallAppRunningError=O Instalador detectou que %1 est executndose nestes intres.%n%nPor favor, pecha o programa e logo preme Aceptar para continuar ou Cancelar para sair. + +; *** Misc. errors +ErrorCreatingDir=O Instalador non puido crea-lo directorio "%1" +ErrorTooManyFilesInDir=Non se puido crear un arquivo no directorio "%1" xa que contn arquivos de mis + +; *** Setup common messages +ExitSetupTitle=Sair do Instalador +ExitSetupMessage=A instalacin non se completou. Se saes agora o programa non ser instalado.%n%nPodes volver executa-lo programa de Instalacin noutro intre para completa-la mesma.%n%nQueres sair do Instalador? +AboutSetupMenuItem=&Verbo do Instalador... +AboutSetupTitle=Verbo do Instalador +AboutSetupMessage=%1 versin %2%n%3%n%nPxina web de %1:%n%4 +AboutSetupNote= +TranslatorNote= + +; *** Buttons +ButtonBack=< &Volver +ButtonNext=&Seguinte > +ButtonInstall=&Instalar +ButtonOK=Aceptar +ButtonCancel=Cancelar +ButtonYes=&Si +ButtonYesToAll=Confirmar &Todo +ButtonNo=&Non +ButtonNoToAll=N&on a Todo +ButtonFinish=&Rematar +ButtonBrowse=&Explorar... +ButtonWizardBrowse=Explo&rar... +ButtonNewFolder=&Crear Novo Cartafol + +; *** "Select Language" dialog messages +SelectLanguageTitle=Escolle-lo Idioma de Instalacin +SelectLanguageLabel=Selecciona o Idioma a usar durante a Instalacin: + +; *** Common wizard text +ClickNext=Preme Seguinte para continuar, ou Cancelar para sair do Instalador. +BeveledLabel= +BrowseDialogTitle=Explorar Cartafol +BrowseDialogLabel=Selecciona un cartafol da seguinte lista e pulsa Aceptar. +NewFolderName=Novo Cartafol + +; *** "Welcome" wizard page +WelcomeLabel1=Benvido asistente de instalacin de [name] +WelcomeLabel2=Vaise instalar [name/ver] no teu ordenador.%n%n recomendable que peches tdalas outras aplicacins que se estean a executar denantes de inicia-la Instalacin. + +; *** "Password" wizard page +WizardPassword=Contrasinal +PasswordLabel1=Esta Instalacin est protexida por contrasinal. +PasswordLabel3=Por favor, introduce o contrasinal e logo preme Seguinte para continuar. Os contrasinais son sensibles s maisculas/minsculas. +PasswordEditLabel=&Contrasinal: +IncorrectPassword=O contrasinal introducido incorrecto. Por favor, proba outra vez. + +; *** "License Agreement" wizard page +WizardLicense=Conformidade coa Licencia de Uso +LicenseLabel=Por favor, le a seguinte informacin de importancia antes de continuar. +LicenseLabel3=Por favor, lee a seguinte Conformidade coa Licencia de Uso. Ts que acepta-los termos deste acordo antes de continuar coa Instalacin. +LicenseAccepted=&Acepto os termos do acordo +LicenseNotAccepted=&Non acepto os termos do acordo + +; *** "Information" wizard pages +WizardInfoBefore=Informacin +InfoBeforeLabel=Por favor, le a seguinte informacin de importancia antes de continuar. +InfoBeforeClickLabel=Cando ests preparado para continuar coa Instalacin, preme Seguinte. +WizardInfoAfter=Informacin +InfoAfterLabel=Por favor, le a seguinte informacin de importancia antes de continuar. +InfoAfterClickLabel=Cando ests preparado para continuar coa Instalacin, preme Seguinte. + +; *** "User Information" wizard page +WizardUserInfo=Informacin do Usuario +UserInfoDesc=Por favor, introduce a ta informacin. +UserInfoName=Nome de &Usuario: +UserInfoOrg=&Organizacin: +UserInfoSerial=Nmero de &Serie: +UserInfoNameRequired=Ts que introducir un nome. + +; *** "Select Destination Location" wizard page +WizardSelectDir=Selecciona o Directorio de Destio +SelectDirDesc=Onde queres instalar [name]? +SelectDirLabel3=O Instalador vai instalar [name] no seguinte cartafol. +SelectDirBrowseLabel=Para continuar, preme Seguinte. Se queres seleccionar outro cartafol, preme Explorar. +DiskSpaceMBLabel=O programa require polo menos [mb] MB de espazo ceibe no disco. +ToUNCPathname=O Instalador non pode instala-lo programa nun nome de directorio UNC. Se ests tentando face-la instalacin nunha rede, ters que asignar unha letra (D:, E:, F:, etc) disco de destio. +InvalidPath=Ts que introducir un enderezo completo con letra da unidade de disco; por exemplo:%n%nC:\Aplicacin%n%nou ben unha ruta UNC do seguinte xeito:%n%n\\servidor\compartido +InvalidDrive=O disco ou enderezo UNC de rede que seleccionaches non accesible. Por favor, selecciona outro. +DiskSpaceWarningTitle=Non hai Espazo dabondo no Disco +DiskSpaceWarning=O Instalador require polo menos %1 KB de espazo ceibe para a instalacin, pero o disco que escolleches s ten %2 KB dispoibles.%n%nQueres continuar de tdolos xeitos? +DirNameTooLong=O nome do cartafol ou da ruta e longo de mis. +InvalidDirName=O nome de cartafol non vlido. +BadDirName32=Os nomes de directorio non poden incluir calquera dos caracteis seguintes:%n%n%1 +DirExistsTitle=O Directorio Xa Existe +DirExists=O directorio:%n%n%1%n%nxa existe. Queres instala-lo programa neste directorio de tdolos xeitos? +DirDoesntExistTitle=O Directorio Non Existe +DirDoesntExist=O directorio:%n%n%1%n%nnon existe. Queres crealo? + +; *** "Select Components" wizard page +WizardSelectComponents=Elixir Compoentes +SelectComponentsDesc=Cles dos compoentes queres instalar? +SelectComponentsLabel2=Selecciona nicamente os compoentes que queres instalar. Preme seguinte para continuar. +FullInstallation=Instalacin Completa +; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language) +CompactInstallation=Instalacin Compacta +CustomInstallation=Instalacin Persoalizada +NoUninstallWarningTitle=Os Compoentes Xa Existen +NoUninstallWarning=O Instalador detectou que os seguintes compoentes xa estn instalados no teu ordenador:%n%n%1%n%nDeseleciona-los compoentes non os vai desinstalar.%n%nQueres continuar de tdolos xeitos? +ComponentSize1=%1 KB +ComponentSize2=%1 MB +ComponentsDiskSpaceMBLabel=A seleccin que fixeches require polo menos [mb] MB de espazo ceibe no disco. + +; *** "Select Additional Tasks" wizard page +WizardSelectTasks=Seleccionar Procesos Adicionais +SelectTasksDesc=Que procesos adicionais deben efectuarse? +SelectTasksLabel2=Selecciona os procesos adicionais que queres que o Instalador leve a cabo durante a instalacin de [name], logo preme Seguinte. + +; *** "Select Start Menu Folder" wizard page +WizardSelectProgramGroup=Seleccionar Cartafol do Men de Inicio +SelectStartMenuFolderDesc=Onde queres que o Instalador xere as ligazns do programa? +SelectStartMenuFolderLabel3=O Instalador vai crea-las ligazns s programas no seguinte cartafol do Men de Inicio. +SelectStartMenuFolderBrowseLabel=Para continuar, preme Seguinte. Se queres seleccionar outro cartafol, preme Explorar. +MustEnterGroupName=Ts que introducir un nome de cartafol. +GroupNameTooLong=O nome do cartafol ou da ruta e longo de mis. +InvalidGroupName=O nome de cartafol non vlido. +BadGroupName=O nome de cartafol non pode incluir ningn dos seguintes caracteis:%n%n%1 +NoProgramGroupCheck2=&Non crear cartafol no Men de Inicio + +; *** "Ready to Install" wizard page +WizardReady=Preparado para Instalar +ReadyLabel1=O Instalador est preparado para comezar instalar [name] no teu ordenador. +ReadyLabel2a=Preme Instalar para continuar coa instalacin ou preme Volver se queres revisar ou troca-las opcins escollidas. +ReadyLabel2b=Preme Instalar para continuar coa instalacin. +ReadyMemoUserInfo=Informacin de Usuario: +ReadyMemoDir=Directorio de destio: +ReadyMemoType=Tipo de Instalacin: +ReadyMemoComponents=Compeentes seleccionados: +ReadyMemoGroup=Cartafol do Men Inicio: +ReadyMemoTasks=Procesos adicionais: + +; *** "Preparing to Install" wizard page +WizardPreparing=Preparando a Instalacin +PreparingDesc=O Instalador est a prepara-la instalacin de [name] no teu ordenador. +PreviousInstallNotCompleted=A instalacin/desinstalacin dun programa anterior non foi completada. Ters que reinicia-lo teu ordenador para completar este instalacin.%n%nLogo de ter reiniciado o teu ordenador, executa o Instalador outra vez para completa-la instalacin de [name]. +CannotContinue=O Instalador non pode continuar. Por favor, preme Cancelar para sair. + +; *** "Installing" wizard page +WizardInstalling=Instalando +InstallingLabel=Por favor, agarda mentres o Instalador instala [name] no teu ordenador. + +; *** "Setup Completed" wizard page +FinishedHeadingLabel=Rematando o Asistente de Instalacin de [name] +FinishedLabelNoIcons=O Instalador rematou de instalar [name] no teu ordenador. +FinishedLabel=O Instalador rematou de instalar [name] no teu ordenador. Podes executa-la aplicacin seleccionado as iconas instaladas. +ClickFinish=Preme Rematar para sair do Instalador. +FinishedRestartLabel=Para completa-la instalacin de [name] o Instalador tn que reinicia-lo teu ordenador. Queres reinicialo agora? +FinishedRestartMessage=Para completa-la instalacin de [name] o Instalador tn que reinicia-lo teu ordenador. %n%nQueres reinicialo agora? +ShowReadmeCheck=Si, quero ve-lo arquivo LEME agora +YesRadio=&Si, quero reinicia-lo ordenador agora +NoRadio=&Non, reiniciarei o ordenador logo +; used for example as 'Run MyProg.exe' +RunEntryExec=Executar %1 +; used for example as 'View Readme.txt' +RunEntryShellExec=Ver %1 + +; *** "Setup Needs the Next Disk" stuff +ChangeDiskTitle=O Instalador Precisa o Disco Seguinte +SelectDiskLabel2=Por favor, inserta o Disco %1 e preme Aceptar.%n%nSe os arquivos deste disco se poden atopar noutro cartafol diferente amosado a continuacin, introduce a ruta correcta ou preme Explorar. +PathLabel=&Ruta: +FileNotInDir2=Non se puido atopa-lo arquivo "%1" en "%2". Por favor, inserta o disco correcto ou escolle outro cartafol. +SelectDirectoryLabel=Por favor, indica onde se atopa o disco seguinte. + +; *** Installation phase messages +SetupAborted=A Instalacin non foi completada.%n%nPor favor, corrixe o problema e executa o Instalador de novo. +EntryAbortRetryIgnore=Preme Reintentar para volta-lo tentar, Ignorar para continuar de tdolos xeitos, ou Abortar para cancela-la instalacin. + +; *** Installation status messages +StatusCreateDirs=Creando directorios... +StatusExtractFiles=Extraendo arquivos... +StatusCreateIcons=Creando iconas do programa... +StatusCreateIniEntries=Creando entradas de arquivo INI... +StatusCreateRegistryEntries=Creando entradas de rexistro... +StatusRegisterFiles=Rexistrando arquivos... +StatusSavingUninstall=Gardando informacin de desinstalacin... +StatusRunProgram=Rematando instalacin... +StatusRollback=Desfacendo trocos... + +; *** Misc. errors +ErrorInternal2=Erro Interno: %1 +ErrorFunctionFailedNoCode=%1 fallou +ErrorFunctionFailed=%1 fallou; cdigo %2 +ErrorFunctionFailedWithMessage=%1 fallou; cdigo %2.%n%3 +ErrorExecutingProgram=Non se pode executa-lo arquivo:%n%1 + +; *** Registry errors +ErrorRegOpenKey=Erro abri-la chave de rexistro:%n%1\%2 +ErrorRegCreateKey=Erro crea-la chave de rexistro:%n%1\%2 +ErrorRegWriteKey=Erro escribi-la chave de rexistro:%n%1\%2 + +; *** INI errors +ErrorIniEntry=Erro crea-la entrada INI no arquivo "%1". + +; *** File copying errors +FileAbortRetryIgnore=Preme Reintentar para tentalo de novo, Ignorar para saltar este arquivo (non recomendado), ou Abortar para cancela-la instalacin. +FileAbortRetryIgnore2=Preme Reintentar para tentalo de novo, Ignorar para continuar de tdolos xeitos (non recomendado), ou Abortar para cancela-la instalacin. +SourceIsCorrupted=O arquivo de orixe est corrupto +SourceDoesntExist=O arquivo de orixe "%1" non existe +ExistingFileReadOnly=O arquivo existente s de lectura.%n%nPreme Reintentar para tira-lo atributo de s lectura e tentalo de novo, Ignorar para saltar este arquivo, ou Abortar para cancela-la instalacin. +ErrorReadingExistingDest=Houbo un erro tentar le-lo arquivo: +FileExists=O arquivo xa existe.%n%nQueres sobreescribilo? +ExistingFileNewer=O arquivo existente mis novo que o que ests tentando instalar. Recomndase que conserves o arquivo existente.%n%nQueres mante-lo arquivo existente? +ErrorChangingAttr=Houbo un erro o tentar de muda-los atributos do arquivo: +ErrorCreatingTemp=Houbo un erro o tentar crea-lo arquivo no directorio de destio: +ErrorReadingSource=Houbo un erro o tentar le-lo arquivo de orixe: +ErrorCopying=Houbo un erro o tentar copia-lo arquivo: +ErrorReplacingExistingFile=Houbo un erro o tentar de reemplaza-lo arquivo: +ErrorRestartReplace=Reemplazar fallou: +ErrorRenamingTemp=Houbo un erro o tentar renomea-lo arquivo no directorio de destio: +ErrorRegisterServer=Non se puido rexistra-lo DLL/OCX: %1 +ErrorRegSvr32Failed=O RegSvr32 fallou indicando este cdigo de sada: %1 +ErrorRegisterTypeLib=Non se puido rexistra-la librara de tipo: %1 + +; *** Post-installation errors +ErrorOpeningReadme=Houbo un erro o tentar abri-lo arquivo LEME. +ErrorRestartingComputer=O Instalador non puido reinicia-lo ordenador. Por favor, faino manualmente. + +; *** Uninstaller messages +UninstallNotFound=O arquivo "%1" non existe. Non se pode desinstalar. +UninstallOpenError=O arquivo "%1" non se puido abrir. Non se pode desinstalar +UninstallUnsupportedVer=O arquivo de desinstalacin "%1" est nun formato non recoecible por esta versin no desinstalador. Non se pode desinstalar +UninstallUnknownEntry=Atopouse unha entrada descoecida (%1) no arquivo de desinstalacin +ConfirmUninstall=Seguro que queres desinstalar completamente %1 e tdolos seus compoentes? +UninstallOnlyOnWin64=Esta instalacin s pode desinstalarse nun Windows de 64 bits. +OnlyAdminCanUninstall=Esta instalacin s a pode desinstalar un usuario con privilexios de administrador. +UninstallStatusLabel=Por favor, agarda mentres se elimina %1 do teu ordenador. +UninstalledAll=%1 foi correctamente desinstalado do teu ordenador. +UninstalledMost=Desinstalacin de %1 completa.%n%nAlgns elementos non puideron ser eliminados. Ters que borralos manualmente. +UninstalledAndNeedsRestart=Para completa-la desinstalacin de %1, ters que reinicia-lo teu ordenador.%n%nQueres reinicia-lo agora? +UninstallDataCorrupted=O arquivo "%1" est corrupto. Non se pode desinstalar + +; *** Uninstallation phase messages +ConfirmDeleteSharedFileTitle=Queres elimina-lo arquivo compartido? +ConfirmDeleteSharedFile2=O sistema indica que o seguinte arquivo compartido xa non se usa por parte de ningn programa. Queres que o desinstalador elimine este arquivo compartido?%n%nSe algn programa necesita este arquivo e o eliminas, eses programas poden non funcionar correctamente. Se non ests seguro escolle Non. Deixa-lo arquivo no teu sistema non causar problemas. +SharedFileNameLabel=Nome do arquivo: +SharedFileLocationLabel=Localizacin: +WizardUninstalling=Estado da Desinstalacin +StatusUninstalling=Desinstalando %1... + +; The custom messages below aren't used by Setup itself, but if you make +; use of them in your scripts, you'll want to translate them. + +[CustomMessages] + +NameAndVersion=%1 versin %2 +AdditionalIcons=Iconas adicionais +OptionalFeatures=Optional Features:: +CreateDesktopIcon=Crear unha icona no &escritorio +CreateQuickLaunchIcon=Crear unha icona no Inicio &Rpido +ProgramOnTheWeb=%1 na Web +UninstallProgram=Desinstalar %1 +LaunchProgram=Iniciar %1 +AssocFileExtension=&Asociar %1 coa extensin de arquivo %2 +AssocingFileExtension=Asociando %1 coa extensin de arquivo %2... + +;Things we can also localize +CompanyName=Thingamahoochie Software + +;Types +TypicalInstallation=Typical Installation +FullInstallation=Full Installation +CompactInstallation=Compact Installation +CustomInstallation=Custom Installation + +;Components +AppCoreFiles=WinMerge Core Files +Filters=Filters +Plugins=Plugins + +;Localization Components +Languages=Languages +BulgarianLanguage=Bulgarian menus and dialogs +CatalanLanguage=Catalan menus and dialogs +ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs +ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs +CroatianLanguage=Croatian menus and dialogs +CzechLanguage=Czech menus and dialogs +DanishLanguage=Danish menus and dialogs +DutchLanguage=Dutch menus and dialogs +FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs +GermanLanguage=German menus and dialogs +GreekLanguage=Greek menus and dialogs +HungarianLanguage=Hungarian menus and dialogs +ItalianLanguage=Italian menus and dialogs +JapaneseLanguage=Japanese menus and dialogs +KoreanLanguage=Korean menus and dialogs +NorwegianLanguage=Norwegian menus and dialogs +PolishLanguage=Polish menus and dialogs +PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs +PortugueseLanguage=Portuguese menus and dialogs +RomanianLanguage=Romanian menus and dialogs +RussianLanguage=Russian menus and dialogs +SlovakLanguage=Slovak menus and dialogs +SlovenianLanguage=Slovenian menus and dialogs +SpanishLanguage=Spanish menus and dialogs +SwedishLanguage=Swedish menus and dialogs +TurkishLanguage=Turkish menus and dialogs +UkrainianLanguage=Ukrainian menus and dialogs + +;Tasks +ExplorerContextMenu=&Enable Explorer context menu integration +IntegrateTortoiseCVS=Integrate with &TortoiseCVS +IntegrateTortoiseSVN=Integrate with T&ortoiseSVN +IntegrateClearCase=Integrate with Rational &ClearCase + +;Icon Labels +ReadMe=Read Me +UsersGuide=User's Guide +ViewStartMenuFolder=&View the WinMerge Start Menu Folder + +;Code Dialogs +DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder? + +; Project file description +ProjectFileDesc=WinMerge Project file diff --git a/Installer/InnoSetup/Languages/German.isl b/Installer/InnoSetup/Languages/German.isl index 5763ef7c9cc..617899de0aa 100755 --- a/Installer/InnoSetup/Languages/German.isl +++ b/Installer/InnoSetup/Languages/German.isl @@ -335,6 +335,7 @@ CzechLanguage=Tschechische Men DanishLanguage=Dnische Mens und Dialoge DutchLanguage=Hollndische Mens und Dialoge FrenchLanguage=Franzsische Mens und Dialoge +GalicianLanguage=Galician menus and dialogs GermanLanguage=Deutsche Mens und Dialoge GreekLanguage=Griechische Mens und Dialoge HungarianLanguage=Ungarische Mens und Dialoge diff --git a/Installer/InnoSetup/Languages/Greek.isl b/Installer/InnoSetup/Languages/Greek.isl index ea03d0a2054..b32d120b199 100644 --- a/Installer/InnoSetup/Languages/Greek.isl +++ b/Installer/InnoSetup/Languages/Greek.isl @@ -346,6 +346,7 @@ CzechLanguage= DanishLanguage= DutchLanguage= FrenchLanguage= +GalicianLanguage=Galician menus and dialogs GermanLanguage= GreekLanguage=Greek menus and dialogs HungarianLanguage= diff --git a/Installer/InnoSetup/Languages/Hungarian.isl b/Installer/InnoSetup/Languages/Hungarian.isl index 8e05c5e039a..096e8fbac46 100755 --- a/Installer/InnoSetup/Languages/Hungarian.isl +++ b/Installer/InnoSetup/Languages/Hungarian.isl @@ -365,6 +365,7 @@ CzechLanguage=Cseh men DanishLanguage=Dn menk s prbeszdablakok DutchLanguage=Holland menk s prbeszdablakok FrenchLanguage=Francia menk s prbeszdablakok +GalicianLanguage=Galician menus and dialogs GermanLanguage=Nmet menk s prbeszdablakok GreekLanguage=Greek menus and dialogs HungarianLanguage=Magyar menk s prbeszdablakok diff --git a/Installer/InnoSetup/Languages/Italian.isl b/Installer/InnoSetup/Languages/Italian.isl index a5bcb7baf8c..007bfea2033 100755 --- a/Installer/InnoSetup/Languages/Italian.isl +++ b/Installer/InnoSetup/Languages/Italian.isl @@ -349,6 +349,7 @@ CzechLanguage=Menu e finestre di dialogo in ceco DanishLanguage=Menu e finestre di dialogo in danese DutchLanguage=Menu e finestre di dialogo in olandese FrenchLanguage=Menu e finestre di dialogo in francese +GalicianLanguage=Galician menus and dialogs GermanLanguage=Menu e finestre di dialogo in tedesco GreekLanguage=Greek menus and dialogs HungarianLanguage=Menu e finestre di dialogo in ungherese diff --git a/Installer/InnoSetup/Languages/Japanese.isl b/Installer/InnoSetup/Languages/Japanese.isl index 37e5c39af13..d99520662b4 100755 --- a/Installer/InnoSetup/Languages/Japanese.isl +++ b/Installer/InnoSetup/Languages/Japanese.isl @@ -338,6 +338,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Korean.isl b/Installer/InnoSetup/Languages/Korean.isl index 8c996f7f37b..60b34417f01 100755 --- a/Installer/InnoSetup/Languages/Korean.isl +++ b/Installer/InnoSetup/Languages/Korean.isl @@ -350,6 +350,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Norwegian.isl b/Installer/InnoSetup/Languages/Norwegian.isl index 35a97d8b1fa..2c1fbbafec9 100755 --- a/Installer/InnoSetup/Languages/Norwegian.isl +++ b/Installer/InnoSetup/Languages/Norwegian.isl @@ -342,6 +342,7 @@ CzechLanguage=Tsjekkiske menyer og dialoger DanishLanguage=Danske menyer og dialoger DutchLanguage=Nederlandske menyer og dialoger FrenchLanguage=Franske menyer og dialoger +GalicianLanguage=Galician menus and dialogs GermanLanguage=Tyske menyer og dialoger GreekLanguage=Greek menus and dialogs HungarianLanguage=Ungarske menyer og dialoger diff --git a/Installer/InnoSetup/Languages/Polish.isl b/Installer/InnoSetup/Languages/Polish.isl index d2103faee72..1d2a23a8c5f 100755 --- a/Installer/InnoSetup/Languages/Polish.isl +++ b/Installer/InnoSetup/Languages/Polish.isl @@ -335,6 +335,7 @@ CzechLanguage=Czeski interfejs DanishLanguage=Dunski interfejs DutchLanguage=Holenderski interfejs FrenchLanguage=Francuski interfejs +GalicianLanguage=Galician menus and dialogs GermanLanguage=Niemiecki interfejs GreekLanguage=Greek menus and dialogs HungarianLanguage=Wegierski interfejs diff --git a/Installer/InnoSetup/Languages/Portuguese.isl b/Installer/InnoSetup/Languages/Portuguese.isl index ad8a30e069c..cd849202d8d 100644 --- a/Installer/InnoSetup/Languages/Portuguese.isl +++ b/Installer/InnoSetup/Languages/Portuguese.isl @@ -327,6 +327,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Romanian.isl b/Installer/InnoSetup/Languages/Romanian.isl index 1cc28e2511b..689b4962484 100644 --- a/Installer/InnoSetup/Languages/Romanian.isl +++ b/Installer/InnoSetup/Languages/Romanian.isl @@ -346,6 +346,7 @@ CzechLanguage=Meniuri si dialoguri DanishLanguage=Meniuri si dialoguri n Daneza DutchLanguage=Meniuri si dialoguri n Olandeza FrenchLanguage=Meniuri si dialoguri n Franceza +GalicianLanguage=Galician menus and dialogs GermanLanguage=Meniuri si dialoguri n Germana GreekLanguage=Greek menus and dialogs HungarianLanguage=Meniuri si dialoguri n Maghiara diff --git a/Installer/InnoSetup/Languages/Russian.isl b/Installer/InnoSetup/Languages/Russian.isl index 545a0af0e9a..5c061c1169f 100755 --- a/Installer/InnoSetup/Languages/Russian.isl +++ b/Installer/InnoSetup/Languages/Russian.isl @@ -333,6 +333,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Slovak.isl b/Installer/InnoSetup/Languages/Slovak.isl index 0cf9cbfeb28..b515c7edef1 100755 --- a/Installer/InnoSetup/Languages/Slovak.isl +++ b/Installer/InnoSetup/Languages/Slovak.isl @@ -274,6 +274,7 @@ CzechLanguage= DanishLanguage=Dnske ponuky a dialgy DutchLanguage=Holandsk ponuky a dialgy FrenchLanguage=Franczske ponuky a dialgy +GalicianLanguage=Galician menus and dialogs GermanLanguage=Nemeck ponuky a dialgy GreekLanguage=Greek menus and dialogs HungarianLanguage=Maarsk ponuky a dialgy diff --git a/Installer/InnoSetup/Languages/Slovenian.isl b/Installer/InnoSetup/Languages/Slovenian.isl index f771b261ae7..e1b91413f98 100644 --- a/Installer/InnoSetup/Languages/Slovenian.isl +++ b/Installer/InnoSetup/Languages/Slovenian.isl @@ -333,6 +333,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Spanish.isl b/Installer/InnoSetup/Languages/Spanish.isl index 0a21e4b0716..9fcce111367 100755 --- a/Installer/InnoSetup/Languages/Spanish.isl +++ b/Installer/InnoSetup/Languages/Spanish.isl @@ -342,6 +342,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Swedish.isl b/Installer/InnoSetup/Languages/Swedish.isl index 86d0e1b8fc6..317b30e26bc 100755 --- a/Installer/InnoSetup/Languages/Swedish.isl +++ b/Installer/InnoSetup/Languages/Swedish.isl @@ -336,6 +336,7 @@ CzechLanguage=Tjeckiska menyer och dialoger DanishLanguage=Danska menyer och dialoger DutchLanguage=Nederlndska menyer och dialoger FrenchLanguage=Franska menyer och dialoger +GalicianLanguage=Galician menus and dialogs GermanLanguage=Tyska menyer och dialoger GreekLanguage=Grekiska menyer och dialoger HungarianLanguage=Ungerska menyer och dialoger diff --git a/Installer/InnoSetup/Languages/Turkish.isl b/Installer/InnoSetup/Languages/Turkish.isl index fa8f3f35c35..75f983c11ac 100755 --- a/Installer/InnoSetup/Languages/Turkish.isl +++ b/Installer/InnoSetup/Languages/Turkish.isl @@ -338,6 +338,7 @@ CzechLanguage=Czech menus and dialogs DanishLanguage=Danish menus and dialogs DutchLanguage=Dutch menus and dialogs FrenchLanguage=French menus and dialogs +GalicianLanguage=Galician menus and dialogs GermanLanguage=German menus and dialogs GreekLanguage=Greek menus and dialogs HungarianLanguage=Hungarian menus and dialogs diff --git a/Installer/InnoSetup/Languages/Ukrainian.isl b/Installer/InnoSetup/Languages/Ukrainian.isl index f59bbddc2f1..e6911322dc2 100644 --- a/Installer/InnoSetup/Languages/Ukrainian.isl +++ b/Installer/InnoSetup/Languages/Ukrainian.isl @@ -342,6 +342,7 @@ DanishLanguage= DutchLanguage= FrenchLanguage= + GalicianLanguage=Galician menus and dialogs GermanLanguage= GreekLanguage=Greek menus and dialogs HungarianLanguage= diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 7b81c30b7c7..a33703c38a6 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -124,6 +124,7 @@ Name: Czech; MessagesFile: Languages\Czech.isl Name: Danish; MessagesFile: Languages\Danish.isl Name: Dutch; MessagesFile: Languages\Dutch.isl Name: French; MessagesFile: Languages\French.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-French.txt +Name: Galician; MessagesFile: Languages\Galician.isl Name: German; MessagesFile: Languages\German.isl Name: Greek; MessagesFile: Languages\Greek.isl; InfoAfterFile: ..\..\Docs\Users\Languages\ReadMe-Greek.txt Name: Hungarian; MessagesFile: Languages\Hungarian.isl @@ -194,6 +195,9 @@ Name: Languages\Dutch; Description: {cm:DutchLanguage}; Flags: disablenouninstal Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not French Name: Languages\French; Description: {cm:FrenchLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: French +Name: Languages\Galician; Description: {cm:GalicianLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not Galician +Name: Languages\Galician; Description: {cm:GalicianLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: Galician + Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full; Languages: not German Name: Languages\German; Description: {cm:GermanLanguage}; Flags: disablenouninstallwarning; Types: full typical compact; Languages: German @@ -385,6 +389,7 @@ Source: ..\..\Src\Languages\Danish.po; DestDir: {app}\Languages; Components: Lan Source: ..\..\Src\Languages\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Docs\Users\Languages\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French +Source: ..\..\Src\Languages\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp Source: ..\..\Docs\Users\Languages\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek diff --git a/Src/Languages/Galician.po b/Src/Languages/Galician.po new file mode 100644 index 00000000000..63f1114963f --- /dev/null +++ b/Src/Languages/Galician.po @@ -0,0 +1,6503 @@ +# This file is part from WinMerge +# Released under the "GNU General Public License" +# +# ID line follows -- this is updated by SVN +# $Id$ +# +msgid "" +msgstr "" +"Project-Id-Version: WinMerge\n" +"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Medulio \n" +"Language-Team: Galician-CiberIrmandade \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Galician\n" +"X-Poedit-SourceCharset: iso-8859-1\n" +"X-Generator: CreateMasterPotFile.vbs\n" +"X-Poedit-Country: Galiza\n" + +#. LANGUAGE, SUBLANGUAGE +#: Merge.rc:22 +#: Merge.rc:51 +#, c-format +msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US" +msgstr "LANG_GALICIAN, SUBLANG_DEFAULT" + +#. Codepage +#: Merge.rc:23 +#: Merge.rc:52 +#, c-format +msgid "1252" +msgstr "1252" + +#: Merge.rc:72 +#: Merge.rc:99 +#, c-format +msgid "C&opy to Right" +msgstr "C&opiar para a dereita" + +#: Merge.rc:73 +#: Merge.rc:100 +#, c-format +msgid "Cop&y to Left" +msgstr "Cop&iar para a esquerda" + +#: Merge.rc:75 +#, c-format +msgid "&Select Line Difference" +msgstr "&Seleccionar diferenzas de lia" + +#: Merge.rc:77 +#, c-format +msgid "&Undo" +msgstr "&Desfacer" + +#: Merge.rc:78 +#, c-format +msgid "&Redo" +msgstr "&Refacer" + +#: Merge.rc:80 +#: Merge.rc:102 +#, c-format +msgid "Cu&t" +msgstr "Cor&tar" + +#: Merge.rc:81 +#: Merge.rc:103 +#: Merge.rc:504 +#, c-format +msgid "&Copy" +msgstr "&Copiar" + +#: Merge.rc:82 +#: Merge.rc:104 +#, c-format +msgid "&Paste" +msgstr "&Colar" + +#: Merge.rc:84 +#: Merge.rc:585 +#, c-format +msgid "&Goto..." +msgstr "&Ir a..." + +#: Merge.rc:86 +#, c-format +msgid "Op&en" +msgstr "&Abrir" + +#: Merge.rc:88 +#: Merge.rc:527 +#: Merge.rc:533 +#, c-format +msgid "with &Registered Application" +msgstr "coa Aplicacin &Rexistrada" + +#: Merge.rc:89 +#: Merge.rc:528 +#: Merge.rc:534 +#, c-format +msgid "with &External Editor" +msgstr "cun editor externo" + +#: Merge.rc:90 +#: Merge.rc:529 +#: Merge.rc:535 +#, c-format +msgid "&with..." +msgstr "&con..." + +#: Merge.rc:110 +#: Merge.rc:191 +#: Merge.rc:308 +#, c-format +msgid "&File" +msgstr "&Arquivo" + +#: Merge.rc:112 +#: Merge.rc:193 +#: Merge.rc:310 +#, c-format +msgid "&New\tCtrl+N" +msgstr "&Novo\tCtrl+N" + +#: Merge.rc:113 +#: Merge.rc:194 +#: Merge.rc:311 +#, c-format +msgid "&Open...\tCtrl+O" +msgstr "&Abrir...\tCtrl+O" + +#: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 +#, c-format +msgid "Op&en Conflict File..." +msgstr "Abrir Arquivo de C&onflito..." + +#: Merge.rc:116 +#: Merge.rc:197 +#: Merge.rc:314 +#, c-format +msgid "Open Pro&ject...\tCtrl+J" +msgstr "Abrir Pro&xecto...\tCtrl+J" + +#: Merge.rc:117 +#: Merge.rc:198 +#: Merge.rc:315 +#, c-format +msgid "Sa&ve Project..." +msgstr "Gar&dar proxecto..." + +#: Merge.rc:119 +#, c-format +msgid "Recent Projects" +msgstr "Proxectos recentes" + +#: Merge.rc:121 +#: Merge.rc:205 +#: Merge.rc:347 +#, c-format +msgid "E&xit" +msgstr "Sar" + +#: Merge.rc:123 +#: Merge.rc:207 +#: Merge.rc:349 +#, c-format +msgid "&Edit" +msgstr "&Editar" + +#: Merge.rc:125 +#: Merge.rc:211 +#: Merge.rc:383 +#, c-format +msgid "&Options..." +msgstr "&Opcins..." + +#: Merge.rc:127 +#: Merge.rc:213 +#: Merge.rc:385 +#, c-format +msgid "&View" +msgstr "&Ver" + +#: Merge.rc:129 +#: Merge.rc:224 +#: Merge.rc:387 +#, c-format +msgid "Select &Font..." +msgstr "Escoller &fonte..." + +#: Merge.rc:130 +#: Merge.rc:225 +#: Merge.rc:388 +#, c-format +msgid "Use Default F&ont" +msgstr "Empregar fonte pr&edefinida" + +#: Merge.rc:132 +#: Merge.rc:227 +#: Merge.rc:409 +#, c-format +msgid "&Toolbar" +msgstr "&Barra de ferramentas" + +#: Merge.rc:134 +#: Merge.rc:229 +#: Merge.rc:411 +#, c-format +msgid "&None" +msgstr "&Ningn" + +#: Merge.rc:135 +#: Merge.rc:230 +#: Merge.rc:412 +#, c-format +msgid "&Small" +msgstr "&Pequeno" + +#: Merge.rc:136 +#: Merge.rc:231 +#: Merge.rc:413 +#, c-format +msgid "&Big" +msgstr "&Grande" + +#: Merge.rc:138 +#: Merge.rc:233 +#: Merge.rc:415 +#, c-format +msgid "&Status Bar" +msgstr "&Barra de estado" + +#: Merge.rc:139 +#: Merge.rc:234 +#: Merge.rc:416 +#, c-format +msgid "Ta&b Bar" +msgstr "&Barra de pestanas" + +#: Merge.rc:141 +#: Merge.rc:237 +#: Merge.rc:420 +#, c-format +msgid "&Language..." +msgstr "&Idioma..." + +#: Merge.rc:143 +#: Merge.rc:258 +#: Merge.rc:442 +#, c-format +msgid "&Tools" +msgstr "&Ferramentas" + +#: Merge.rc:145 +#: Merge.rc:261 +#: Merge.rc:444 +#, c-format +msgid "&Filters..." +msgstr "&Filtros..." + +#: Merge.rc:146 +#: Merge.rc:262 +#: Merge.rc:445 +#, c-format +msgid "&Generate Patch..." +msgstr "&Xerar Patch..." + +#: Merge.rc:148 +#: Merge.rc:265 +#: Merge.rc:448 +#, c-format +msgid "&Plugins" +msgstr "&Plugins" + +#: Merge.rc:150 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "&Listaxe..." + +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 +#, c-format +msgid "&Manual Unpacking" +msgstr "&Desempaquetado manual" + +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 +#, c-format +msgid "&Automatic Unpacking" +msgstr "&Desempaquetado automtico" + +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 +#, c-format +msgid "&Edit with Unpacker" +msgstr "&Editar co desempaquetador" + +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 +#, c-format +msgid "&Reload plugins" +msgstr "&Recargar plugins" + +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 +#, c-format +msgid "&Debug" +msgstr "&Depurar" + +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 +#, c-format +msgid "&Load Config..." +msgstr "&Cargar configuracin..." + +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 +#, c-format +msgid "&Reset Options" +msgstr "&Restaurar opcins" + +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 +#, c-format +msgid "&Window" +msgstr "&Fiestra" + +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 +#, c-format +msgid "Cl&ose" +msgstr "Pe&char" + +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 +#, c-format +msgid "Clo&se All" +msgstr "Pe&char todo" + +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 +#, c-format +msgid "Change &Pane\tF6" +msgstr "Trocar o &panel\tF6" + +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 +#, c-format +msgid "Tile &Horizontally" +msgstr "Ordenar &horizontalmente" + +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 +#, c-format +msgid "Tile &Vertically" +msgstr "Ordenar &verticalmente" + +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 +#, c-format +msgid "&Cascade" +msgstr "&En fervenza" + +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 +#, c-format +msgid "&Help" +msgstr "&Axuda" + +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 +#, c-format +msgid "&WinMerge Help\tF1" +msgstr "Axuda do &WinMerge\tF1" + +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 +#, c-format +msgid "R&elease Notes" +msgstr "Notas da v&ersin" + +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 +#, c-format +msgid "&Translations" +msgstr "&Traducins" + +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 +#, c-format +msgid "C&onfiguration" +msgstr "C&onfiguracin..." + +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 +#, c-format +msgid "A&rchive Support disabled..." +msgstr "S&oporte de arquivos desactivado..." + +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 +#, c-format +msgid "&GNU General Public License" +msgstr "Licenza Pblica Xeral &GNU..." + +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 +#, c-format +msgid "&About WinMerge..." +msgstr "&Acerca de WinMerge..." + +#: Merge.rc:200 +#: Merge.rc:333 +#, c-format +msgid "L&eft Read-only" +msgstr "Banda esquerda s lectura" + +#: Merge.rc:201 +#: Merge.rc:334 +#, c-format +msgid "Ri&ght Read-only" +msgstr "Banda dereita s lectura" + +#: Merge.rc:203 +#, c-format +msgid "File En&coding" +msgstr "A &codificar arquivo" + +#: Merge.rc:209 +#: Merge.rc:359 +#, c-format +msgid "Select &All\tCtrl+A" +msgstr "Seleccion&ar todo\tCtrl+A" + +#: Merge.rc:215 +#, c-format +msgid "Show &Identical Items" +msgstr "Amosar os elementos &idnticos" + +#: Merge.rc:216 +#, c-format +msgid "Show &Different Items" +msgstr "Amosar os elementos &diferentes" + +#: Merge.rc:217 +#, c-format +msgid "Show L&eft Unique Items" +msgstr "Amosar os &elementos nicos da esquerda" + +#: Merge.rc:218 +#, c-format +msgid "Show Ri&ght Unique Items" +msgstr "Amosar elementos nicos da dereita" + +#: Merge.rc:219 +#, c-format +msgid "Show S&kipped Items" +msgstr "Amosar os elementos saltados" + +#: Merge.rc:220 +#, c-format +msgid "S&how Binary Files" +msgstr "Amosar os arq&uivos binarios" + +#: Merge.rc:222 +#, c-format +msgid "Show Hidd&en Items" +msgstr "Amosar os elementos ocu<os" + +#: Merge.rc:235 +#, c-format +msgid "Compa&re Statistics" +msgstr "Estadstic&as da comparacin" + +#: Merge.rc:239 +#: Merge.rc:422 +#, c-format +msgid "Refre&sh\tF5" +msgstr "Refre&scar\tF5" + +#: Merge.rc:240 +#, c-format +msgid "&Refresh Selected\tCtrl+F5" +msgstr "&Refrescar seleccionados\tCtrl+F5" + +#: Merge.rc:242 +#: Merge.rc:424 +#, c-format +msgid "&Merge" +msgstr "&Combinar" + +#: Merge.rc:244 +#, c-format +msgid "Co&mpare\tEnter" +msgstr "Co&mparar\tIntro" + +#: Merge.rc:246 +#: Merge.rc:426 +#, c-format +msgid "&Next Difference\tAlt+Down" +msgstr "Segui&nte diferenza\tAlt+Down" + +#: Merge.rc:247 +#: Merge.rc:427 +#, c-format +msgid "&Previous Difference\tAlt+Up" +msgstr "Diferenza &previa\tAlt+Up" + +#: Merge.rc:249 +#: Merge.rc:429 +#, c-format +msgid "&First Difference\tAlt+Home" +msgstr "&Primeira diferenza\tAlt+Home" + +#: Merge.rc:250 +#: Merge.rc:430 +#, c-format +msgid "&Current Difference\tAlt+Enter" +msgstr "Diferenza a&ctual\tAlt+Intro" + +#: Merge.rc:251 +#: Merge.rc:431 +#, c-format +msgid "&Last Difference\tAlt+End" +msgstr "&Derradeira diferenza\tAlt+End" + +#: Merge.rc:253 +#: Merge.rc:433 +#, c-format +msgid "Copy to &Right\tAlt+Right" +msgstr "Copia&r para a dereita\tAlt+Dereita" + +#: Merge.rc:254 +#: Merge.rc:434 +#, c-format +msgid "Copy to L&eft\tAlt+Left" +msgstr "Copiar para a &esquerda\tAlt+Esquerda" + +#: Merge.rc:256 +#, c-format +msgid "&Delete\tDel" +msgstr "&Borrar\tDel" + +#: Merge.rc:260 +#: Merge.rc:558 +#, c-format +msgid "&Customize Columns..." +msgstr "Personalizar &columnas..." + +#: Merge.rc:263 +#: Merge.rc:446 +#, c-format +msgid "Generate &Report..." +msgstr "Xera&r informe..." + +#: Merge.rc:317 +#, c-format +msgid "&Save\tCtrl+S" +msgstr "&Gardar\tCtrl+S" + +#: Merge.rc:318 +#, c-format +msgid "Save &Left" +msgstr "Gardar banda esquerda" + +#: Merge.rc:320 +#: Merge.rc:325 +#, c-format +msgid "&Save" +msgstr "&Gardar" + +#: Merge.rc:321 +#: Merge.rc:326 +#, c-format +msgid "Save &As..." +msgstr "Gard&ar como..." + +#: Merge.rc:323 +#, c-format +msgid "Save &Right" +msgstr "Gardar banda &dereita" + +#: Merge.rc:329 +#, c-format +msgid "&Print..." +msgstr "&Imprimir..." + +#: Merge.rc:330 +#, c-format +msgid "Page Se&tup" +msgstr "Con&figuracin da pxina" + +#: Merge.rc:331 +#, c-format +msgid "Print Previe&w" +msgstr "Vista previa da impresin" + +#: Merge.rc:336 +#, c-format +msgid "&Convert Line Endings to" +msgstr "&Converter quebras de lia a" + +#: Merge.rc:338 +#, c-format +msgid "&Windows (CRLF)" +msgstr "&Windows (CRLF)" + +#: Merge.rc:339 +#, c-format +msgid "&Unix (LF)" +msgstr "&Unix (LF)" + +#: Merge.rc:340 +#, c-format +msgid "&Mac (CR)" +msgstr "&Mac (CR)" + +#: Merge.rc:343 +#, c-format +msgid "&Merge Mode\tF9" +msgstr "&Modo Combinar\tF9" + +#: Merge.rc:345 +#, c-format +msgid "&File Encoding..." +msgstr "Codificacin do ar&quivo" + +#: Merge.rc:351 +#, c-format +msgid "&Undo\tCtrl+Z" +msgstr "&Desfacer\tCtrl+Z" + +#: Merge.rc:352 +#, c-format +msgid "&Redo\tCtrl+Y" +msgstr "&Refacer\tCtrl+Y" + +#: Merge.rc:354 +#, c-format +msgid "Cu&t\tCtrl+X" +msgstr "Cor&tar\tCtrl+X" + +#: Merge.rc:355 +#, c-format +msgid "&Copy\tCtrl+C" +msgstr "&Copiar\tCtrl+C" + +#: Merge.rc:356 +#, c-format +msgid "&Paste\tCtrl+V" +msgstr "&Colar\tCtrl+V" + +#: Merge.rc:358 +#, c-format +msgid "Select Line &Difference\tF4" +msgstr "Seleccionar &diferenzas de lia\tF4" + +#: Merge.rc:361 +#, c-format +msgid "F&ind...\tCtrl+F" +msgstr "B&uscar...\tCtrl+F" + +#: Merge.rc:362 +#, c-format +msgid "Repla&ce...\tCtrl+H" +msgstr "Substitu&r...\tCtrl+H" + +#: Merge.rc:364 +#, c-format +msgid "&Scripts" +msgstr "&Scripts" + +#: Merge.rc:366 +#: Merge.rc:2752 +#, c-format +msgid "< Empty >" +msgstr "< Baleiro >" + +#: Merge.rc:369 +#, c-format +msgid "Advanced" +msgstr "Avanzado" + +#: Merge.rc:371 +#, c-format +msgid "&Copy With Line Numbers\tCtrl+Shift+C" +msgstr "&Copiar cos nmeros de lia\tCtrl+Shift+C" + +#: Merge.rc:374 +#, c-format +msgid "&Bookmarks" +msgstr "&Marcadores" + +#: Merge.rc:376 +#, c-format +msgid "&Toggle Bookmark\tCtrl+F2" +msgstr "&Cambiar marcador\tCtrl+F2" + +#: Merge.rc:377 +#, c-format +msgid "&Next Bookmark\tF2" +msgstr "&Seguinte marcador\tF2" + +#: Merge.rc:378 +#, c-format +msgid "&Previous bookmark\tShift+F2" +msgstr "&Marcador anterior\tShift+F2" + +#: Merge.rc:379 +#, c-format +msgid "&Clear All Bookmarks" +msgstr "&Borrar todos os marcadores" + +#: Merge.rc:381 +#, c-format +msgid "&Go To...\tCtrl+G" +msgstr "&Ir a...\tCtrl+G" + +#: Merge.rc:389 +#, c-format +msgid "&Zoom" +msgstr "&Zoom" + +#: Merge.rc:391 +#, c-format +msgid "Zoom &In\tCtrl++" +msgstr "&Aumentar\tCtrl++" + +#: Merge.rc:392 +#, c-format +msgid "Zoom &Out\tCtrl+-" +msgstr "&Reducir\tCtrl+-" + +#. Zoom to normal +#: Merge.rc:393 +#, c-format +msgid "&Normal\tCtrl+*" +msgstr "&Normal\tCtrl+*" + +#: Merge.rc:395 +#, c-format +msgid "Syntax Highlight" +msgstr "Resaltar sintaxe" + +#: Merge.rc:400 +#, c-format +msgid "&Lock Panes" +msgstr "B&loquear Paneis" + +#: Merge.rc:401 +#, c-format +msgid "&View Whitespace" +msgstr "&Ver espazos en branco" + +#: Merge.rc:402 +#, c-format +msgid "Vie&w Line Differences" +msgstr "Ve&r diferenzas de lia" + +#: Merge.rc:403 +#, c-format +msgid "View Line &Numbers" +msgstr "Ver os nmeros de lia" + +#: Merge.rc:404 +#, c-format +msgid "View &Margins" +msgstr "Ver as &marxes" + +#: Merge.rc:405 +#, c-format +msgid "W&rap Lines" +msgstr "A&xuste de lias" + +#: Merge.rc:407 +#, c-format +msgid "Sw&ap Panes" +msgstr "In&tercambiar paneis" + +#: Merge.rc:417 +#, c-format +msgid "Diff &Pane" +msgstr "Panel de &diferenzas" + +#: Merge.rc:418 +#, c-format +msgid "Lo&cation Pane" +msgstr "Pane&l de situacin" + +#: Merge.rc:436 +#, c-format +msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" +msgstr "C&opiar para a dereita e avanzar\tAlt+Ctrl+Dereita" + +#: Merge.rc:437 +#, c-format +msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" +msgstr "C&opiar para a esquerda e avanzar\tAlt+Ctrl+Esquerda" + +#: Merge.rc:439 +#, c-format +msgid "Copy &All to Right" +msgstr "Copiar todo ¶ a dereita" + +#: Merge.rc:440 +#, c-format +msgid "Cop&y All to Left" +msgstr "Cop&iar todo para a esquerda" + +#: Merge.rc:457 +#, c-format +msgid "&Prediffer" +msgstr "&Pre-comparacin" + +#: Merge.rc:498 +#, c-format +msgid "Comp&are" +msgstr "Compa&rar" + +#: Merge.rc:499 +#, c-format +msgid "Co&mpare Special" +msgstr "Co&mparar Especial" + +#: Merge.rc:501 +#, c-format +msgid "&XML" +msgstr "&XML" + +#: Merge.rc:506 +#, c-format +msgid "&Left to Right" +msgstr "&Da esquerda para a dereita" + +#: Merge.rc:507 +#, c-format +msgid "L&eft to..." +msgstr "D&a esquerda para..." + +#: Merge.rc:508 +#, c-format +msgid "&Right to Left" +msgstr "&Da dereita para a esquerda" + +#: Merge.rc:509 +#, c-format +msgid "R&ight to..." +msgstr "Da d&ereita para..." + +#: Merge.rc:511 +#, c-format +msgid "&Move" +msgstr "&Mover" + +#: Merge.rc:513 +#, c-format +msgid "&Left to..." +msgstr "&Da esquerda para ..." + +#: Merge.rc:514 +#, c-format +msgid "&Right to..." +msgstr "&Da dereita para..." + +#: Merge.rc:516 +#, c-format +msgid "&Delete" +msgstr "&Borrar" + +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 +#, c-format +msgid "&Left" +msgstr "&Esquerda" + +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 +#, c-format +msgid "&Right" +msgstr "&Dereita" + +#: Merge.rc:520 +#, c-format +msgid "&Both" +msgstr "&Ambos" + +#: Merge.rc:522 +#, c-format +msgid "Re&name" +msgstr "Re&nomear" + +#: Merge.rc:523 +#, c-format +msgid "&Hide Items" +msgstr "&Agochar elementos" + +#: Merge.rc:525 +#, c-format +msgid "&Open Left" +msgstr "&Abrir arquivo esquerdo" + +#: Merge.rc:531 +#, c-format +msgid "O&pen Right" +msgstr "&Abrir arquivo dereito" + +#: Merge.rc:538 +#, c-format +msgid "Cop&y Pathnames" +msgstr "Cop&iar nomes de camio" + +#: Merge.rc:540 +#, c-format +msgid "&Left (%1 of %2)" +msgstr "&Esquerda (%1 de %2)" + +#: Merge.rc:541 +#, c-format +msgid "&Right (%1 of %2)" +msgstr "&Dereita (%1 de %2)" + +#: Merge.rc:542 +#, c-format +msgid "&Both (%1 of %2)" +msgstr "&Ambas (%1 de %2)" + +#: Merge.rc:544 +#, c-format +msgid "Copy &Filenames" +msgstr "Copiar &nomes dos arquivos" + +#: Merge.rc:546 +#, c-format +msgid "&Zip" +msgstr "&Zip" + +#: Merge.rc:548 +#, c-format +msgid "&Left... (%1 of %2)" +msgstr "&Esquerda... (%1 of %2)" + +#: Merge.rc:549 +#, c-format +msgid "&Right... (%1 of %2)" +msgstr "&Dereita... (%1 of %2)" + +#: Merge.rc:550 +#, c-format +msgid "&Both... (%1 of %2)" +msgstr "&Ambos... (%1 of %2)" + +#: Merge.rc:551 +#, c-format +msgid "&Differences... (%1 of %2)" +msgstr "&Diferenzas... (%1 of %2)" + +#: Merge.rc:554 +#, c-format +msgid "&Refresh" +msgstr "&Actualizar" + +#: Merge.rc:566 +#, c-format +msgid "&Copy Full Path" +msgstr "&Copiar o camio completo" + +#: Merge.rc:567 +#, c-format +msgid "Copy &Filename" +msgstr "Copiar o nome do &arquivo" + +#: Merge.rc:573 +#, c-format +msgid "Prediffer Settings" +msgstr "Configuracin da pre-comparacin" + +#: Merge.rc:575 +#, c-format +msgid "&No prediffer" +msgstr "&Sen pre-comparacin" + +#: Merge.rc:576 +#, c-format +msgid "Auto prediffer" +msgstr "Pre-comparacin autom." + +#: Merge.rc:584 +#, c-format +msgid "G&oto Diff" +msgstr "Ir ¶ a diferenza" + +#: Merge.rc:587 +#, c-format +msgid "&No Moved Blocks" +msgstr "&Non mostrar bloques movidos" + +#: Merge.rc:588 +#, c-format +msgid "&All Moved Blocks" +msgstr "&Mostrar todos os bloques movidos" + +#: Merge.rc:589 +#, c-format +msgid "Moved Block for &Current Diff" +msgstr "Amosar bloques movidos desde a &diferenza actual" + +#: Merge.rc:658 +#, c-format +msgid "About WinMerge" +msgstr "Acerca de Winmerge" + +#: Merge.rc:664 +#, c-format +msgid "(Private Build)" +msgstr "(Private Build)" + +#: Merge.rc:665 +#, c-format +msgid "All rights reserved." +msgstr "Reservados todos os dereitos" + +#: Merge.rc:666 +#, c-format +msgid "Visit the WinMerge HomePage!" +msgstr "Visita a Web Oficial de WinMerge!" + +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 +#, c-format +msgid "OK" +msgstr "Aceptar" + +#: Merge.rc:670 +#, c-format +msgid "Contributors" +msgstr "Colaboradores" + +#: Merge.rc:677 +#, c-format +msgid "Select Files or Folders" +msgstr "Seleccionar arquivos ou cartafoles" + +#: Merge.rc:680 +#: Merge.rc:1595 +#, c-format +msgid "&Left:" +msgstr "&Esquerda" + +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 +#, c-format +msgid "&Browse..." +msgstr "&Buscar..." + +#: Merge.rc:685 +#: Merge.rc:1599 +#, c-format +msgid "&Right:" +msgstr "&Dereita" + +#: Merge.rc:689 +#: Merge.rc:1031 +#, c-format +msgid "Bro&wse..." +msgstr "Bus&car..." + +#: Merge.rc:690 +#: Merge.rc:1603 +#, c-format +msgid "&Filter:" +msgstr "&Filtro:" + +#: Merge.rc:693 +#: Merge.rc:1605 +#, c-format +msgid "Select..." +msgstr "Seleccionar..." + +#: Merge.rc:694 +#, c-format +msgid "&Unpacker:" +msgstr "&Desempaquetador:" + +#: Merge.rc:697 +#, c-format +msgid "&Select..." +msgstr "&Seleccionar..." + +#: Merge.rc:698 +#: Merge.rc:1606 +#, c-format +msgid "&Include Subfolders" +msgstr "&Inclundo sub-cartafoles" + +#: Merge.rc:700 +#, c-format +msgid "Status:" +msgstr "Estado:" + +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 +#, c-format +msgid "Cancel" +msgstr "Cancelar" + +#: Merge.rc:703 +#: Merge.rc:1339 +#, c-format +msgid "Help" +msgstr "Axuda" + +#: Merge.rc:704 +#, c-format +msgid "Files or Folders to Compare" +msgstr "Arquivos ou cartafoles a comparar" + +#: Merge.rc:711 +#, c-format +msgid "Visual SourceSafe" +msgstr "Visual SourceSafe" + +#: Merge.rc:716 +#, c-format +msgid "Database:" +msgstr "Base de datos" + +#: Merge.rc:719 +#, c-format +msgid "Project:" +msgstr "Proxecto:" + +#: Merge.rc:722 +#, c-format +msgid "User:" +msgstr "Usuario:" + +#: Merge.rc:724 +#, c-format +msgid "Password:" +msgstr "Sea:" + +#: Merge.rc:726 +#, c-format +msgid "Link to Destination VSS project" +msgstr "Ligazn ao proxecto VSS de destino" + +#: Merge.rc:728 +#: Merge.rc:869 +#, c-format +msgid "Apply to all items" +msgstr "Aplicar a tdos os elementos" + +#: Merge.rc:730 +#, c-format +msgid "Check Out" +msgstr "Desprotexer" + +#: Merge.rc:731 +#: Merge.rc:865 +#, c-format +msgid "Save As..." +msgstr "Gardar como..." + +#: Merge.rc:737 +#, c-format +msgid "Versioning System" +msgstr "Sistema de versionado" + +#: Merge.rc:740 +#, c-format +msgid "&Versioning System:" +msgstr "&Sistema de versionado:" + +#: Merge.rc:743 +#, c-format +msgid "&Path to cleartool.exe:" +msgstr "&Camio a cleartool.exe:" + +#: Merge.rc:750 +#: Merge.rc:1921 +#, c-format +msgid "General" +msgstr "Xeral" + +#: Merge.rc:753 +#, c-format +msgid "Automatically &scroll to first difference" +msgstr "Ir &automaticamente primeira diferenza" + +#: Merge.rc:756 +#, c-format +msgid "&Disable Splash Screen" +msgstr "&Desactivar a pantalla de inicio" + +#: Merge.rc:758 +#, c-format +msgid "Cl&ose windows with ESC" +msgstr "Pechar as fiestras con ESC" + +#: Merge.rc:760 +#, c-format +msgid "&Automatically verify paths in Open-dialog" +msgstr "&Verificar automaticamente os camios no dialogo Abrir" + +#: Merge.rc:763 +#, c-format +msgid "All&ow only one instance to run" +msgstr "Per&mitir s unha instacia en curso" + +#: Merge.rc:765 +#, c-format +msgid "As&k when closing multiple windows" +msgstr "Pr&eguntar antes de pechar varias fiestras" + +#: Merge.rc:767 +#, c-format +msgid "&Preserve file time in file compare" +msgstr "&Preservar data e hora do arquivo nas comparacins de ficheiros" + +#: Merge.rc:770 +#, c-format +msgid "O&pen-dialog Auto-Completion:" +msgstr "A&uto-completar dilogo de apertura:" + +#: Merge.rc:773 +#, c-format +msgid "Enable multiple compare windows for" +msgstr "Activar vents de comparacin mltiples para" + +#: Merge.rc:775 +#: Merge.rc:1618 +#, c-format +msgid "&Folder compare" +msgstr "Comparacin de carta&foles" + +#: Merge.rc:777 +#: Merge.rc:1620 +#, c-format +msgid "Fil&e compare" +msgstr "Comparacin de arq&uivos" + +#: Merge.rc:779 +#, c-format +msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." +msgstr "WinMerge permite ocultar algunhas caixas de mensaxes de uso frecuente. Preme o botn Restaurar para facer visibles todas as mensaxes outra vez." + +#: Merge.rc:781 +#, c-format +msgid "Reset" +msgstr "Restaurar" + +#: Merge.rc:788 +#, c-format +msgid "Language" +msgstr "Idioma" + +#: Merge.rc:795 +#, c-format +msgid "Available languages:" +msgstr "Idiomas dispoibles:" + +#: Merge.rc:801 +#, c-format +msgid "Find" +msgstr "Procurar" + +#: Merge.rc:804 +#: Merge.rc:831 +#, c-format +msgid "Fi&nd what:" +msgstr "&Procurar:" + +#: Merge.rc:807 +#: Merge.rc:837 +#, c-format +msgid "Match &whole word only" +msgstr "S se coinci&de toda a palabra" + +#: Merge.rc:809 +#: Merge.rc:839 +#, c-format +msgid "Match &case" +msgstr "&Coincidir maisc./minsc." + +#: Merge.rc:811 +#: Merge.rc:841 +#, c-format +msgid "Regular &expression" +msgstr "&Expresin Regular" + +#: Merge.rc:813 +#, c-format +msgid "D&on't wrap end of file" +msgstr "N&on sobrepasar o remate do arquivo" + +#: Merge.rc:816 +#, c-format +msgid "Direction" +msgstr "Direccin" + +#: Merge.rc:817 +#, c-format +msgid "&Up" +msgstr "&Arriba" + +#: Merge.rc:819 +#, c-format +msgid "&Down" +msgstr "&Abaixo" + +#: Merge.rc:821 +#: Merge.rc:851 +#, c-format +msgid "&Find Next" +msgstr "&Procurar o seguinte" + +#: Merge.rc:828 +#, c-format +msgid "Replace" +msgstr "Substitur" + +#: Merge.rc:834 +#, c-format +msgid "Re&place with:" +msgstr "Substitur con:" + +#: Merge.rc:843 +#, c-format +msgid "&Don't wrap end of file" +msgstr "&Non sobrepasar o remate do arquivo" + +#: Merge.rc:846 +#, c-format +msgid "Replace in" +msgstr "Substitur en" + +#: Merge.rc:847 +#, c-format +msgid "&Selection" +msgstr "&Seleccin" + +#: Merge.rc:849 +#, c-format +msgid "Wh&ole file" +msgstr "Ar&quivo completo" + +#: Merge.rc:852 +#, c-format +msgid "&Replace" +msgstr "&Substitur" + +#: Merge.rc:853 +#, c-format +msgid "Replace &All" +msgstr "Substitur &todo" + +#: Merge.rc:860 +#: Merge.rc:2164 +#, c-format +msgid "Rational ClearCase" +msgstr "Rational ClearCase" + +#: Merge.rc:863 +#, c-format +msgid "CheckOut" +msgstr "Desprotexer" + +#: Merge.rc:868 +#: Merge.rc:1180 +#, c-format +msgid "Comments" +msgstr "Comentarios" + +#: Merge.rc:871 +#, c-format +msgid "CheckIn after checkout" +msgstr "Protexer despois de desprotexer" + +#: Merge.rc:877 +#, c-format +msgid "Linefilters" +msgstr "Filtros de lia" + +#: Merge.rc:880 +#, c-format +msgid "Enable Line Filters" +msgstr "Activar filtros de lia" + +#: Merge.rc:883 +#, c-format +msgid "Regular Expressions (one per line):" +msgstr "Expresins Regulares (unha por lia):" + +#: Merge.rc:890 +#, c-format +msgid "Save" +msgstr "Gardar" + +#: Merge.rc:891 +#, c-format +msgid "New" +msgstr "Novo" + +#: Merge.rc:892 +#, c-format +msgid "Edit" +msgstr "Editar" + +#: Merge.rc:893 +#, c-format +msgid "Remove" +msgstr "Eliminar" + +#: Merge.rc:898 +#: Merge.rc:1924 +#, c-format +msgid "Colors" +msgstr "Cores" + +#: Merge.rc:901 +#, c-format +msgid "Difference:" +msgstr "Diferenza:" + +#: Merge.rc:905 +#, c-format +msgid "Selected Difference:" +msgstr "Diferenzas seleccionadas:" + +#: Merge.rc:909 +#: Merge.rc:1570 +#, c-format +msgid "Background" +msgstr "Fondo" + +#: Merge.rc:910 +#, c-format +msgid "Deleted" +msgstr "Borrado" + +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 +#, c-format +msgid "Text" +msgstr "Texto" + +#: Merge.rc:927 +#, c-format +msgid "Ignored Difference:" +msgstr "Diferenzas ignoradas:" + +#: Merge.rc:937 +#, c-format +msgid "Moved:" +msgstr "Movidas:" + +#: Merge.rc:947 +#, c-format +msgid "Selected Moved:" +msgstr "Seleccionadas movidas:" + +#: Merge.rc:954 +#, c-format +msgid "Word Difference:" +msgstr "Diferenza de palabras:" + +#: Merge.rc:961 +#, c-format +msgid "Selected Word Diff:" +msgstr "Dif. de palabras seleccionadas:" + +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 +#, c-format +msgid "Defaults" +msgstr "Predeterminados" + +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 +#, c-format +msgid "Dialog" +msgstr "Dilogo" + +#: Merge.rc:984 +#: Merge.rc:1927 +#, c-format +msgid "System" +msgstr "Sistema" + +#: Merge.rc:987 +#, c-format +msgid "&Send deleted files to Recycle Bin" +msgstr "&Enviar os arquivos eliminados para a papeleira" + +#: Merge.rc:989 +#, c-format +msgid "Integration" +msgstr "Integracin" + +#: Merge.rc:990 +#, c-format +msgid "&Add to explorer context menu" +msgstr "&Engadir ao men contextual do explorador" + +#: Merge.rc:992 +#, c-format +msgid "E&nable advanced menu" +msgstr "Ac&tivar men avanzado" + +#: Merge.rc:994 +#, c-format +msgid "In&clude subfolders by default" +msgstr "In&clur sub-cartafoles por defecto" + +#: Merge.rc:996 +#, c-format +msgid "&External editor:" +msgstr "&Editor externo:" + +#: Merge.rc:999 +#, c-format +msgid "&Filter folder:" +msgstr "&Cartafol de filtros:" + +#: Merge.rc:1001 +#, c-format +msgid "B&rowse..." +msgstr "Explo&rar..." + +#: Merge.rc:1002 +#, c-format +msgid "Temporary files folder" +msgstr "Cartafol de arquivos temporais" + +#: Merge.rc:1003 +#, c-format +msgid "S&ystem's temp folder" +msgstr "Cartafol temporal do s&istema" + +#: Merge.rc:1005 +#, c-format +msgid "C&ustom folder:" +msgstr "Ca&rtafol personalizado:" + +#: Merge.rc:1008 +#: Merge.rc:1024 +#, c-format +msgid "Br&owse..." +msgstr "Pro&curar..." + +#: Merge.rc:1014 +#, c-format +msgid "Patch Generator" +msgstr "Xerador de Patchs" + +#: Merge.rc:1017 +#, c-format +msgid "File&1:" +msgstr "Arquivo&1:" + +#: Merge.rc:1021 +#, c-format +msgid "File&2:" +msgstr "Arquivo&2:" + +#: Merge.rc:1025 +#, c-format +msgid "&Swap" +msgstr "&Cambiar" + +#: Merge.rc:1026 +#, c-format +msgid "&Append to existing file" +msgstr "&Anexar ao arquivo existente" + +#: Merge.rc:1028 +#, c-format +msgid "&Result:" +msgstr "&Resultado:" + +#: Merge.rc:1032 +#, c-format +msgid "&Format" +msgstr "&Formato" + +#: Merge.rc:1033 +#, c-format +msgid "St&yle:" +msgstr "Est&ilo" + +#: Merge.rc:1036 +#, c-format +msgid "&Context:" +msgstr "&Contexto:" + +#: Merge.rc:1039 +#, c-format +msgid "W&hitespaces" +msgstr "Es&pazos en branco" + +#: Merge.rc:1040 +#, c-format +msgid "Com&pare" +msgstr "Com¶r" + +#: Merge.rc:1042 +#, c-format +msgid "I&gnore changes" +msgstr "I&gnorar trocos" + +#: Merge.rc:1044 +#, c-format +msgid "Ig&nore all" +msgstr "Ig&norar todo" + +#: Merge.rc:1046 +#, c-format +msgid "Ignor&e blank lines" +msgstr "Ignor&ar lias en branco" + +#: Merge.rc:1048 +#, c-format +msgid "Case sensi&tive" +msgstr "Diferenciar maisculas/minsculas" + +#: Merge.rc:1050 +#, c-format +msgid "Inclu&de command line" +msgstr "Inclu&r lia de comandos" + +#: Merge.rc:1052 +#, c-format +msgid "Open to e&xternal editor" +msgstr "Abrir nun e&ditor externo" + +#: Merge.rc:1074 +#, c-format +msgid "Display Columns" +msgstr "Amosar columnas" + +#: Merge.rc:1080 +#, c-format +msgid "Move &Up" +msgstr "Mover E&nriba" + +#: Merge.rc:1081 +#, c-format +msgid "Move &Down" +msgstr "Mover E&mbaixo" + +#: Merge.rc:1091 +#, c-format +msgid "Select Unpacker" +msgstr "Seleccionar desempaquetador" + +#: Merge.rc:1096 +#, c-format +msgid "File unpacker:" +msgstr "Desempaquetador de arquivos:" + +#: Merge.rc:1099 +#, c-format +msgid "Display all unpackers, don't check the extension" +msgstr "Amosar todos os desempaquetadores, non verificar a extensin" + +#: Merge.rc:1102 +#, c-format +msgid "Extensions list:" +msgstr "Listaxe de extensins:" + +#: Merge.rc:1103 +#, c-format +msgid "Description:" +msgstr "Descricin:" + +#: Merge.rc:1114 +#, c-format +msgid " Folder Compare Progress" +msgstr "Progreso na comparacin de cartafoles" + +#: Merge.rc:1117 +#: Merge.rc:1874 +#, c-format +msgid "Stop" +msgstr "Parar" + +#: Merge.rc:1122 +#, c-format +msgid "Comparing items..." +msgstr "A comparar elementos..." + +#: Merge.rc:1123 +#, c-format +msgid "Items compared:" +msgstr "Elementos comparados:" + +#: Merge.rc:1124 +#, c-format +msgid "Items total:" +msgstr "Total de elementos:" + +#: Merge.rc:1130 +#, c-format +msgid "Go To" +msgstr "Ir a" + +#: Merge.rc:1133 +#, c-format +msgid "G&oto:" +msgstr "Ir&a:" + +#: Merge.rc:1135 +#, c-format +msgid "File" +msgstr "Arquivo" + +#: Merge.rc:1140 +#, c-format +msgid "Goto what" +msgstr "Ir para" + +#: Merge.rc:1141 +#, c-format +msgid "Li&ne" +msgstr "Li&a" + +#: Merge.rc:1143 +#, c-format +msgid "&Difference" +msgstr "&Diferenza" + +#: Merge.rc:1145 +#, c-format +msgid "&Go To" +msgstr "&Ir a" + +#: Merge.rc:1151 +#: Merge.rc:1922 +#, c-format +msgid "Compare" +msgstr "Comparar" + +#: Merge.rc:1154 +#, c-format +msgid "Whitespace" +msgstr "Espazo en branco" + +#: Merge.rc:1155 +#, c-format +msgid "&Compare" +msgstr "&Comparar" + +#: Merge.rc:1157 +#, c-format +msgid "&Ignore change" +msgstr "&Ignorar trocos" + +#: Merge.rc:1159 +#, c-format +msgid "I&gnore all" +msgstr "&Ignorar todo" + +#: Merge.rc:1161 +#, c-format +msgid "Ignore blan&k lines" +msgstr "Ignorar &lias en branco" + +#: Merge.rc:1163 +#, c-format +msgid "Ignore &case" +msgstr "Ignorar maisc/mins." + +#: Merge.rc:1165 +#, c-format +msgid "Igno&re carriage return differences (Windows/Unix/Mac)" +msgstr "Igno&rar diferenzas nas quebras de lia (Windows/Unix/Mac)" + +#: Merge.rc:1168 +#, c-format +msgid "E&nable moved block detection" +msgstr "A&ctivar deteccin de bloques movidos" + +#: Merge.rc:1170 +#, c-format +msgid "&Match similar lines" +msgstr "&Combinar as lias semellantes" + +#: Merge.rc:1172 +#, c-format +msgid "Ign&ore time differences less than 3 seconds" +msgstr "Ig&norar diferenzas de tempo inferiores a 3 segundos" + +#: Merge.rc:1175 +#, c-format +msgid "&File Compare method:" +msgstr "&Mtodo de comparacin de arquivos:" + +#: Merge.rc:1178 +#, c-format +msgid "S&top after first difference" +msgstr "P&arar despois da primeira diferenza" + +#: Merge.rc:1181 +#, c-format +msgid "Filter Comments" +msgstr "Filtrar comentarios" + +#: Merge.rc:1188 +#: Merge.rc:1923 +#, c-format +msgid "Editor" +msgstr "Editor" + +#: Merge.rc:1191 +#, c-format +msgid "&Highlight syntax" +msgstr "&Resaltar a sintaxe" + +#: Merge.rc:1193 +#, c-format +msgid "&Automatic rescan" +msgstr "&Re-escaneo automtico" + +#: Merge.rc:1195 +#, c-format +msgid "&Preserve original EOL chars" +msgstr "&Conservar os caracteres orixinais EOL" + +#: Merge.rc:1197 +#, c-format +msgid "Tabs" +msgstr "Tabulacins" + +#: Merge.rc:1198 +#, c-format +msgid "&Tab size:" +msgstr "&Tamao da tabulacin:" + +#: Merge.rc:1201 +#, c-format +msgid "&Insert Tabs" +msgstr "&Inserir tabulacins" + +#: Merge.rc:1203 +#, c-format +msgid "Insert &Spaces" +msgstr "Inserir &espazos" + +#: Merge.rc:1205 +#, c-format +msgid "Line Difference Coloring" +msgstr "Colorar as diferenzas de lia" + +#: Merge.rc:1207 +#, c-format +msgid "View line differences" +msgstr "Ver diferenzas de lia" + +#: Merge.rc:1209 +#, c-format +msgid "&Character level" +msgstr "&A nivel do caracter" + +#: Merge.rc:1211 +#, c-format +msgid "&Word-level:" +msgstr "&A nivel da palabra:" + +#: Merge.rc:1226 +#, c-format +msgid "Filefilters" +msgstr "Filtros de arquivos" + +#: Merge.rc:1232 +#, c-format +msgid "Test" +msgstr "Testar" + +#: Merge.rc:1233 +#, c-format +msgid "Install..." +msgstr "Instalar..." + +#: Merge.rc:1234 +#, c-format +msgid "New..." +msgstr "Novo..." + +#: Merge.rc:1235 +#, c-format +msgid "Edit..." +msgstr "Editar..." + +#: Merge.rc:1236 +#, c-format +msgid "Delete..." +msgstr "Borrar..." + +#: Merge.rc:1242 +#, c-format +msgid "Save modified files?" +msgstr "Queres gardar os arquivos modificados?" + +#: Merge.rc:1245 +#, c-format +msgid "Left side file" +msgstr "Arquivo da esquerda" + +#: Merge.rc:1248 +#, c-format +msgid "&Save changes" +msgstr "&Gardar trocos" + +#: Merge.rc:1250 +#, c-format +msgid "&Discard changes" +msgstr "&Desbotar trocos" + +#: Merge.rc:1252 +#, c-format +msgid "Right side file" +msgstr "Arquivo da dereita" + +#: Merge.rc:1255 +#, c-format +msgid "S&ave changes" +msgstr "G&ardar trocos" + +#: Merge.rc:1257 +#, c-format +msgid "Dis&card changes" +msgstr "Desbo&tar trocos" + +#: Merge.rc:1259 +#, c-format +msgid "Discard All" +msgstr "Desbotar todo" + +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 +#, c-format +msgid "Codepage" +msgstr "Pxina de cdigos" + +#: Merge.rc:1269 +#, c-format +msgid "Default Codepage" +msgstr "Pxina de cdigos predeterminada" + +#: Merge.rc:1270 +#, c-format +msgid "Select the default codepage assumed when loading non-Unicode files:" +msgstr "Selecciona a pxina de cdigos predeterminada cando se carguen arquivos non-Unicode:" + +#: Merge.rc:1272 +#, c-format +msgid "" +"Detect codepage info for these files : .html, .rc, .xml \n" +"need to restart session" +msgstr "" +"Detectar a informacin sobre a pxina de cdigos para estes arquivos:.html, .rc, .xml\n" +" preciso reiniciar a sesin" + +#: Merge.rc:1275 +#, c-format +msgid "System codepage" +msgstr "Pxina de cdigos do sistema" + +#: Merge.rc:1277 +#, c-format +msgid "According to WinMerge User Interface" +msgstr "Igual que emprega a interfaz de usuario de Winmerge" + +#: Merge.rc:1279 +#, c-format +msgid "Custom codepage :" +msgstr "Pxina de cdigos personalizada:" + +#: Merge.rc:1287 +#, c-format +msgid "WinMerge - Archive support disabled" +msgstr "WinMerge - Soporte de arquivos desactivado." + +#: Merge.rc:1290 +#, c-format +msgid "Unable to detect 7-Zip version (not installed?)" +msgstr "Non foi posible detectar a versin de 7-Zip (est instalado?)" + +#: Merge.rc:1293 +#, c-format +msgid "" +"Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" +"essential components to be copied to the program directory for standalone operation." +msgstr "" +"O soporte de arquivos precisa ter instalado no PC 7-Zip ou posterior, ou ben os seus\n" +"compoentes esenciais copiados no cartafol do programa para operar independentemente." + +#: Merge.rc:1295 +#, c-format +msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." +msgstr "Tamn debe existir un plugin de interface axeitado no camio (Merge7z*.dll)." + +#: Merge.rc:1297 +#, c-format +msgid "" +"Please use the version of 7-Zip recommended below until interface plugins for later\n" +"versions become available." +msgstr "" +"Emprega a versin de 7-Zip recomendada debaixo at que estea\n" +"dispoible un plugin de interface para versins posteriores." + +#: Merge.rc:1299 +#, c-format +msgid "Version" +msgstr "Versin" + +#: Merge.rc:1301 +#, c-format +msgid "" +"Plugin required\n" +"(dllbuild %04u)" +msgstr "" +"Plugin requirido\n" +"(dllbuild %04u)" + +#: Merge.rc:1303 +#, c-format +msgid "Recommended version of 7-Zip:" +msgstr "Versin de 7-Zip recomendada:" + +#: Merge.rc:1306 +#: Merge.rc:1309 +#, c-format +msgid "present" +msgstr "presente" + +#: Merge.rc:1307 +#, c-format +msgid "Merge7z000U.dll" +msgstr "Merge7z000U.dll" + +#: Merge.rc:1310 +#, c-format +msgid "7-Zip software installed on your computer:" +msgstr "Software 7-Zip instalado no teu computador:" + +#: Merge.rc:1312 +#: Merge.rc:1317 +#, c-format +msgid "none" +msgstr "ningn" + +#: Merge.rc:1314 +#, c-format +msgid "missing" +msgstr "falta" + +#: Merge.rc:1315 +#, c-format +msgid "7-Zip components for standalone operation:" +msgstr "Compoentes para que 7-Zip funcione independente:" + +#: Merge.rc:1319 +#, c-format +msgid "outdated" +msgstr "obsoleto" + +#: Merge.rc:1320 +#, c-format +msgid "Plugins on path:" +msgstr "Plugins no camio:" + +#: Merge.rc:1321 +#, c-format +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" +msgstr "" +"Non amosar esta &mensaxe outra vez.\n" +"(Sempre podes recuperar esta mensaxe desde o men de Axuda.)" + +#: Merge.rc:1325 +#, c-format +msgid "Plugin Download" +msgstr "Descarga de plugins" + +#: Merge.rc:1334 +#, c-format +msgid "Options" +msgstr "Opcins" + +#: Merge.rc:1345 +#, c-format +msgid " Categories" +msgstr "Categoras" + +#: Merge.rc:1347 +#, c-format +msgid "Import..." +msgstr "Importar..." + +#: Merge.rc:1348 +#, c-format +msgid "Export..." +msgstr "Exportar..." + +#: Merge.rc:1356 +#, c-format +msgid "Keywords:" +msgstr "Palabras chave:" + +#: Merge.rc:1357 +#, c-format +msgid "Function names:" +msgstr "Nomes das funcins:" + +#: Merge.rc:1358 +#, c-format +msgid "Comments:" +msgstr "Comentarios:" + +#: Merge.rc:1359 +#, c-format +msgid "Numbers:" +msgstr "Nmeros:" + +#: Merge.rc:1360 +#, c-format +msgid "Operators:" +msgstr "Operadores:" + +#: Merge.rc:1361 +#, c-format +msgid "Strings:" +msgstr "Cadeas:" + +#: Merge.rc:1362 +#, c-format +msgid "Preprocessor:" +msgstr "Pre-procesador:" + +#: Merge.rc:1363 +#, c-format +msgid "User 1:" +msgstr "Usuario 1:" + +#: Merge.rc:1364 +#, c-format +msgid "User 2:" +msgstr "Usuario 2:" + +# Esta traducin atopeina no corpus lingstico do Open Office, en mancomun.org +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 +#, c-format +msgid "Bold" +msgstr "Negra" + +#: Merge.rc:1417 +#, c-format +msgid "Folder Compare Report" +msgstr "Informe da comparacin de cartafoles" + +#: Merge.rc:1420 +#, c-format +msgid "Report &File:" +msgstr "Arquivo do &Informe" + +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 +#, c-format +msgid "Browse..." +msgstr "Procurar..." + +#: Merge.rc:1424 +#, c-format +msgid "&Style:" +msgstr "&Estilo:" + +#: Merge.rc:1427 +#, c-format +msgid "&Copy to Clipboard" +msgstr "&Copiar para o portapapeis" + +#: Merge.rc:1435 +#, c-format +msgid "Shared or Private Filter" +msgstr "Filtro privado ou compartido" + +#: Merge.rc:1438 +#, c-format +msgid "Which type of filter do you want to create?" +msgstr "Que tipo de filtro queres crear?" + +#: Merge.rc:1440 +#, c-format +msgid "Shared Filter (for all users on this machine)" +msgstr "Filtro compartido (para todos os usuarios desta mquina)" + +#: Merge.rc:1442 +#, c-format +msgid "Private Filter (only for current user)" +msgstr "Filtro privado (s para o usuario actual)" + +#: Merge.rc:1450 +#: Merge.rc:1930 +#, c-format +msgid "Archive Support" +msgstr "Soporte de Arquivos" + +#: Merge.rc:1453 +#, c-format +msgid "Archive support requires 7-Zip plugin installed:" +msgstr "O soporte de arquivos require ter o plugin 7-Zip instalado:" + +#: Merge.rc:1455 +#, c-format +msgid "Download 7-zip Plugin" +msgstr "Baixar o plugin 7-zip" + +#: Merge.rc:1456 +#, c-format +msgid "&Enable archive file support" +msgstr "&Activar o soporte de arquivos" + +#: Merge.rc:1458 +#, c-format +msgid "&Use stand-alone 7-Zip if available" +msgstr "&Empregar o 7-Zip independente se est dispoible" + +#: Merge.rc:1461 +#, c-format +msgid "U&se local 7-Zip from WinMerge folder" +msgstr "E&mpregar o 7-Zip local do cartafol de WinMerge" + +#: Merge.rc:1463 +#, c-format +msgid "&Detect archive type from file signature" +msgstr "&Detectar o tipo de arquivo pola sinatura" + +#: Merge.rc:1471 +#, c-format +msgid "Compare Statistics" +msgstr "Estadsticas da comparacin" + +#: Merge.rc:1474 +#, c-format +msgid "Folders:" +msgstr "Cartafoles:" + +#: Merge.rc:1475 +#, c-format +msgid "Files:" +msgstr "Arquivos:" + +#: Merge.rc:1476 +#: Merge.rc:2310 +#, c-format +msgid "Different" +msgstr "Diferente" + +#: Merge.rc:1477 +#, c-format +msgid "Text:" +msgstr "Texto:" + +#: Merge.rc:1480 +#: Merge.rc:1499 +#, c-format +msgid "Binary:" +msgstr "Binario:" + +#: Merge.rc:1483 +#, c-format +msgid "Unique" +msgstr "nico" + +#: Merge.rc:1484 +#, c-format +msgid "Left:" +msgstr "Esquerda:" + +#: Merge.rc:1489 +#, c-format +msgid "Right:" +msgstr "Dereita" + +#: Merge.rc:1494 +#: Merge.rc:2305 +#, c-format +msgid "Identical" +msgstr "Iguais" + +#: Merge.rc:1503 +#, c-format +msgid "Total:" +msgstr "Total:" + +#: Merge.rc:1508 +#, c-format +msgid "Close" +msgstr "Pechar" + +#: Merge.rc:1517 +#, c-format +msgid "Affects" +msgstr "Afecta" + +#: Merge.rc:1520 +#: Merge.rc:1523 +#, c-format +msgid "(Affects)" +msgstr "(Afecta)" + +#: Merge.rc:1524 +#, c-format +msgid "Select Codepage for" +msgstr "Selecciona a pxina de cdigos para" + +#: Merge.rc:1525 +#, c-format +msgid "&File Loading:" +msgstr "&A cargar o arquivo:" + +#: Merge.rc:1527 +#: Merge.rc:1530 +#, c-format +msgid "..." +msgstr "..." + +#: Merge.rc:1528 +#, c-format +msgid "File &Saving:" +msgstr "A gardar o &arquivo:" + +#: Merge.rc:1531 +#, c-format +msgid "&Use same codepage for both" +msgstr "&Empregar a mesma pxina de cdigos para ambas" + +#: Merge.rc:1534 +#, c-format +msgid "&Apply" +msgstr "&Aplicar" + +#: Merge.rc:1535 +#: Merge.rc:1896 +#, c-format +msgid "&Cancel" +msgstr "&Cancelar" + +#: Merge.rc:1540 +#, c-format +msgid "Test Filter" +msgstr "Probar filtro" + +#: Merge.rc:1543 +#, c-format +msgid "Testing filter ..." +msgstr "Probando filtro..." + +#: Merge.rc:1545 +#, c-format +msgid "&Enter text to test:" +msgstr "&Inserir texto para probar:" + +#: Merge.rc:1547 +#, c-format +msgid "&Folder Name" +msgstr "&Nome do cartafol" + +#: Merge.rc:1549 +#, c-format +msgid "Result:" +msgstr "Resultado:" + +#: Merge.rc:1553 +#, c-format +msgid "&Test" +msgstr "&Probar" + +#: Merge.rc:1554 +#, c-format +msgid "&Close" +msgstr "&Pechar" + +#: Merge.rc:1562 +#, c-format +msgid "&Use customized text colors" +msgstr "&Empregar cores de texto personalizadas" + +#: Merge.rc:1565 +#, c-format +msgid "Custom text colors" +msgstr "Cores de texto personalizadas" + +#: Merge.rc:1567 +#, c-format +msgid "Whitespace:" +msgstr "Espazo en branco:" + +#: Merge.rc:1568 +#, c-format +msgid "Regular text:" +msgstr "Texto normal" + +#: Merge.rc:1569 +#, c-format +msgid "Selection:" +msgstr "Seleccin:" + +#: Merge.rc:1592 +#, c-format +msgid "Paths" +msgstr "Camios" + +#: Merge.rc:1598 +#, c-format +msgid "R&ead-only" +msgstr "S& lectura" + +#: Merge.rc:1602 +#, c-format +msgid "Re&ad-only" +msgstr "S l&ectura" + +#: Merge.rc:1608 +#, c-format +msgid "Open..." +msgstr "Abrir..." + +#: Merge.rc:1609 +#, c-format +msgid "Save..." +msgstr "Gardar..." + +#: Merge.rc:1614 +#: Merge.rc:1931 +#, c-format +msgid "Backup Files" +msgstr "Copias de seguridade(backups)" + +#: Merge.rc:1617 +#, c-format +msgid "Create backup files in:" +msgstr "Crear as copias de seguridade en:" + +#: Merge.rc:1622 +#, c-format +msgid "Create backup files into:" +msgstr "Crear as copias de seguridade en: " + +#: Merge.rc:1623 +#, c-format +msgid "&Original file's folder" +msgstr "&Cartafol orixinal do arquivo" + +#: Merge.rc:1625 +#, c-format +msgid "&Global backup folder:" +msgstr "&Cartafol das copias de seguridade:" + +#: Merge.rc:1629 +#, c-format +msgid "Backup filename:" +msgstr "Nome do arquivo de seguridade" + +#: Merge.rc:1630 +#, c-format +msgid "&Append .bak -extension" +msgstr "&Anexar extensin .bak" + +#: Merge.rc:1632 +#, c-format +msgid "A&ppend timestamp" +msgstr "&Engadir etiqueta coa data" + +#: Merge.rc:1639 +#: Merge.rc:2220 +#, c-format +msgid "Confirm Copy" +msgstr "Confirmar copia" + +#: Merge.rc:1643 +#, c-format +msgid "Are you sure you want to copy XXX items?" +msgstr "Ests seguro de querer copiar XXX elementos?" + +#: Merge.rc:1645 +#, c-format +msgid "From left" +msgstr "Desde a esquerda" + +#: Merge.rc:1648 +#, c-format +msgid "To right" +msgstr "Para a dereita" + +#: Merge.rc:1651 +#, c-format +msgid "Yes" +msgstr "Si" + +#: Merge.rc:1652 +#, c-format +msgid "No" +msgstr "Non" + +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "Plugins" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "&Activar plugins" + +#. StringFileInfo.Block +#: Merge.rc:1691 +#, c-format +msgid "040904e4" +msgstr "040904e4" + +#. VarFileInfo.Translation +#: Merge.rc:1707 +#, c-format +msgid "0x409, 1252" +msgstr "0x409, 1252" + +#: Merge.rc:1722 +#, c-format +msgid "Ready" +msgstr "Listo" + +#: Merge.rc:1728 +#, c-format +msgid "EXT" +msgstr "EXT" + +#: Merge.rc:1729 +#, c-format +msgid "CAP" +msgstr "CAP" + +#: Merge.rc:1730 +#, c-format +msgid "NUM" +msgstr "NUM" + +#: Merge.rc:1731 +#, c-format +msgid "SCRL" +msgstr "SCRL" + +#: Merge.rc:1732 +#, c-format +msgid "OVR" +msgstr "OVR" + +#: Merge.rc:1733 +#, c-format +msgid "REC" +msgstr "REC" + +#: Merge.rc:1739 +#, c-format +msgid "" +"Create empty documents\n" +"New Documents (Ctrl+N)" +msgstr "" +"Crear documentos baleiros\n" +"Documentos novos (Ctrl+N) " + +#: Merge.rc:1740 +#, c-format +msgid "" +"Open an existing document\n" +"Open (Ctrl+O)" +msgstr "" +"Abrir un documento existente\n" +"Abrir (Ctrl+O)" + +#: Merge.rc:1741 +#, c-format +msgid "" +"Close the active document\n" +"Close" +msgstr "" +"Pechar o documento activo\n" +"Pechar" + +#: Merge.rc:1742 +#, c-format +msgid "" +"Save the active document\n" +"Save (Ctrl+S)" +msgstr "" +"Gravar o documento activo\n" +"Gardar (Ctrl+S)" + +#: Merge.rc:1743 +#, c-format +msgid "" +"Save the active document with a new name\n" +"Save As" +msgstr "" +"Gravar o documento activo cun novo nome\n" +"Gardar como" + +#: Merge.rc:1744 +#, c-format +msgid "" +"Change the printing options\n" +"Page Setup" +msgstr "" +"Trocar as opcins de impresin\n" +"Configuracin de pxina" + +#: Merge.rc:1745 +#, c-format +msgid "" +"Change the printer and printing options\n" +"Print Setup" +msgstr "" +"Trocar a impresora e as opcins de impresin\n" +"Configurar impresin" + +#: Merge.rc:1746 +#, c-format +msgid "" +"Print the active document\n" +"Print" +msgstr "" +"Imprimir o documento activo\n" +"Imprimir" + +#: Merge.rc:1747 +#, c-format +msgid "" +"Display full pages\n" +"Print Preview" +msgstr "" +"Amosar todas as pxinas\n" +"Previsualizar impresin" + +#: Merge.rc:1752 +#, c-format +msgid "Make all hidden items visible again" +msgstr "Facer visibles outra vez todos os elementos agochados" + +#: Merge.rc:1758 +#, c-format +msgid "" +"Open project file\n" +"Project file (Ctrl+J)" +msgstr "" +"Abrir o arquivo do proxecto\n" +"Arquivo do proxecto (Ctrl+J)" + +#: Merge.rc:1759 +#, c-format +msgid "Unknown error attempting to open project file" +msgstr "Erro descoecido ao tentar abrir o arquivo do proxecto" + +#: Merge.rc:1760 +#, c-format +msgid "Unknown error attempting to save project file" +msgstr "Erro descoecido ao tentar gardar o arquivo do proxecto" + +#: Merge.rc:1761 +#, c-format +msgid "Project File" +msgstr "Arquivo do proxecto" + +#: Merge.rc:1762 +#, c-format +msgid "Project file successfully loaded." +msgstr "O arquivo do proxecto cargouse correctamente." + +#: Merge.rc:1763 +#, c-format +msgid "Project file successfully saved." +msgstr "O arquivo do proxecto gardouse correctamente." + +#: Merge.rc:1764 +#, c-format +msgid "" +"Save current paths and options to project file\n" +"Save Project File" +msgstr "" +"Gardar os camios e opcins actuais no arquivo do proxecto\n" +"Gardar arquivo do proxecto" + +#: Merge.rc:1769 +#, c-format +msgid "" +"Display program information, version number and copyright\n" +"About" +msgstr "" +"Amosar a informacin do programa, nmero da versin e copyright\n" +"Acerca de" + +#: Merge.rc:1770 +#, c-format +msgid "" +"Quit the application; prompts to save documents\n" +"Exit" +msgstr "" +"Pechar a aplicacin, preguntar se se gardan os documentos\n" +"Sar" + +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 +#, c-format +msgid "Open this document" +msgstr "Abrir este documento" + +#: Merge.rc:1796 +#, c-format +msgid "" +"Switch to the next window pane\n" +"Next Pane" +msgstr "" +"Cambiar para o seguinte panel\n" +"Panel seguinte" + +#: Merge.rc:1797 +#, c-format +msgid "" +"Switch back to the previous window pane\n" +"Previous Pane" +msgstr "" +"Cambiar para o panel anterior\n" +"Panel anterior" + +#: Merge.rc:1803 +#, c-format +msgid "" +"Arrange windows so they overlap\n" +"Cascade Windows" +msgstr "" +"Organizar as vents en fervenza(sobrepostas)\n" +"Fervenza" + +#: Merge.rc:1804 +#, c-format +msgid "" +"Arrange windows as non-overlapping tiles horizontally\n" +"Tile Windows Horizontally" +msgstr "" +"Organizar as vents horizontalmente\n" +"Organizar horizontalmente" + +#: Merge.rc:1805 +#, c-format +msgid "" +"Arrange windows as non-overlapping tiles vertically\n" +"Tile Windows Vertically" +msgstr "" +"Organizar as vents verticalmente\n" +"Organizar verticalmente" + +#: Merge.rc:1811 +#, c-format +msgid "" +"Copy the selection and put it on the Clipboard\n" +"Copy" +msgstr "" +"Copiar a seleccin e poela no portapapeis\n" +"Copiar" + +#: Merge.rc:1812 +#, c-format +msgid "" +"Cut the selection and put it on the Clipboard\n" +"Cut" +msgstr "" +"Cortar a seleccin e poela no portapapeis\n" +"Copiar" + +#: Merge.rc:1813 +#, c-format +msgid "" +"Find the specified text\n" +"Find" +msgstr "" +"Procurar o texto especificado\n" +"Procurar" + +#: Merge.rc:1814 +#, c-format +msgid "" +"Insert Clipboard contents\n" +"Paste" +msgstr "" +"Inserir o contido do portapapeis\n" +"Pegar" + +#: Merge.rc:1815 +#, c-format +msgid "" +"Repeat the last action\n" +"Repeat" +msgstr "" +"Repetir a ltima accin\n" +"Repetir" + +#: Merge.rc:1816 +#, c-format +msgid "" +"Replace specific text with different text\n" +"Replace" +msgstr "" +"Substituir o texto especificado por outro\n" +"Substitur" + +#: Merge.rc:1817 +#, c-format +msgid "" +"Select the entire document\n" +"Select All" +msgstr "" +"Seleccionar todo o documento\n" +"Seleccionar todo" + +#: Merge.rc:1818 +#, c-format +msgid "" +"Undo the last action\n" +"Undo (Ctrl+Z)" +msgstr "" +"Desfacer a ltima accin\n" +"Desfacer (CTRL+Z)" + +#: Merge.rc:1819 +#, c-format +msgid "" +"Redo the previously undone action\n" +"Redo (Ctrl+Y)" +msgstr "" +"Refacer a accin previamente desfeita\n" +"Refacer (Ctrl+Y)" + +#: Merge.rc:1825 +#, c-format +msgid "" +"Show or hide the toolbar\n" +"Toggle ToolBar" +msgstr "" +"Amosar ou ocultar a barra de ferramentas\n" +"Barra de ferramentas" + +#: Merge.rc:1826 +#, c-format +msgid "" +"Show or hide the status bar\n" +"Toggle StatusBar" +msgstr "" +"Amosar ou ocultar a barra de estado\n" +"Barra de estado" + +#: Merge.rc:1827 +#, c-format +msgid "" +"Show or hide the tab bar\n" +"Toggle TabBar" +msgstr "" +"Amosar ou agochar a barra dos separadores\n" +"Separadores" + +#: Merge.rc:1828 +#, c-format +msgid "" +"Automatically resize panes\n" +"Lock Panes" +msgstr "" +"Reaxustar o tamao dos paneis de xeito automtico\n" +"Bloquear Paneis" + +#: Merge.rc:1834 +#, c-format +msgid "Change the window size" +msgstr "Cambiar o tamao da fiestra" + +#: Merge.rc:1835 +#, c-format +msgid "Change the window position" +msgstr "Cambiar a posicin da fiestra" + +#: Merge.rc:1836 +#, c-format +msgid "Reduce the window to an icon" +msgstr "Reducir a fiestra a unha icona" + +#: Merge.rc:1837 +#, c-format +msgid "Enlarge the window to full size" +msgstr "Agrandar a vent a tamao completo" + +#: Merge.rc:1838 +#, c-format +msgid "Switch to the next document window" +msgstr "Cambiar para a fiestra do documento seguinte" + +#: Merge.rc:1839 +#, c-format +msgid "Switch to the previous document window" +msgstr "Cambiar para a fiestra do documento anterior" + +#: Merge.rc:1840 +#, c-format +msgid "Close the active window and prompts to save the documents" +msgstr "Pechar a fiestra activa e preguntar se se gardan os documentos" + +#: Merge.rc:1845 +#, c-format +msgid "Restore the window to normal size" +msgstr "Voltar a fiestra para o tamao normal" + +#: Merge.rc:1846 +#, c-format +msgid "Activate Task List" +msgstr "Activar listaxe de tarefas" + +#: Merge.rc:1847 +#, c-format +msgid "Activate this window" +msgstr "Activar esta fiestra" + +#: Merge.rc:1853 +#, c-format +msgid "" +"Close print preview mode\n" +"Cancel Preview" +msgstr "" +"Pechar o modo previsualizacin de impresin\n" +"Cancelar previsualizacin" + +#: Merge.rc:1860 +#, c-format +msgid "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" +msgstr "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" + +#: Merge.rc:1861 +#, c-format +msgid "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" +msgstr "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" + +#: Merge.rc:1868 +#, c-format +msgid "Preserve original EOL chars" +msgstr "Conservar caracteres EOL orixinais" + +#: Merge.rc:1875 +#, c-format +msgid "Press any key" +msgstr "Premer calquera tecla" + +#: Merge.rc:1881 +#: Merge.rc:1882 +#, c-format +msgid "Right click on the path to copy" +msgstr "Premer co botn dereito no camio a copiar" + +#: Merge.rc:1888 +#, c-format +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgstr "" +"Desenvolvedores:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" + +#: Merge.rc:1889 +#, c-format +msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." +msgstr "WinMerge ofrcese sen GARANTA DE NINGUNHA CLASE. Este programa software ceibe e animmoste a distribulo baixo certas condicins; mira a Licenza Pblica Xeral GNU no men de Axuda para atopar mis informacin." + +#: Merge.rc:1895 +#, c-format +msgid "&Ok" +msgstr "&Aceptar" + +#: Merge.rc:1897 +#, c-format +msgid "&Abort" +msgstr "&Abortar" + +#: Merge.rc:1898 +#, c-format +msgid "&Retry" +msgstr "&Tentar de novo" + +#: Merge.rc:1899 +#, c-format +msgid "&Ignore" +msgstr "&Ignorar" + +#: Merge.rc:1900 +#, c-format +msgid "Ignore &all" +msgstr "Ignorar &todo" + +#: Merge.rc:1901 +#, c-format +msgid "&Yes" +msgstr "&Si" + +#: Merge.rc:1907 +#, c-format +msgid "Yes to &all" +msgstr "Si a &todo" + +#: Merge.rc:1908 +#, c-format +msgid "&No" +msgstr "&Non" + +#: Merge.rc:1909 +#, c-format +msgid "No to a&ll" +msgstr "&Non a todo" + +#: Merge.rc:1910 +#, c-format +msgid "&Continue" +msgstr "&Continuar" + +#: Merge.rc:1911 +#, c-format +msgid "&Skip" +msgstr "&Saltar" + +#: Merge.rc:1912 +#, c-format +msgid "Skip &all" +msgstr "S&altar todo" + +#: Merge.rc:1914 +#, c-format +msgid "Don't display this &message again." +msgstr "Non amosar esta &mensaxe de novo." + +#: Merge.rc:1915 +#, c-format +msgid "Don't ask this &question again." +msgstr "Non preguntar &isto de novo." + +#: Merge.rc:1925 +#, c-format +msgid "Syntax colors" +msgstr "Cores da sintaxe" + +#: Merge.rc:1926 +#, c-format +msgid "Text Colors" +msgstr "Cores do texto" + +#: Merge.rc:1928 +#, c-format +msgid "Version Control" +msgstr "Control de versins" + +#: Merge.rc:1938 +#, c-format +msgid "To:" +msgstr "A:" + +#: Merge.rc:1939 +#, c-format +msgid "From left:" +msgstr "Dende a esquerda:" + +#: Merge.rc:1940 +#, c-format +msgid "To left:" +msgstr "Para a esquerda:" + +#: Merge.rc:1941 +#, c-format +msgid "From right:" +msgstr "Dende a dereita:" + +#: Merge.rc:1942 +#, c-format +msgid "To right:" +msgstr "Para a dereita:" + +#: Merge.rc:1948 +#, c-format +msgid "Version %1" +msgstr "Versin %1" + +#: Merge.rc:1949 +#, c-format +msgid "Unicode" +msgstr "Unicode" + +#: Merge.rc:1955 +#, c-format +msgid "Options (%1)" +msgstr "Opcins (%1)" + +#: Merge.rc:1956 +#, c-format +msgid "All message boxes are now displayed again." +msgstr "Todas as caixas de mensaxes amosaranse outra vez." + +#: Merge.rc:1957 +#, c-format +msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." +msgstr "Realizronse modificacins na sesin de comparacin. Algunhas configuracins non sern efectivas at que esta sesin sexa reiniciada." + +#: Merge.rc:1958 +#, c-format +msgid "The selected font change will not be applied to any currently visible difference windows." +msgstr "O cambio de fonte escollido non se aplicar a ningunha das actuais vents visibles de diferenzas." + +#: Merge.rc:1960 +#, c-format +msgid "" +"Value in Tab size -field is not in range WinMerge accepts.\n" +"\n" +"Please use values 1 - %1." +msgstr "" +"O valor do tamao da tabulacin non est no rango aceptado por WinMerge\n" +"\n" +"Emprega valores entre 1 e %1" + +#: Merge.rc:1962 +#, c-format +msgid "" +"Are you sure you want to reset all WinMerge options to default values?\n" +"\n" +"Please re-start WinMerge after the reset." +msgstr "" +"Ests seguro de querer restaurar os valores predeterminados do Winmerge?\n" +"\n" +"Reiniciar WinMerge despois da restauracin." + +#: Merge.rc:1968 +#, c-format +msgid "Open" +msgstr "Abrir" + +#: Merge.rc:1969 +#, c-format +msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" +msgstr "Programas|*.exe;*.bat;*.cmd|Todos os arquivos (*.*)|*.*||" + +#: Merge.rc:1970 +#, c-format +msgid "All Files (*.*)|*.*||" +msgstr "Todos os arquivos (*.*)|*.*||" + +#: Merge.rc:1971 +#, c-format +msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" +msgstr "Arquivos do proxecto de WinMerge (*.WinMerge)|*.WinMerge||" + +#: Merge.rc:1973 +#, c-format +msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" +msgstr "Arquivos de opcins (*.ini)|*.ini|Todos os arquivos (*.*)|*.*||" + +#: Merge.rc:1979 +#, c-format +msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" +msgstr "Arquivos de texto (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Todos os arquivos (*.*)|*.*||" + +#: Merge.rc:1980 +#, c-format +msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" +msgstr "Arquivos HTML (*.htm,*.html)|*.htm;*.html|Todos os arquivos (*.*)|*.*||" + +#: Merge.rc:1981 +#, c-format +msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" +msgstr "Arquivos XML (*.xml)|*.xml|Todos os arquivos(*.*)|*.*||" + +#: Merge.rc:1987 +#, c-format +msgid "UTF-8" +msgstr "UTF-8" + +#: Merge.rc:1988 +#, c-format +msgid "UTF-8 (B)" +msgstr "UTF-8 (B)" + +#: Merge.rc:1989 +#, c-format +msgid "UCS-2 LE" +msgstr "UCS-2 LE" + +#: Merge.rc:1990 +#, c-format +msgid "UCS-2 BE" +msgstr "UCS-2 BE" + +#: Merge.rc:1996 +#, c-format +msgid "Full Contents" +msgstr "Contidos completos" + +#: Merge.rc:1997 +#, c-format +msgid "Quick Contents" +msgstr "Contidos rpidos" + +#: Merge.rc:1998 +#, c-format +msgid "Modified Date" +msgstr "Data de modificacin" + +#: Merge.rc:1999 +#, c-format +msgid "Modified Date and Size" +msgstr "Data de modificacin e tamao" + +#: Merge.rc:2000 +#, c-format +msgid "Size" +msgstr "Tamao" + +#: Merge.rc:2006 +#: Merge.rc:2616 +#, c-format +msgid "Name" +msgstr "Nome" + +#: Merge.rc:2007 +#, c-format +msgid "Location" +msgstr "Localizacin" + +#: Merge.rc:2008 +#, c-format +msgid "Filters" +msgstr "Filtros" + +#: Merge.rc:2009 +#, c-format +msgid "[F] " +msgstr "[F]" + +#: Merge.rc:2010 +#: Merge.rc:2618 +#, c-format +msgid "Description" +msgstr "Descricin" + +#: Merge.rc:2011 +#, c-format +msgid "Select filename for new filter" +msgstr "Escoller un nome de arquivo para o filtro novo " + +#: Merge.rc:2012 +#, c-format +msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" +msgstr "Filtros dos arquivos (*.flt)|*.flt|Todos os arquivos (*.*)|*.*||" + +#: Merge.rc:2014 +#, c-format +msgid "" +"Cannot find file filter template file!\n" +"\n" +"Please copy file %1 to WinMerge/Filters -folder:\n" +"%2." +msgstr "" +"Non se pode atopar a sobreplanta do filtro de arquivos\n" +"\n" +"Copia o arquivo %1 ao cartafol de filtros:\n" +"%2" + +#: Merge.rc:2016 +#, c-format +msgid "" +"Cannot copy filter template file to filter folder:\n" +"%1\n" +"\n" +"Please make sure the folder exists and is writable." +msgstr "" +"Non se pode copiar a sobreplanta de filtros ao cartafol de filtros:\n" +"%1\n" +"\n" +"Asegrate de que existe o cartafol e de que escribible." + +#: Merge.rc:2018 +#, c-format +msgid "" +"User's filter file folder is not defined!\n" +"\n" +"Please select filter folder in Options/System." +msgstr "" +"O cartafol de filtros de usuario non est definido\n" +"\n" +"Escolle un cartafol de filtros en Opcins/Sistema." + +#: Merge.rc:2020 +#, c-format +msgid "" +"Failed to delete the filter file:\n" +"%1\n" +"\n" +"Maybe the file is read-only?" +msgstr "" +"Fallou o borrado do arquivo de filtros::\n" +"%1\n" +"\n" +"Comprobe se o arquivo do s-lectura." + +#: Merge.rc:2021 +#, c-format +msgid "Locate filter file to install" +msgstr "Procurar arquivo de filtros para instalar" + +#: Merge.rc:2023 +#, c-format +msgid "" +"Installing filter file failed.\n" +"\n" +"Could not copy new filter file to filter folder." +msgstr "" +"Fallou a instalacin do arquivo de filtros.\n" +"\n" +"Non se poden copiar novos filtros ao cartafol de filtros." + +#: Merge.rc:2025 +#, c-format +msgid "Filter file already exists. Overwrite existing filter?" +msgstr "O arquivo de filtros xa existe. Qurelo sobre-escribir?" + +#: Merge.rc:2031 +#, c-format +msgid "Regular expression" +msgstr "Expresin regular" + +#: Merge.rc:2037 +#, c-format +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" +"Os filtros foron actualizados. Queres recargar todas as comparacins de cartafol abertas?\n" +"\n" +"Se non queres regargar todas as comparacins agora podes seleccionar Non e actualizalas mis adiante." + +#: Merge.rc:2043 +#, c-format +msgid "&Path to cleartool.exe :" +msgstr "&Camio a cleartool.exe :" + +#: Merge.rc:2044 +#, c-format +msgid "&Path to SS.EXE :" +msgstr "&Camio a SS.EXE" + +#: Merge.rc:2050 +#, c-format +msgid "Folder Comparison Results" +msgstr "Resultado da comparacin dos cartafoles " + +#: Merge.rc:2051 +#, c-format +msgid "File Comparison" +msgstr "Comparacin de arquivos" + +#: Merge.rc:2052 +#, c-format +msgid "Untitled left" +msgstr "Cadro esquerdo sen ttulo" + +#: Merge.rc:2053 +#, c-format +msgid "Untitled right" +msgstr "Cadro dereito sen ttulo" + +#: Merge.rc:2054 +#, c-format +msgid "Theirs File" +msgstr "O Arquivo Deles" + +#: Merge.rc:2055 +#, c-format +msgid "Mine File" +msgstr "O Meu Arquivo" + +#: Merge.rc:2061 +#, c-format +msgid "Scanning files..." +msgstr "A escanear arquivos..." + +#: Merge.rc:2062 +#, c-format +msgid "Opening selection" +msgstr "Abrindo seleccin" + +#: Merge.rc:2063 +#, c-format +msgid "Copying Left to Right" +msgstr "A copiar da esquerda para a dereita" + +#: Merge.rc:2064 +#, c-format +msgid "Copying Right to Left" +msgstr "A copiar da dereita para a esquerda" + +#: Merge.rc:2065 +#, c-format +msgid "Copying All to Left" +msgstr "A copiar todo para a esquerda" + +#: Merge.rc:2066 +#, c-format +msgid "Copying All to Right" +msgstr "A copiar todo para a dereita" + +#: Merge.rc:2067 +#, c-format +msgid "Copying files..." +msgstr "A copiar arquivos..." + +#: Merge.rc:2068 +#, c-format +msgid "Deleting files..." +msgstr "A borrar arquivos..." + +#: Merge.rc:2069 +#, c-format +msgid "Moving files..." +msgstr "A mover arquivos..." + +#: Merge.rc:2070 +#, c-format +msgid "Creating the report..." +msgstr "A crear o informe..." + +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "Desfacendo a ltima operacin..." + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "Refacendo a operacin previa..." + +#: Merge.rc:2078 +#, c-format +msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" +msgstr "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" + +#: Merge.rc:2079 +#, c-format +msgid "Line: %s" +msgstr "Lia: %s" + +#: Merge.rc:2080 +#, c-format +msgid "Ln: %s Col: %d/%d Ch: %d/%d" +msgstr "Ln: %s Col: %d/%d Ch: %d/%d" + +#: Merge.rc:2081 +#, c-format +msgid "Merge" +msgstr "Combinar" + +#: Merge.rc:2082 +#, c-format +msgid "Difference %1 of %2" +msgstr "Diferenza %1 de %2" + +#: Merge.rc:2083 +#, c-format +msgid "%1 Differences Found" +msgstr "%1 diferenzas atopadas" + +#: Merge.rc:2084 +#, c-format +msgid "1 Difference Found" +msgstr "1 diferenza atopada" + +#. Abbreviation from "Read Only" +#: Merge.rc:2085 +#, c-format +msgid "RO" +msgstr "SL" + +#: Merge.rc:2091 +#, c-format +msgid "Item %1 of %2" +msgstr "Elemento %1 de %2" + +#: Merge.rc:2092 +#, c-format +msgid "Items: %1" +msgstr "Elementos: %1" + +#: Merge.rc:2098 +#, c-format +msgid "Select two existing folders or files to compare" +msgstr "Escolle dous cartafoles ou arquivos para comparar" + +#: Merge.rc:2099 +#, c-format +msgid "Folder Selection" +msgstr "Seleccin de cartafol" + +#: Merge.rc:2100 +#, c-format +msgid "Select two folders or two files to compare." +msgstr "Escolle dous cartafoles ou arquivos para comparar." + +#: Merge.rc:2101 +#, c-format +msgid "Left path is invalid!" +msgstr "O camio esquerdo non vlido!" + +#: Merge.rc:2102 +#, c-format +msgid "Right path is invalid!" +msgstr "O camio dereito non vlido!" + +#: Merge.rc:2103 +#, c-format +msgid "Both paths are invalid!" +msgstr "Ambos os camios non son vlidos!" + +#: Merge.rc:2104 +#, c-format +msgid "Choose two files to enable unpacker selection." +msgstr "Escolle dous arquivos para activar a seleccin de desempaquetador." + +#: Merge.rc:2105 +#, c-format +msgid "Cannot compare file and folder!" +msgstr "Non se pode comparar un arquivo cun cartafol!" + +#: Merge.rc:2111 +#, c-format +msgid "File not found: %1" +msgstr "No se atopou o arquivo: %1" + +#: Merge.rc:2112 +#, c-format +msgid "File not unpacked: %1" +msgstr "O arquivo non est desempaquetado: %1" + +#: Merge.rc:2113 +#, c-format +msgid "" +"Cannot open file\n" +"%1\n" +"\n" +"%2" +msgstr "" +"Non se pode abrir o arquivo\n" +"%1\n" +"\n" +"%2" + +#: Merge.rc:2114 +#, c-format +msgid "Failed to parse conflict file." +msgstr "Fallo na anlise interpretativa do arquivo de conflito." + +#: Merge.rc:2115 +#, c-format +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." +msgstr "" +"O arquivo\n" +"%1\n" +"non un arquivo de conflito." + +#: Merge.rc:2121 +#, c-format +msgid "Save As" +msgstr "Gardar como" + +#: Merge.rc:2122 +#, c-format +msgid "Save changes to %1?" +msgstr "Queres gardar os cambios en %1?" + +#: Merge.rc:2123 +#, c-format +msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" +msgstr "%1 est definido como de s-lectura. Queres sobre-escribilo? (Non gardar cun nome de arquivo novo.)" + +#: Merge.rc:2124 +#, c-format +msgid "Error checking destination writeability" +msgstr "Erro ao comprobar se o destino escribible" + +#: Merge.rc:2125 +#, c-format +msgid "Error backing up file" +msgstr "Erro ao facer unha copia de seguridade do arquivo" + +#: Merge.rc:2127 +#, c-format +msgid "" +"Unable to backup original file:\n" +"%1\n" +"\n" +"Continue anyway?" +msgstr "" +"Non se puido facer unha copia de seguridade:\n" +"%1\n" +"\n" +"Queres continuar?" + +#: Merge.rc:2128 +#, c-format +msgid "" +"Saving file failed.\n" +"%1\n" +"%2\n" +"Do you want to:\n" +"\t-use a different filename (Press Ok)\n" +"\t-abort the current operation (Press Cancel)?" +msgstr "" +"Fallou a gravacin do arquivo.\n" +"%1\n" +"%2\n" +"Queres\n" +"\t-usar un nome de arquivo distinto (preme Aceptar)\n" +"\t-abortar a operacin (preme Abortar)?" + +#: Merge.rc:2129 +#, c-format +msgid "" +"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" +"\n" +"The original file will not be changed.\n" +"\n" +"Do you want to save the unpacked version to another file?" +msgstr "" +"O plugin '%2' non puido empaquetar os cambios no arquivo da esquerda en '%1'.\n" +"\n" +"O arquivo orixinal non ser cambiado.\n" +"\n" +"Desexas gardar a versin desempaquetada noutro arquivo?" + +#: Merge.rc:2130 +#, c-format +msgid "" +"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" +"\n" +"The original file will not be changed.\n" +"\n" +"Do you want to save the unpacked version to another file?" +msgstr "" +"O plugin '%2' non puido empaquetar os cambios no arquivo da dereita en '%1'.\n" +"\n" +"O arquivo orixinal non ser cambiado.\n" +"\n" +"Desexas gardar a versin desempaquetada noutro arquivo?" + +#: Merge.rc:2131 +#, c-format +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge loaded it.\n" +"\n" +"Overwrite changed file?" +msgstr "" +"Outra aplicacin actualizou o arquivo\n" +"%1\n" +"desde que WinMerge o cargou.\n" +"\n" +"Queres sobre-escribir o arquivo cambiado?" + +#: Merge.rc:2132 +#, c-format +msgid "" +"%1\n" +"is marked read-only. Would you like to override the read-only item?" +msgstr "" +"%1\n" +" est marcado como de s-lectura. Queres sobre-escribir o elemento?" + +#: Merge.rc:2133 +#, c-format +msgid "" +"Another application has updated file\n" +"%1\n" +"since WinMerge scanned it last time.\n" +"\n" +"If you want to refresh files close current file compare and load files again." +msgstr "" +"Outra aplicacin actualizou o arquivo\n" +"%1\n" +"desde que WinMerge o escaneou por ltima vez.\n" +"\n" +"Se queres refrescar os arquivos pecha a comparacin actual e carga os arquivos de novo." + +#: Merge.rc:2134 +#, c-format +msgid "Save Left File As" +msgstr "Gardar o arquivo esquerdo como" + +#: Merge.rc:2135 +#, c-format +msgid "Save Right File As" +msgstr "Gardar o arquivo dereito como" + +#: Merge.rc:2141 +#, c-format +msgid "" +"Cannot merge differences when documents are not in synch.\n" +"\n" +"Refresh documents before continuing." +msgstr "" +"Non se poden combinar diferenzas en documentos non sincronizados.\n" +"\n" +"Actualizar os documentos antes de seguir." + +#: Merge.rc:2147 +#, c-format +msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" +msgstr "Debes especificar o camio do proxecto SourceSafe para continuar (p.e:$/ProxectoMeu)" + +#: Merge.rc:2148 +#, c-format +msgid "Checkout files from VSS..." +msgstr "Desprotexer arquivos de VSS..." + +#: Merge.rc:2149 +#, c-format +msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." +msgstr "O Sistema de Versionado devolveu un erro mentres se intentaba desprotexer o arquivo. Imposible proseguir..." + +#: Merge.rc:2150 +#, c-format +msgid "Error executing versioning system command." +msgstr "Erro ao executar un comando no sistema de versionado" + +#: Merge.rc:2151 +#, c-format +msgid "The VSS Working Folder and the location of the current file do not match. Continue?" +msgstr "O cartafol de traballo VSS e a localizacin do arquivo actual non coinciden. Queres continuar?" + +#: Merge.rc:2152 +#, c-format +msgid "No VSS database(s) found!" +msgstr "Non se atopou banco de datos VSS ningn" + +#: Merge.rc:2153 +#, c-format +msgid "Error from VSS:" +msgstr "Erro de VSS:" + +#: Merge.rc:2154 +#, 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 "" +"O sistema de versionado devolveu un erro ao intentar protexer o arquivo.\n" +"Comproba a configuracin da visualizacin.\n" +"Queres anular a operacin de desproteccin?" + +#: Merge.rc:2155 +#, c-format +msgid "" +"Versioning System returned an error while attempting to undo checkout the file.\n" +" Please, check config spec of used view. " +msgstr "" +"O sistema de versionado devolveu un erro ao intentar desfacer a desproteccin do arquivo.\n" +"Comproba a configuracin da visualizacin." + +#: Merge.rc:2161 +#: Merge.rc:2600 +#, c-format +msgid "None" +msgstr "Ningn" + +#: Merge.rc:2162 +#, c-format +msgid "Visual SourceSafe (less than 5.0)" +msgstr "Visual SourceSafe (inferior de 5.0)" + +#: Merge.rc:2163 +#, c-format +msgid "Visual SourceSafe (5.0 and above)" +msgstr "Visual SourceSafe (5.0 e superiores)" + +#: Merge.rc:2165 +#, c-format +msgid "Break at whitespace" +msgstr "Parar no espazo en branco" + +#: Merge.rc:2166 +#, c-format +msgid "Break at whitespace or punctuation" +msgstr "Parar en espazo en branco ou puntuacin" + +#: Merge.rc:2172 +#: Merge.rc:2174 +#, c-format +msgid "Copy selected item to named directory" +msgstr "Copiar o elemento escollido para o cartafol chamado" + +#: Merge.rc:2173 +#: Merge.rc:2175 +#, c-format +msgid "Copy selected item to custom directory" +msgstr "Copiar o elemento escollido para o cartafol seleccionado" + +#: Merge.rc:2176 +#, c-format +msgid "Delete selected item on left" +msgstr "Borrar o elemento escollido da banda esquerda " + +#: Merge.rc:2177 +#, c-format +msgid "Delete selected item on right" +msgstr "Borrar o elemento escollido da banda dereita" + +#: Merge.rc:2178 +#, c-format +msgid "Delete selected item(s) on both sides" +msgstr "Borrar os elementos escollidos en ambas as bandas" + +#: Merge.rc:2179 +#, c-format +msgid "Hide selected item(s) (on the fly filter)" +msgstr "Agochar os elementos seleccionados (filtro sobre a marcha)" + +#: Merge.rc:2180 +#, c-format +msgid "Rename selected item on both sides" +msgstr "Renomear os elementos escollidos en ambas as bandas" + +#: Merge.rc:2181 +#, c-format +msgid "Right to Left (%1)" +msgstr "Da dereita para a esquerda (%1)" + +#: Merge.rc:2182 +#, c-format +msgid "Left to Right (%1)" +msgstr "Da esquerda para a dereita(%1)" + +#: Merge.rc:2183 +#, c-format +msgid "Right to Left (%1 of %2)" +msgstr "Da dereita para a esquerda (%1 de %2)" + +#: Merge.rc:2184 +#, c-format +msgid "Left to Right (%1 of %2)" +msgstr "Da esquerda para a dereita (%1 de %2)" + +#: Merge.rc:2185 +#: Merge.rc:2201 +#, c-format +msgid "Left to... (%1)" +msgstr "Banda esquerda a...(%1)" + +#: Merge.rc:2186 +#: Merge.rc:2202 +#, c-format +msgid "Right to... (%1)" +msgstr "Banda dereita a...(%1)" + +#: Merge.rc:2187 +#: Merge.rc:2203 +#, c-format +msgid "Left to... (%1 of %2)" +msgstr "Banda esquerda a...(%1 de %2)" + +#: Merge.rc:2188 +#: Merge.rc:2204 +#, c-format +msgid "Right to... (%1 of %2)" +msgstr "Banda dereita a...(%1 de %2)" + +#: Merge.rc:2194 +#, c-format +msgid "Left (%1)" +msgstr "Esquerda (%1)" + +#: Merge.rc:2195 +#, c-format +msgid "Right (%1)" +msgstr "Dereita (%1)" + +#: Merge.rc:2196 +#, c-format +msgid "Both (%1)" +msgstr "Ambas (%1)" + +#: Merge.rc:2197 +#, c-format +msgid "Left (%1 of %2)" +msgstr "Esquerda (%1 de %2)" + +#: Merge.rc:2198 +#, c-format +msgid "Right (%1 of %2)" +msgstr "Dereita (%1 de %2)" + +#: Merge.rc:2199 +#, c-format +msgid "Both (%1 of %2)" +msgstr "Ambas as bandas (%1 de %2)" + +#: Merge.rc:2200 +#, c-format +msgid "Select destination folder" +msgstr "Escoller cartafol de destino" + +#: Merge.rc:2205 +#, c-format +msgid "Left side - select destination folder:" +msgstr "Banda esquerda - escoller cartafol de destino:" + +#: Merge.rc:2206 +#, c-format +msgid "Right side - select destination folder:" +msgstr "Banda dereita - escoller cartafol de destino:" + +#: Merge.rc:2207 +#, c-format +msgid "(%1 Files Affected)" +msgstr "(%1 arquivos afectados)" + +#: Merge.rc:2208 +#, c-format +msgid "(%1 of %2 Files Affected)" +msgstr "(%1 de %2 arquivos afectados)" + +#: Merge.rc:2214 +#, c-format +msgid "" +"Are you sure you want to delete\n" +"\n" +"%1 ?" +msgstr "" +"Seguro que queres borrar o cartafol\n" +"\n" +"%1 ?" + +#: Merge.rc:2215 +#, c-format +msgid "Are you sure you want to copy:" +msgstr "Tes a certeza de quereres copiar:" + +#: Merge.rc:2216 +#, c-format +msgid "Are you sure you want to copy %d items:" +msgstr "Tes a certeza de quereres copiar %d elementos: " + +#: Merge.rc:2217 +#, c-format +msgid "" +"Operation aborted!\n" +"\n" +"Folder contents at disks has changed, path\n" +"%1\n" +"was not found.\n" +"\n" +"Please refresh the compare." +msgstr "" +"Operacin abortada!\n" +"\n" +"O contido do cartafol do disco cambiou, non se atopou o camio\n" +"%1\n" +"\n" +"\n" +"Actualiza a comparacin. " + +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "Tes a certeza de quereres mover:" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "Tes a certeza de quereres mover %d elementos: " + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "Confirmar Movemento" + +#: Merge.rc:2227 +#, c-format +msgid "Open left file" +msgstr "Abrir arquivo esquerdo" + +#: Merge.rc:2228 +#, c-format +msgid "Open the left file to external editor" +msgstr "Abrir o arquivo esquerdo cun editor externo" + +#: Merge.rc:2229 +#, c-format +msgid "Open left file with ..." +msgstr "Abrir arquivo esquerdo con..." + +#: Merge.rc:2230 +#, c-format +msgid "Open right file" +msgstr "Abrir arquivo dereito" + +#: Merge.rc:2231 +#, c-format +msgid "Open the right file to external editor" +msgstr "Abrir o arquivo dereito cun editor externo" + +#: Merge.rc:2232 +#, c-format +msgid "Open right file with..." +msgstr "Abrir o arquivo dereito con..." + +#: Merge.rc:2233 +#, c-format +msgid "Failed to execute external editor: %1" +msgstr "Non se puido executar o editor externo: %1" + +#: Merge.rc:2234 +#, c-format +msgid "Unknown extension on external editor: %1" +msgstr "Extensin descoecida do editor externo: %1" + +#: Merge.rc:2235 +#, c-format +msgid "Copy filenames to clipboard" +msgstr "Copiar ao portapapeis os nomes dos arquivos" + +#: Merge.rc:2236 +#, c-format +msgid "Copy left side pathnames to clipboard" +msgstr "Copiar ao portapapeis os camios da banda esquerda" + +#: Merge.rc:2237 +#, c-format +msgid "Copy right side pathnames to clipboard" +msgstr "Copiar ao portapapeis os camios da banda dereita" + +#: Merge.rc:2238 +#, c-format +msgid "Copy both sides pathnames to clipboard" +msgstr "Copiar ao portapapeis os camios de ambas as bandas" + +#: Merge.rc:2244 +#, c-format +msgid "Unknown archive format" +msgstr "Formato de arquivo descoecido" + +#: Merge.rc:2245 +#, c-format +msgid "Add items from left side to archive" +msgstr "Engadir os elementos da banda esquerda ao arquivo" + +#: Merge.rc:2246 +#, c-format +msgid "Add items from right side to archive" +msgstr "Engadir os elementos da banda dereita ao arquivo" + +#: Merge.rc:2247 +#, c-format +msgid "Add items from both sides to archive" +msgstr "Engadir os elementos de ambas as bandas ao arquivo" + +#: Merge.rc:2248 +#, c-format +msgid "Add different items to archive (both sides)" +msgstr "Engadir ao arquivo elementos diferentes (ambas as bandas)" + +#: Merge.rc:2250 +#, c-format +msgid "Move selected file on left to custom directory" +msgstr "Mover o arquivo seleccionado da esquerda para o cartafol escollido" + +#: Merge.rc:2252 +#, c-format +msgid "Move selected file on right to custom directory" +msgstr "Mover o arquivo seleccionado da dereita para o cartafol escollido" + +#: Merge.rc:2258 +#, c-format +msgid "Filename" +msgstr "Nome do arquivo" + +#: Merge.rc:2259 +#, c-format +msgid "Folder" +msgstr "Cartafol" + +#: Merge.rc:2260 +#, c-format +msgid "Comparison result" +msgstr "Resultado da comparacin" + +#: Merge.rc:2261 +#, c-format +msgid "Left Date" +msgstr "Data esquerda" + +#: Merge.rc:2262 +#, c-format +msgid "Right Date" +msgstr "Data dereita" + +#: Merge.rc:2263 +#, c-format +msgid "Extension" +msgstr "Extensin" + +#: Merge.rc:2264 +#, c-format +msgid "Left Size" +msgstr "Tamao esquerda" + +#: Merge.rc:2265 +#, c-format +msgid "Right Size" +msgstr "Tamao dereita" + +#: Merge.rc:2266 +#, c-format +msgid "Right Size (Short)" +msgstr "Tamao dereita (curto)" + +#: Merge.rc:2267 +#, c-format +msgid "Left Size (Short)" +msgstr "Tamao esquerda (curto)" + +#: Merge.rc:2273 +#, c-format +msgid "Left Creation Time" +msgstr "Data de creacin esquerda" + +#: Merge.rc:2274 +#, c-format +msgid "Right Creation Time" +msgstr "Data de creacin dereita" + +#: Merge.rc:2275 +#, c-format +msgid "Newer File" +msgstr "Arquivo mis recente" + +#: Merge.rc:2276 +#, c-format +msgid "Left File Version" +msgstr "Versin do arquivo esquerdo" + +#: Merge.rc:2277 +#, c-format +msgid "Right File Version" +msgstr "Versin do arquivo dereito" + +#: Merge.rc:2278 +#, c-format +msgid "Short Result" +msgstr "Resultado curto" + +#: Merge.rc:2279 +#, c-format +msgid "Left Attributes" +msgstr "Atributos da esquerda" + +#: Merge.rc:2280 +#, c-format +msgid "Right Attributes" +msgstr "Atributos da dereita" + +#: Merge.rc:2281 +#, c-format +msgid "Left EOL" +msgstr "EOL esquerdo" + +#: Merge.rc:2282 +#, c-format +msgid "Right EOL" +msgstr "EOL dereito" + +#: Merge.rc:2288 +#, c-format +msgid "Left Encoding" +msgstr "Codificacin esquerda" + +#: Merge.rc:2289 +#, c-format +msgid "Right Encoding" +msgstr "Codificacin dereita" + +#: Merge.rc:2290 +#, c-format +msgid "Ignored Diff." +msgstr "Diferenzas ignoradas" + +#: Merge.rc:2291 +#, c-format +msgid "Differences" +msgstr "Diferenzas" + +#: Merge.rc:2292 +#: Merge.rc:2596 +#, c-format +msgid "Binary" +msgstr "Binario" + +#: Merge.rc:2298 +#, c-format +msgid "Unable to compare files" +msgstr "Non posible comparar os arquivos" + +#: Merge.rc:2299 +#, c-format +msgid "Item aborted" +msgstr "Elemento abortado" + +#: Merge.rc:2300 +#, c-format +msgid "File skipped" +msgstr "Arquivo saltado" + +#: Merge.rc:2301 +#, c-format +msgid "Folder skipped" +msgstr "Cartafol saltado" + +#: Merge.rc:2302 +#, c-format +msgid "Left only: %1" +msgstr "S esquerda: %1" + +#: Merge.rc:2303 +#, c-format +msgid "Right only: %1" +msgstr "S dereita: %1" + +#: Merge.rc:2304 +#, c-format +msgid "Binary files are identical" +msgstr "Os arquivos binarios son idnticos" + +#: Merge.rc:2306 +#, c-format +msgid "Binary files are different" +msgstr "Os arquivos binarios son diferentes" + +#: Merge.rc:2307 +#, c-format +msgid "Files are different" +msgstr "Os arquivos son diferentes" + +#: Merge.rc:2308 +#, c-format +msgid "Left Only" +msgstr "S esquerda" + +#: Merge.rc:2309 +#, c-format +msgid "Right Only" +msgstr "S dereita" + +#: Merge.rc:2311 +#, c-format +msgid "Error" +msgstr "Erro" + +#: Merge.rc:2317 +#, c-format +msgid "Elapsed time: %ld ms" +msgstr "Tempo decorrido: %ld ms" + +#: Merge.rc:2318 +#, c-format +msgid "1 item selected" +msgstr "1 elemento seleccionado" + +#: Merge.rc:2319 +#, c-format +msgid "%1 items selected" +msgstr "%1 elementos seleccionados" + +#: Merge.rc:2325 +#, c-format +msgid "Filename or folder name." +msgstr "Nome do arquivo ou cartafol." + +#: Merge.rc:2326 +#, c-format +msgid "Subfolder name when subfolders are included." +msgstr "Nome do sub-cartafol cando os sub-cartafoles estn includos" + +#: Merge.rc:2327 +#, c-format +msgid "Comparison result, long form." +msgstr "Resultados da comparacin, formato completo." + +#: Merge.rc:2328 +#, c-format +msgid "Left side modification date." +msgstr "Data de modificacin da banda esquerda." + +#: Merge.rc:2329 +#, c-format +msgid "Right side modification date." +msgstr "Data de modificacin da banda dereita" + +#: Merge.rc:2330 +#, c-format +msgid "File's extension." +msgstr "Extensin do arquivo." + +#: Merge.rc:2331 +#, c-format +msgid "Left file size in bytes." +msgstr "Tamao do arquivo esquerdo en bytes." + +#: Merge.rc:2332 +#, c-format +msgid "Right file size in bytes." +msgstr "Tamao do arquivo dereito en bytes." + +#: Merge.rc:2333 +#, c-format +msgid "Left file size abbreviated." +msgstr "Tamao abreviado do arquivo esquerdo." + +#: Merge.rc:2334 +#, c-format +msgid "Right file size abbreviated." +msgstr "Tamao abreviado do arquivo dereito. " + +#: Merge.rc:2340 +#, c-format +msgid "Left side creation time." +msgstr "Data de creacin do arquivo esquerdo." + +#: Merge.rc:2341 +#, c-format +msgid "Right side creation time." +msgstr "Data de creacin do arquivo dereito." + +#: Merge.rc:2342 +#, c-format +msgid "Tells which side has newer modification date." +msgstr "Di que parte foi modificada mis recentemente." + +#: Merge.rc:2343 +#, c-format +msgid "Left side file version, only for some filetypes." +msgstr "Versin do arquivo da banda esquerda, s para algns tipos de arquivo." + +#: Merge.rc:2344 +#, c-format +msgid "Right side file version, only for some filetypes." +msgstr "Versin do arquivo da banda dereita, s para algns tipos de arquivo." + +#: Merge.rc:2345 +#, c-format +msgid "Short comparison result." +msgstr "Resultados curtos da comparacin." + +#: Merge.rc:2346 +#, c-format +msgid "Left side attributes." +msgstr "Atributos da banda esquerda." + +#: Merge.rc:2347 +#, c-format +msgid "Right side attributes." +msgstr "Atributos da banda dereita." + +#: Merge.rc:2348 +#, c-format +msgid "Left side file EOL type" +msgstr "Tipo de EOL do arquivo esquerdo" + +#: Merge.rc:2349 +#, c-format +msgid "Right side file EOL type" +msgstr "Tipo de EOL do arquivo dereito" + +#: Merge.rc:2355 +#, c-format +msgid "Left side encoding." +msgstr "Codificacin da banda esquerda." + +#: Merge.rc:2356 +#, c-format +msgid "Right side encoding." +msgstr "Codificacin da banda dereita." + +#: Merge.rc:2357 +#, c-format +msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." +msgstr "Nmero de diferenzas ignoradas no arquivo. Estas diferenzas son ignoradas por WinMerge e non se poden combinar." + +#: Merge.rc:2358 +#, c-format +msgid "Number of differences in file. This number does not include ignored differences." +msgstr "Nmero de diferenzas no arquivo. Este nmero non incle as diferenzas ignoradas." + +#: Merge.rc:2359 +#, c-format +msgid "Shows an asterisk (*) if the file is binary." +msgstr "Amosa un asterisco (*) se o arquivo binario." + +#: Merge.rc:2365 +#, c-format +msgid "Compare %1 with %2" +msgstr "Comparar %1 con %2" + +#: Merge.rc:2366 +#, c-format +msgid "Comma-separated list" +msgstr "Listaxe separada por comas" + +#: Merge.rc:2367 +#, c-format +msgid "Tab-separated list" +msgstr "Listaxe separada por tabulacins" + +#: Merge.rc:2368 +#, c-format +msgid "Simple HTML" +msgstr "HTML simple" + +#: Merge.rc:2369 +#, c-format +msgid "Simple XML" +msgstr "XML simple" + +#: Merge.rc:2371 +#, c-format +msgid "The report file already exists. Do you want to overwrite existing file?" +msgstr "O arquivo de informe xa existe. Qurelo sobre-escribir?" + +#: Merge.rc:2372 +#, c-format +msgid "" +"Error creating the report:\n" +"%1" +msgstr "Erro ao crear o informe:n%1" + +#: Merge.rc:2373 +#, c-format +msgid "The report has been created successfully." +msgstr "O informe creouse correctamente." + +#: Merge.rc:2379 +#, c-format +msgid "The same file is opened in both panels." +msgstr "O mesmo arquivo est aberto en ambos paneis." + +#: Merge.rc:2380 +#, c-format +msgid "The selected files are identical." +msgstr "Os arquivos escollidos son idnticos." + +#: Merge.rc:2381 +#, c-format +msgid "An error occurred while comparing the files." +msgstr "Produciuse un erro durante a comparacin dos arquivos." + +#: Merge.rc:2382 +#, c-format +msgid "Temporary files could not be created. Check your temporary path settings." +msgstr "Non se puideron crear os arquivos temporais. Comproba as configuracins dos camios." + +#: Merge.rc:2383 +#, c-format +msgid "" +"These files use different carriage return types.\n" +"\n" +"Do you want to treat all carriage return types as equivalent for this comparison?\n" +"\n" +"Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." +msgstr "" +"Estes arquivos empregan tipos diferentes de quebras de lia.\n" +"\n" +"Queres tratar todas as quebras de lia como se fosen equivalentes para a comparacin?\n" +"\n" +"Aviso: Se queres tratar todos os tipos de quebra como equivalentes, marca a opcin 'Ignorar diferenzas de quebras de lia..' no apartado de comparacin do dilogo de opcins (dispoible en Editar/Opcins)." + +#: Merge.rc:2384 +#, 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 "" +"Os EOL (remate de lia) son de diferentes tipos (Windows/Unix/Mac) no arquivo '%1'.\n" +"Coa configuracin actual, sern unificados co tipo principal.\n" +"Queres cambiar as opcins e conservar os EOL diferentes?" + +#: Merge.rc:2385 +#, c-format +msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." +msgstr "Aconteceu un erro durante a pre-comparacin do arquivo '%1' co plugin '%2'. A pre-comparacin non se aplicar de novo." + +#: Merge.rc:2386 +#, c-format +msgid "The selected folder is invalid." +msgstr "O cartafol seleccionado non vlido." + +#: Merge.rc:2387 +#, c-format +msgid "Cannot open a binary file to editor." +msgstr "Non se pode abrir un arquivo binario no editor." + +#: Merge.rc:2388 +#, c-format +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" +msgstr "" +"O cartafol s existe no outro lado e non posible abrilo.\n" +"\n" +"Queres crear un cartafol:\n" +"%1\n" +"que coincida co anterior e abrir mbolos dous?" + +#: Merge.rc:2394 +#, c-format +msgid "" +"Different codepages found in left (cp%d) and right (cp%d) files. \n" +"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" +"Would you like to treat both files as being in the default windows codepage (recommended)?" +msgstr "" +"Atopronse diferentes pxinas de codigos na esquerda (cp%d) e na dereita (cp%d).\n" +"Amosando cada arquivo coa sa pxina de cdigos proporcionar unha mellor visualizacin pero combinar/copiar ser perigoso.\n" +"Preferiras tratar ambos arquivos como se tivesen a pxina de cdigos predeterminada de windows (recomendado)?" + +#: Merge.rc:2395 +#, c-format +msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." +msgstr "AVISO: Os arquivos empregan codificacins distintas, esquerdo=%s e dereito=%s, combinalos pode producir perdas de datos." + +#: Merge.rc:2396 +#, c-format +msgid "Information lost due to encoding errors: both files" +msgstr "Perdeuse informacin debido a erros de codificacin: en ambos os arquivos" + +#: Merge.rc:2397 +#, c-format +msgid "Information lost due to encoding errors: right file" +msgstr "Informacin perdida debido a erros de codificacin: arquivo dereito" + +#: Merge.rc:2398 +#, c-format +msgid "Information lost due to encoding errors: left file" +msgstr "Informacin perdida debido a erros de codificacin: arquivo esquerdo" + +#: Merge.rc:2404 +#, c-format +msgid "No difference" +msgstr "Non hai diferenzas" + +#: Merge.rc:2405 +#, c-format +msgid "Line difference" +msgstr "Diferenzas de lia" + +#: Merge.rc:2411 +#, c-format +msgid "Replaced %1 string(s)." +msgstr "Substitudas %1 cadea(s)." + +#: Merge.rc:2412 +#, c-format +msgid "Cannot find string \"%s\"" +msgstr "Non se atopou a cadea \"%s\"" + +#: Merge.rc:2418 +#, c-format +msgid "Copy Full Path" +msgstr "Copiar o camio completo" + +#: Merge.rc:2419 +#, c-format +msgid "Copy Filename" +msgstr "Copiar o nome do arquivo" + +#: Merge.rc:2425 +#, c-format +msgid "Location Pane" +msgstr "Panel de situacin" + +#: Merge.rc:2426 +#, c-format +msgid "Diff Pane" +msgstr "Panel de diferenzas" + +#: Merge.rc:2432 +#, c-format +msgid "Patch file successfully written." +msgstr "Escribiuse correctamente o arquivo de mendo." + +#: Merge.rc:2433 +#, c-format +msgid "1. item is not found or is directory!" +msgstr "1. Non se atopou este elemento ou un cartafol" + +#: Merge.rc:2434 +#, c-format +msgid "2. item is not found or is directory!" +msgstr "2. Non se atopou este elemento ou un cartafol" + +#: Merge.rc:2435 +#, c-format +msgid "The patch file already exists. Do you want to overwrite it?" +msgstr "O arquivo patch xa existe. Qurelo sobre-escribir?" + +#: Merge.rc:2436 +#, c-format +msgid "[%1 files selected]" +msgstr "[%1 arquivos seleccionados]" + +#: Merge.rc:2437 +#, c-format +msgid "Normal" +msgstr "Normal" + +#: Merge.rc:2438 +#, c-format +msgid "Context" +msgstr "Contexto" + +#: Merge.rc:2439 +#, c-format +msgid "Unified" +msgstr "Unificado" + +#: Merge.rc:2440 +#, c-format +msgid "Could not write to file %1." +msgstr "Non se puido escribir no arquivo %1." + +#: Merge.rc:2441 +#, c-format +msgid "The specified output path is not an absolute path: %1" +msgstr "O camio de sada especificado non un camio absoluto: %1" + +#: Merge.rc:2442 +#, c-format +msgid "Specify an output file" +msgstr "Especifica un arquivo de sada" + +#: Merge.rc:2443 +#, c-format +msgid "Cannot create a patch file from binary files." +msgstr "Non se pode crear un arquivo patch desde arquivos binarios." + +#: Merge.rc:2444 +#, c-format +msgid "Cannot create a patch file from directories." +msgstr "Non se pode crear un arquivo patch desde un cartafol." + +#: Merge.rc:2445 +#, c-format +msgid "" +"Please save all files first.\n" +"\n" +"Creating a patch requires that there are no unsaved changes in files." +msgstr "" +"Garda todos os arquivos primeiro.\n" +"\n" +"Crear un arquivo patch precisa que todos os cambios nos arquivos estean gardados." + +#: Merge.rc:2446 +#, c-format +msgid "Folder does not exist." +msgstr "O cartafol non existe." + +#: Merge.rc:2451 +#, c-format +msgid "Current directory comparison results will be cleared." +msgstr "Os resultados da comparacin actual sern borrados." + +#: Merge.rc:2452 +#, c-format +msgid "" +"Archive support is not enabled.\n" +"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n" +"See manual for more info about archive support and how to enable it." +msgstr "" +"O soporte de arquivos non est activado.\n" +"Non foron atopados todos os compoentes precisos (7-zip e/ou Merge7z*.dll).\n" +"Mira o manual para mis informacin acerca do soporte de arquivos e como se activa. " + +#: Merge.rc:2453 +#, c-format +msgid "" +"\n" +"Note: 7-Zip integration is disabled in WinMerge settings." +msgstr "" +"\n" +"Aviso: a integracin do 7-Zip est desactivada na configuracin de Winmerge." + +#: Merge.rc:2454 +#, c-format +msgid "" +"\n" +"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." +msgstr "" +"\n" +"Aviso: a integracin de 7-Zip est restrinxida a unha operacin independente na configuracin de Winmerge." + +#: Merge.rc:2455 +#, c-format +msgid "Select file for export" +msgstr "Escolle un arquivo para exportar" + +#: Merge.rc:2456 +#, c-format +msgid "Select file for import" +msgstr "Escolle un arquivo para importar" + +#: Merge.rc:2457 +#, c-format +msgid "Options imported from the file." +msgstr "Opcins importadas desde o arquivo." + +#: Merge.rc:2458 +#, c-format +msgid "Options exported to the file." +msgstr "Opcins exportadas desde o arquivo." + +#: Merge.rc:2459 +#, c-format +msgid "Failed to import options from the file." +msgstr "Fallo na importacin das opcins deste arquivo." + +#: Merge.rc:2460 +#, c-format +msgid "Failed to write options to the file." +msgstr "Fallo ao escribir as opcins no arquivo." + +#: Merge.rc:2461 +#, c-format +msgid "" +"You are about to close several compare windows.\n" +"\n" +"Do you want to continue?" +msgstr "" +"Vas pechar varias vents de comparacin.\n" +"\n" +"Queres continuar?" + +#: Merge.rc:2467 +#, c-format +msgid "Regular expression error" +msgstr "Erro na expresin regular" + +#: Merge.rc:2468 +#, c-format +msgid "No match" +msgstr "Non hai coincidencias" + +#: Merge.rc:2469 +#, c-format +msgid "Invalid regular expression" +msgstr "A expresin regular non vlida" + +#: Merge.rc:2470 +#, c-format +msgid "Invalid collation character" +msgstr "Caracter de intercalacin non vlido" + +#: Merge.rc:2471 +#, c-format +msgid "Invalid character class name" +msgstr "O nome da clase do caracter non vlido" + +#: Merge.rc:2472 +#, c-format +msgid "Trailing backslash" +msgstr "Barra invertida ao final" + +#: Merge.rc:2473 +#, c-format +msgid "Invalid back reference" +msgstr "Invalid back reference" + +#: Merge.rc:2474 +#, c-format +msgid "Unmatched [ or [^" +msgstr "Sen coincidencias [ ou [^" + +#: Merge.rc:2475 +#, c-format +msgid "Unmatched ( or \\(" +msgstr "Sen coincidencias ( ou \\(" + +#: Merge.rc:2476 +#, c-format +msgid "Unmatched \\{" +msgstr "Sen coincidencia \\{" + +#: Merge.rc:2477 +#, c-format +msgid "Invalid content of \\{\\}" +msgstr "Contido non vlido en \\{\\}" + +#: Merge.rc:2478 +#, c-format +msgid "Invalid range end" +msgstr "O fin de rango non vlido" + +#: Merge.rc:2479 +#, c-format +msgid "Out of memory" +msgstr "Memoria insuficiente" + +#: Merge.rc:2480 +#, c-format +msgid "Invalid preceding regular expression" +msgstr "A expresin regular precedente non vlida" + +#: Merge.rc:2481 +#, c-format +msgid "Premature end of regular expression" +msgstr "Final prematuro da expresin regular" + +#: Merge.rc:2482 +#, c-format +msgid "Regular expression too big" +msgstr "A expresin regular grande de mis" + +#: Merge.rc:2487 +#, c-format +msgid "Unmatched ) or \\)" +msgstr "Sen coincidencia ) or \\)" + +#: Merge.rc:2493 +#, c-format +msgid "Western European" +msgstr "Europa occidental" + +#: Merge.rc:2494 +#, c-format +msgid "Eastern European" +msgstr "Europa oriental" + +#: Merge.rc:2495 +#, c-format +msgid "East Asian" +msgstr "Europa central" + +#: Merge.rc:2496 +#, c-format +msgid "SE & SW Asian" +msgstr "Asia SE e SO" + +#: Merge.rc:2497 +#, c-format +msgid "Middle Eastern" +msgstr "Oriente medio" + +#: Merge.rc:2498 +#: Merge.rc:2508 +#, c-format +msgid "Not applicable" +msgstr "Non aplicable" + +#: Merge.rc:2504 +#, c-format +msgid "MS-Windows" +msgstr "MS-Windows" + +#: Merge.rc:2505 +#, c-format +msgid "MS-DOS" +msgstr "MS-DOS" + +#: Merge.rc:2506 +#, c-format +msgid "Macintosh" +msgstr "Macintosh" + +#: Merge.rc:2507 +#, c-format +msgid "IBM" +msgstr "IBM" + +#: Merge.rc:2514 +#, c-format +msgid "EBCDIC" +msgstr "EBCDIC" + +#: Merge.rc:2515 +#, c-format +msgid "IBM EBCDIC Cyrillic" +msgstr "IBM EBCDIC cirlico" + +#: Merge.rc:2521 +#, c-format +msgid "MS-DOS Latin US" +msgstr "MS-DOS Latin US" + +#: Merge.rc:2522 +#, c-format +msgid "MS-DOS Arabic" +msgstr "MS-DOS rabe" + +#: Merge.rc:2523 +#, c-format +msgid "MS-DOS Greek" +msgstr "MS-DOS grego" + +#: Merge.rc:2524 +#, c-format +msgid "MS-DOS Baltic Rim" +msgstr "MS-DOS Baltic Rim" + +#: Merge.rc:2525 +#, c-format +msgid "MS-DOS Latin 1" +msgstr "MS-DOS latino 1" + +#: Merge.rc:2526 +#, c-format +msgid "MS-DOS Greek 1" +msgstr "MS-DOS grego 1" + +#: Merge.rc:2527 +#, c-format +msgid "MS-DOS Latin 2" +msgstr "MS-DOS latino 2" + +#: Merge.rc:2528 +#, c-format +msgid "MS-DOS Cyrillic" +msgstr "MS-DOS cirlico" + +#: Merge.rc:2529 +#, c-format +msgid "MS-DOS Turkish" +msgstr "MS-DOS turco" + +#: Merge.rc:2530 +#, c-format +msgid "MS-DOS Portuguese" +msgstr "MS-DOS portugus" + +#: Merge.rc:2536 +#, c-format +msgid "MS-DOS Icelandic" +msgstr "MS-DOS Islands" + +#: Merge.rc:2537 +#, c-format +msgid "MS-DOS Hebrew" +msgstr "MS-DOS hebreo" + +#: Merge.rc:2538 +#, c-format +msgid "MS-DOS French Canada" +msgstr "MS-DOS francs de Canad" + +#: Merge.rc:2539 +#, c-format +msgid "MS-DOS Nordic" +msgstr "MS-DOS nrdico" + +#: Merge.rc:2540 +#, c-format +msgid "MS-DOS Cyrillic CIS 1" +msgstr "MS-DOS Cirlico CIS 1" + +#: Merge.rc:2541 +#, c-format +msgid "MS-DOS Greek 2" +msgstr "MS-DOS grego 2" + +#: Merge.rc:2547 +#, c-format +msgid "Windows Thai" +msgstr "Windows tai" + +#: Merge.rc:2548 +#, c-format +msgid "Windows Japanese" +msgstr "Windows xapons" + +#: Merge.rc:2549 +#, c-format +msgid "Windows Simplified Chinese" +msgstr "Windows chins simplificado" + +#: Merge.rc:2550 +#, c-format +msgid "Windows Korean" +msgstr "Windows coreano" + +#: Merge.rc:2551 +#, c-format +msgid "Windows Traditional Chinese" +msgstr "Windows chins tradicional" + +#: Merge.rc:2552 +#, c-format +msgid "Windows Latin 2" +msgstr "Windows latino 2" + +#: Merge.rc:2553 +#, c-format +msgid "Windows Cyrillic (Slavic)" +msgstr "Windows cirlico (eslavo)" + +#: Merge.rc:2554 +#, c-format +msgid "Windows Latin 1" +msgstr "Windows latino 1" + +#: Merge.rc:2555 +#, c-format +msgid "Windows Greek" +msgstr "Windows grego" + +#: Merge.rc:2556 +#, c-format +msgid "Windows Latin 5 (Turkish)" +msgstr "Windows latino 5 (turco)" + +#: Merge.rc:2557 +#, c-format +msgid "Windows Hebrew" +msgstr "Windows hebreo" + +#: Merge.rc:2558 +#, c-format +msgid "Windows Arabic" +msgstr "Windows rabe" + +#: Merge.rc:2559 +#, c-format +msgid "Windows Baltic Rim" +msgstr "Windows Baltic Rim" + +#: Merge.rc:2560 +#, c-format +msgid "Windows Vietnamese" +msgstr "Windows vietnamita" + +#: Merge.rc:2566 +#, c-format +msgid "Macintosh Roman" +msgstr "Macintosh Roman" + +#: Merge.rc:2567 +#, c-format +msgid "Macintosh Greek" +msgstr "Macintosh grego" + +#: Merge.rc:2568 +#, c-format +msgid "Macintosh Cyrillic" +msgstr "Macintosh cirlico" + +#: Merge.rc:2569 +#, c-format +msgid "Macintosh " +msgstr "Macintosh" + +#: Merge.rc:2570 +#, c-format +msgid "Macintosh Central Europe" +msgstr "Macintosh Europa central" + +#: Merge.rc:2571 +#, c-format +msgid "Macintosh Turkish" +msgstr "Macintosh turco" + +#: Merge.rc:2580 +#, c-format +msgid "Approximates ISO-8859-2" +msgstr "Aproximadamente ISO-8859-2" + +#: Merge.rc:2583 +#, c-format +msgid "Approximates ISO-8859-1" +msgstr "Aproximadamente ISO-8859-1" + +#: Merge.rc:2584 +#, c-format +msgid "Approximates ISO-8859-7" +msgstr "Aproximadamente ISO-8859-7" + +#: Merge.rc:2585 +#, c-format +msgid "Approximates ISO-8859-9" +msgstr "Aproximadamente ISO-8859-9" + +#: Merge.rc:2586 +#, c-format +msgid "Approximates ISO-8859-8" +msgstr "Aproximadamente ISO-8859-8" + +#: Merge.rc:2592 +#, c-format +msgid "Win" +msgstr "Win" + +#: Merge.rc:2593 +#, c-format +msgid "Mac" +msgstr "Mac" + +#: Merge.rc:2594 +#, c-format +msgid "Unix" +msgstr "Unix" + +#: Merge.rc:2595 +#, c-format +msgid "Mixed" +msgstr "Mesturado" + +#: Merge.rc:2597 +#, c-format +msgid "LF" +msgstr "LF" + +#: Merge.rc:2598 +#, c-format +msgid "CR" +msgstr "CR" + +#: Merge.rc:2599 +#, c-format +msgid "CRLF" +msgstr "CRLF" + +#: Merge.rc:2606 +#, c-format +msgid " B" +msgstr "B" + +#: Merge.rc:2607 +#, c-format +msgid " KB" +msgstr "KB" + +#: Merge.rc:2608 +#, c-format +msgid " MB" +msgstr "MB" + +#: Merge.rc:2609 +#, c-format +msgid " GB" +msgstr "GB" + +#: Merge.rc:2610 +#, c-format +msgid " TB" +msgstr "TB" + +#: Merge.rc:2611 +#, c-format +msgid " PB" +msgstr "PB" + +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "Tipo" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "Desempaquetador" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "Pre-comparacin" + +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "Script do Editor" + +#: Merge.rc:2628 +#, c-format +msgid "Save the left file" +msgstr "Gardar o arquivo esquerdo" + +#: Merge.rc:2629 +#, c-format +msgid "Save the right file" +msgstr "Gardar o arquivo dereito" + +#: Merge.rc:2630 +#, c-format +msgid "Save the left file with name..." +msgstr "Gardar o arquivo esquerdo co nome..." + +#: Merge.rc:2631 +#, c-format +msgid "Save the right file with name..." +msgstr "Gardar o arquivo dereito co nome..." + +#: Merge.rc:2632 +#, c-format +msgid "Change left side file/folder read-only status" +msgstr "Mudar o estado de s-lectura para o arquivo/cartafol da esquerda" + +#: Merge.rc:2633 +#, c-format +msgid "Change right side file/folder read-only status" +msgstr "Mudar o estado de s-lectura para o arquivo/cartafol da dereita" + +#: Merge.rc:2634 +#, c-format +msgid "Convert EOL to Windows mode" +msgstr "Coverter EOL ao modo Windows" + +#: Merge.rc:2635 +#, c-format +msgid "Convert EOL to Unix mode" +msgstr "Converter EOL ao modo Unix" + +#: Merge.rc:2636 +#, c-format +msgid "Convert EOL to Mac mode" +msgstr "Converter EOL ao modo Mac" + +#: Merge.rc:2637 +#, c-format +msgid "Switch between editing and merging modes" +msgstr "Cambiar entre modo editar e modo combinar" + +#: Merge.rc:2638 +#, c-format +msgid "" +"View and adjust file encoding properties\n" +"File encoding properties" +msgstr "" +"Ver e axustar as propiedades de codificacin de arquivos\n" +"Propiedades de codificacin de arquivos" + +#: Merge.rc:2639 +#, c-format +msgid "Open and resolve conflict file" +msgstr "Abrir e resolver arquivo de conflito" + +#: Merge.rc:2645 +#, c-format +msgid "" +"Select difference area in the current line\n" +"Difference in the Current Line" +msgstr "" +"Selecciona a rea de diferenzas na lia actual\n" +"Diferenzas na lia actual" + +#: Merge.rc:2646 +#, c-format +msgid "" +"Go to line or difference\n" +"Go to (Ctrl+G)" +msgstr "" +"Ir lia ou diferenza\n" +"Ir (Ctrl+G)" + +#: Merge.rc:2647 +#, c-format +msgid "" +"Set program options\n" +"Options" +msgstr "" +"Establecer as opcins\n" +"Opcins" + +#: Merge.rc:2648 +#, c-format +msgid "" +"Refresh display\n" +"Refresh (F5)" +msgstr "" +"Actualizar pantalla\n" +"Actualizar (F5)" + +#: Merge.rc:2649 +#, c-format +msgid "Copy selected lines to clipboard adding linenumbers to line begin" +msgstr "Copiar as lias seleccionadas ao portapapeis engadindo o nmero de lia ao comezo" + +#: Merge.rc:2650 +#, c-format +msgid "Refresh selected items" +msgstr "Refrescar os elementos escollidos" + +#: Merge.rc:2651 +#, c-format +msgid "Toggle bookmark" +msgstr "Cambiar marcador" + +#: Merge.rc:2652 +#, c-format +msgid "Go to next bookmark" +msgstr "Ir ao seguinte marcador" + +#: Merge.rc:2653 +#, c-format +msgid "Go to previous bookmark" +msgstr "Ir ao marcador anterior" + +#: Merge.rc:2654 +#, c-format +msgid "Clear all bookmarks" +msgstr "Limpar todos o marcadores" + +#: Merge.rc:2660 +#, c-format +msgid "" +"Displays items that are exactly the same\n" +"Show Identical Items" +msgstr "" +"Amosa os elementos que son exactamente iguais\n" +"Amosar elementos iguais" + +#: Merge.rc:2661 +#, c-format +msgid "" +"Displays items that have differences\n" +"Show Different Items" +msgstr "" +"Amosa os elementos que teen diferenzas\n" +"Amosar elementos diferentes" + +#: Merge.rc:2662 +#, c-format +msgid "" +"Displays items that exist in only on the left side\n" +"Show Left Unique Items" +msgstr "" +"Amosa elementos que s existen na banda esquerda\n" +"Amosar elementos nicos da banda esquerda" + +#: Merge.rc:2663 +#, c-format +msgid "" +"Displays items that exist in only on the right side\n" +"Show Right Unique Items" +msgstr "" +"Amosa elementos que s existen na banda dereita\n" +"Amosar elementos nicos da banda dereita" + +#: Merge.rc:2664 +#, c-format +msgid "" +"Displays binary files\n" +"Show Binary Files" +msgstr "" +"Amosa os arquivos binarios\n" +"Amosar arquivos binarios" + +#: Merge.rc:2665 +#, c-format +msgid "" +"Displays skipped items\n" +"Show Skipped Items" +msgstr "" +"Amosa os elementos que se saltaron\n" +"Amosar elementos saltados" + +#: Merge.rc:2671 +#, c-format +msgid "" +"Select the font for the view\n" +"Select View Font" +msgstr "" +"Escolle o tipo de fonte para a vista\n" +"Escoller fonte" + +#: Merge.rc:2672 +#, c-format +msgid "" +"Revert to using the default system font for view\n" +"Default Font" +msgstr "" +"Volver a empregar a fonte predeterminada do sistema\n" +"Fonte predeterminada" + +#: Merge.rc:2673 +#, c-format +msgid "Shows whitespace characters" +msgstr "Amosar espazos en branco" + +#: Merge.rc:2674 +#, c-format +msgid "Toggle Diff Pane" +msgstr "Amosar panel de diferenzas" + +#: Merge.rc:2675 +#, c-format +msgid "Location pane shows overall picture from files" +msgstr "O panel de situacin amosa unha visin xeral dos arquivos" + +#: Merge.rc:2676 +#, c-format +msgid "Show folder compare statistics dialog" +msgstr "Amosa os dilogos de estadsticas de comparacin dos cartafoles" + +#: Merge.rc:2677 +#, c-format +msgid "" +"Select the current user interface language\n" +"Language" +msgstr "" +"Selecciona o idioma do interface de usuario actual\n" +"Idioma" + +#: Merge.rc:2678 +#, c-format +msgid "" +"Shows differences inside lines with different colors\n" +"Show Line Difference" +msgstr "" +"Amosa cunha cor distinta as diferenzas dentro das lias\n" +"Amosar Diferenzas nas Lias" + +#: Merge.rc:2679 +#, c-format +msgid "Swap the positions of the two panes" +msgstr "Intercambia a posicin dos dous paneis" + +#: Merge.rc:2680 +#, c-format +msgid "" +"Shows line numbers\n" +"Show Line Numbers" +msgstr "" +"Amosa os nmeros de lia\n" +"Amosar nmeros de lia" + +#: Merge.rc:2681 +#, c-format +msgid "" +"Enable word wrap\n" +"Wrap Lines" +msgstr "" +"Axusta as lias largura do panel\n" +"Axustar lias" + +#: Merge.rc:2682 +#, c-format +msgid "" +"Shows selection margins for both panes\n" +"Show Selection Margins" +msgstr "" +"Amosa as marxes en ambos os paneis\n" +"Amosar marxes" + +#: Merge.rc:2683 +#, c-format +msgid "Increase text size" +msgstr "Aumentar tamao de texto" + +#: Merge.rc:2684 +#, c-format +msgid "Decrease text size" +msgstr "Reducir tamao de texto" + +#: Merge.rc:2685 +#, c-format +msgid "Reset text zoom to default size" +msgstr "Restaurar tamao de texto predeterminado" + +#: Merge.rc:2691 +#, c-format +msgid "" +"Scroll to the previous difference\n" +"Previous Difference (Alt+Up)" +msgstr "" +"Ir diferenza anterior\n" +"Diferenza Anterior (Alt+Up)" + +#: Merge.rc:2692 +#, c-format +msgid "" +"Scroll to the next difference\n" +"Next Difference (Alt+Down)" +msgstr "" +"Ir seguinte diferenza\n" +"Seguinte Diferenza (Alt+Down)" + +#: Merge.rc:2693 +#, c-format +msgid "" +"Scroll to the first difference\n" +"First Difference (Alt+Home)" +msgstr "" +"Ir primeira diferenza\n" +"Primeira Diferenza (Alt+Home)" + +#: Merge.rc:2694 +#, c-format +msgid "" +"Scroll to the current difference\n" +"Current Difference (Alt+Enter)" +msgstr "" +"Ir diferenza actual\n" +"Diferenza Actual (Alt+Enter)" + +#: Merge.rc:2695 +#, c-format +msgid "" +"Scroll to the last difference\n" +"Last Difference (Alt+End)" +msgstr "" +"Ir derradeira diferenza\n" +"Derradeira Diferenza (Alt+End)" + +#: Merge.rc:2696 +#, c-format +msgid "" +"Copy the selected text to the right file\n" +"Copy Right (Alt+Right)" +msgstr "" +"Copiar o texto seleccionado para a banda dereita\n" +"Copiar dereita (Alt+Right)" + +#: Merge.rc:2697 +#, c-format +msgid "" +"Copy the selected text to the left file\n" +"Copy Left (Alt+Left)" +msgstr "" +"Copiar o texto seleccionado para a banda esquerda\n" +"Copiar esquerda (Alt+Left)" + +#: Merge.rc:2698 +#, c-format +msgid "" +"Copy difference to right and advance to next\n" +"Copy Right and Advance (Ctrl+Alt+Right)" +msgstr "" +"Copiar a diferenza para a banda dereita e ir seguinte diferenza\n" +"Copiar dereita e avanzar (Ctrl+Alt+Right)" + +#: Merge.rc:2699 +#, c-format +msgid "" +"Copy difference to left and advance to next\n" +"Copy Left and Advance (Ctrl+Alt+Left)" +msgstr "" +"Copiar a diferenza para a banda esquerda e avanzar seguinte diferenza\n" +"Copiar esquerda e avanzar (Ctrl+Alt+Left)" + +#: Merge.rc:2700 +#, c-format +msgid "" +"Copy all differences to the right file\n" +"All Right" +msgstr "" +"Copiar todas as diferenzas para o arquivo dereito\n" +"Todas dereita" + +#: Merge.rc:2701 +#, c-format +msgid "" +"Copy all differences to the left file\n" +"All Left" +msgstr "" +"Copiar todas as diferenzas para o arquivo esquerdo\n" +"Todas esquerda" + +#: Merge.rc:2702 +#, c-format +msgid "Delete selected items from both directories" +msgstr "Borrar os elementos seleccionados de ambos cartafoles" + +#: Merge.rc:2703 +#, c-format +msgid "Compare selected item (compare first item if multiple items selected)" +msgstr "Comparar elementos seleccionados (comparar o primeiro elemento se hai varios seleccionados)" + +#: Merge.rc:2709 +#, c-format +msgid "Select and reorder directory compare columns" +msgstr "Seleccionar e reordenar as columnas da comparacin de cartafoles" + +#: Merge.rc:2710 +#, c-format +msgid "Generate a patch-file" +msgstr "Xerar un arquivo patch" + +#: Merge.rc:2711 +#, c-format +msgid "Select and modify filters" +msgstr "Seleccionar e modificar filtros" + +#: Merge.rc:2712 +#, c-format +msgid "Generates a report from compare results" +msgstr "Xerar un informe cos resultados da comparacin" + +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "Amosa unha lista dos plugins dispoibles" + +#: Merge.rc:2719 +#, c-format +msgid "The user selects the unpacker (no unpacking when comparing dir)" +msgstr "O usuario selecciona o desempaquetador (non se desempaqueta cando se comparan cartafoles)" + +#: Merge.rc:2720 +#, c-format +msgid "The adapted unpacker is applied to both files (one file only needs the extension)" +msgstr "O desempaquetador escollido utilzase con ambos arquivos (unicamente un arquivo precisa a extensin)" + +#: Merge.rc:2721 +#, c-format +msgid "Select an unpacker to edit this file" +msgstr "Seleccionar un desempaquetador para editar este arquivo" + +#: Merge.rc:2722 +#, c-format +msgid "No prediffer (normal)" +msgstr "Sen pre-comparacin (normal)" + +#: Merge.rc:2723 +#, c-format +msgid "Suggested plugins" +msgstr "Plugins recomendados" + +#: Merge.rc:2724 +#, c-format +msgid "Other plugins" +msgstr "Outros plugins" + +#: Merge.rc:2725 +#, c-format +msgid "Unload all plugins and reload them (for developers)" +msgstr "Desbotar todos os plugins e recargalos (para desenvolvedores)" + +#: Merge.rc:2731 +#, c-format +msgid "" +"Activates next visible file\n" +"Activate next File" +msgstr "" +"Activa o seguinte arquivo visible\n" +"Activar o seguinte Arquivo" + +#: Merge.rc:2732 +#, c-format +msgid "Closes all open windows" +msgstr "Pecha todas as xanelas abertas" + +#: Merge.rc:2738 +#, c-format +msgid "" +"Opens the WinMerge Help\n" +"WinMerge Help" +msgstr "" +"Abre a Axuda do WinMerge\n" +"Axuda do WinMerge" + +#: Merge.rc:2739 +#, c-format +msgid "Outputs current WinMerge version info and configuration to text file" +msgstr "Esribe a informacin e a configuracin da versin actual do WinMerge nun arquivo de texto" + +#: Merge.rc:2740 +#, c-format +msgid "Display the GNU General Public License" +msgstr "Amosa a Licenza Pblica Xeral GNU" + +#: Merge.rc:2741 +#, c-format +msgid "Private Build: %1" +msgstr "Private Build: %1" + +#: Merge.rc:2742 +#, c-format +msgid "" +"Opens the release notes document\n" +"Release Notes" +msgstr "" +"Abre o documento coas notas da versin\n" +"Notas da Versin" + +#: Merge.rc:2743 +#, c-format +msgid "" +"Opens the translations website\n" +"Translations" +msgstr "" +"Abre o sitio web de traducins\n" +"Traducins" + +#: Merge.rc:2749 +#, c-format +msgid "Plugin Settings" +msgstr "Configuracin do plugin" + +#: Merge.rc:2750 +#, c-format +msgid "No prediffer" +msgstr "Sen pre-comparacin" + +#: Merge.rc:2751 +#, c-format +msgid "Prediff if possible" +msgstr "Pre-comparar se posible" + +#: Merge.rc:2753 +#, c-format +msgid "WSH not found - .sct scripts disabled" +msgstr "WSH non atopado - scripts .sct desactivados" + +#: Merge.rc:2754 +#, c-format +msgid "" +msgstr "" + +#: Merge.rc:2755 +#, c-format +msgid "" +msgstr "" + +#: Merge.rc:2761 +#, c-format +msgid "Open the file with registered application" +msgstr "Abrir o arquivo coa aplicacin rexistrada" + +#: Merge.rc:2762 +#, c-format +msgid "Open the file with external editor" +msgstr "Abrir o arquivo cun editor externo" + +#: Merge.rc:2763 +#, c-format +msgid "Open the file with a particular program" +msgstr "Abrir o arquivo cun programa especfico" + +#: Merge.rc:2769 +#, c-format +msgid "Do not display moved blocks" +msgstr "Non amosar bloques movidos" + +#: Merge.rc:2770 +#, c-format +msgid "Display all moved blocks" +msgstr "Amosa todos os bloques movidos" + +#: Merge.rc:2771 +#, c-format +msgid "Display moved blocks only from current diff" +msgstr "Amosar s os bloques movidos desde a diferenza actual" + +#: Merge.rc:2772 +#, c-format +msgid "Go to diff under cursor" +msgstr "Ir diferenza baixo o cursor" + +#: Merge.rc:2773 +#, c-format +msgid "G&oto Diff %1 of %2" +msgstr "I&r diferenza %1 de %2" + +#: Merge.rc:2774 +#, c-format +msgid "G&oto Line %1" +msgstr "I&r lia %1" + +#: Merge.rc:2780 +#, c-format +msgid "Disabled" +msgstr "Desactivado" + +#: Merge.rc:2781 +#, c-format +msgid "From file system" +msgstr "Do sistema de arquivos" + +#: Merge.rc:2782 +#, c-format +msgid "From MRU list" +msgstr "Da listaxe MRU" + +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "Sen Resaltar" + +#: Merge.rc:2789 +#, c-format +msgid "ASP" +msgstr "ASP" + +#: Merge.rc:2790 +#, c-format +msgid "Basic" +msgstr "Basic" + +#: Merge.rc:2791 +#, c-format +msgid "Batch" +msgstr "Batch" + +#: Merge.rc:2792 +#, c-format +msgid "C/C++" +msgstr "C/C++" + +#: Merge.rc:2793 +#, c-format +msgid "C#" +msgstr "C#" + +#: Merge.rc:2794 +#, c-format +msgid "CSS" +msgstr "CSS" + +#: Merge.rc:2795 +#, c-format +msgid "DCL" +msgstr "DCL" + +#: Merge.rc:2796 +#, c-format +msgid "Fortran" +msgstr "Fortran" + +#: Merge.rc:2797 +#, c-format +msgid "HTML" +msgstr "HTML" + +#: Merge.rc:2798 +#, c-format +msgid "INI" +msgstr "INI" + +#: Merge.rc:2799 +#, c-format +msgid "InnoSetup" +msgstr "InnoSetup" + +#: Merge.rc:2800 +#, c-format +msgid "InstallShield" +msgstr "InstallShield" + +#: Merge.rc:2801 +#, c-format +msgid "Java" +msgstr "Java" + +#: Merge.rc:2802 +#, c-format +msgid "AutoLISP" +msgstr "AutoLISP" + +#: Merge.rc:2803 +#, c-format +msgid "NSIS" +msgstr "NSIS" + +#: Merge.rc:2804 +#, c-format +msgid "Pascal" +msgstr "Pascal" + +#: Merge.rc:2805 +#, c-format +msgid "Perl" +msgstr "Perl" + +#: Merge.rc:2806 +#, c-format +msgid "PHP" +msgstr "PHP" + +#: Merge.rc:2807 +#, c-format +msgid "Portable Object" +msgstr "Obxecto Portable" + +#: Merge.rc:2808 +#, c-format +msgid "PowerShell" +msgstr "PowerShell" + +#: Merge.rc:2809 +#, c-format +msgid "Python" +msgstr "Python" + +#: Merge.rc:2810 +#, c-format +msgid "REXX" +msgstr "REXX" + +#: Merge.rc:2811 +#, c-format +msgid "Resources" +msgstr "Recursos" + +#: Merge.rc:2812 +#, c-format +msgid "Ruby" +msgstr "Ruby" + +#: Merge.rc:2813 +#, c-format +msgid "SGML" +msgstr "SGML" + +#: Merge.rc:2814 +#, c-format +msgid "Shell" +msgstr "Shell" + +#: Merge.rc:2815 +#, c-format +msgid "SIOD" +msgstr "SIOD" + +#: Merge.rc:2816 +#, c-format +msgid "SQL" +msgstr "SQL" + +#: Merge.rc:2817 +#, c-format +msgid "TCL" +msgstr "TCL" + +#: Merge.rc:2818 +#, c-format +msgid "TEX" +msgstr "TEX" + +#: Merge.rc:2819 +#, c-format +msgid "XML" +msgstr "XML" + +#: Merge.rc:2824 +#, c-format +msgid "Hide the toolbar" +msgstr "Agochar a barra de ferramentas" + +#: Merge.rc:2825 +#, c-format +msgid "Show small toolbar" +msgstr "Mostrar barra pequena de ferramentas" + +#: Merge.rc:2826 +#, c-format +msgid "Show big toolbar" +msgstr "Mostrar barra grande de ferramentas" + +#~ msgid "Open Project...\tCtrl+J" +#~ msgstr "Abrir Proxecto ...\tCtrl+J" +#~ msgid "&Contents...\tF1" +#~ msgstr "&Contidos...\tF1" +#~ msgid "&Index..." +#~ msgstr "&ndice..." +#~ msgid "&Search..." +#~ msgstr "&Procurar" +#~ msgid "&DOS (CRLF)" +#~ msgstr "&DOS (CRLF)" +#~ msgid "WinMerge" +#~ msgstr "WinMerge" +#~ msgid "Show columns" +#~ msgstr "Amosar columnas" +#~ msgid "Hide columns" +#~ msgstr "Agochar columnas" +#~ msgid "<<" +#~ msgstr "<<" +#~ msgid ">>" +#~ msgstr "\t>>" +#~ msgid "English translation by developers" +#~ msgstr "Traducin inglesa para desenvolvedores" +#~ msgid "WinMerge Application" +#~ msgstr "Aplicacin WinMerge" +#~ msgid "(c) 1996-2007 Dean P. Grimm / Thingamahoochie Software" +#~ msgstr "(c) 1996-2007 Dean P. Grimm / Thingamahoochie Software" +#~ msgid "WinMerge.EXE" +#~ msgstr "WinMerge.EXE" +#~ msgid "" +#~ "Open another window for the active document\n" +#~ "New Window" +#~ msgstr "" +#~ "Abrir outra fiestra para o documento activo\n" +#~ "Nova Fiestra" +#~ msgid "" +#~ "Arrange icons at the bottom of the window\n" +#~ "Arrange Icons" +#~ msgstr "" +#~ "Organizar as iconas no fondo da vent\n" +#~ "Organizar iconas" +#~ msgid "" +#~ "Split the active window into panes\n" +#~ "Split" +#~ msgstr "" +#~ "Dividir a fiestra activa en paneis\n" +#~ "Dividir" +#~ msgid "" +#~ "Erase the selection\n" +#~ "Erase" +#~ msgstr "" +#~ "Borrar a seleccin\n" +#~ "Borrar" +#~ msgid "" +#~ "Erase everything\n" +#~ "Erase All" +#~ msgstr "" +#~ "Borrar todo\n" +#~ "Borrar todo" +#~ msgid "" +#~ "\n" +#~ "WinMerge\n" +#~ "WinMerge\n" +#~ "\n" +#~ "\n" +#~ "WinMerge.Document\n" +#~ "WinMerge Document" +#~ msgstr "" +#~ "\n" +#~ "WinMerge\n" +#~ "WinMerge\n" +#~ "\n" +#~ "\n" +#~ "WinMerge.Documento\n" +#~ "WinMerge Documento" +#~ msgid "" +#~ "%1\n" +#~ "%2\n" +#~ "\n" +#~ "are identical binary files." +#~ msgstr "" +#~ "%1\n" +#~ "%2\n" +#~ "\n" +#~ "son arquivos binarios idnticos." +#~ msgid "" +#~ "%1\n" +#~ "%2\n" +#~ "\n" +#~ "are different binary files." +#~ msgstr "" +#~ "%1\n" +#~ "%2\n" +#~ "\n" +#~ "son arquivos binarios diferentes." +#~ msgid "" +#~ "%1\n" +#~ "\n" +#~ "is binary file. Cannot compare binary and text files." +#~ msgstr "" +#~ "%1\n" +#~ "\n" +#~ " un arquivo binario. Non se poden comparar arquivos binarios ou de texto." +#~ msgid "Are you sure you want to copy all differences to the left file?" +#~ msgstr "" +#~ "Tes a certeza de quereres copiar as diferenzas para o arquivo esquerdo?" +#~ msgid "Are you sure you want to copy all differences to the right file?" +#~ msgstr "" +#~ "Tes a certeza de quereres copiar as diferenzas para o arquivo dereito?" +#~ msgid "" +#~ "Are you sure you want to copy\n" +#~ "\n" +#~ "%1\n" +#~ "to\n" +#~ "%2 ?" +#~ msgstr "" +#~ "Tes a certeza de querer copiar\n" +#~ "\n" +#~ "%1\n" +#~ "para\n" +#~ "%2 ?" +#~ msgid "Are you sure you want to copy %1 of %2 selected item(s)?" +#~ msgstr "Tes a certeza de quereres copiar %1 de %2 elementos seleccionados?" +#~ msgid "Are you sure you want to delete %1 of %2 selected item(s)?" +#~ msgstr "Tes a certeza de quereres borrar %1 de %2 elementos seleccionados? " +#~ msgid "" +#~ "Delete directory\n" +#~ "\n" +#~ "%1 ?" +#~ msgstr "" +#~ "Queres borrar o cartafol\n" +#~ "\n" +#~ "%1 ?" +#~ msgid "" +#~ "The selected folder exists only in other side and therefore cannot be " +#~ "opened." +#~ msgstr "" +#~ "O cartafol seleccionado existe unicamente na outra banda polo tanto non " +#~ "se pode abrir." +#~ msgid "Binary files cannot be visually compared." +#~ msgstr "Os arquivos binarios non poden ser comparados visualmente" +#~ msgid "Directory files cannot be visually compared." +#~ msgstr "Os arquivos do cartafol non se poden comparar visualmente." +#~ msgid "Afrikaans" +#~ msgstr "Africner" +#~ msgid "Albanian" +#~ msgstr "Albans" +#~ msgid "Arabic (Saudi Arabian)" +#~ msgstr "rabe (Arabia Saud)" +#~ msgid "Arabic (Iraq)" +#~ msgstr "rabe (Iraq)" +#~ msgid "Arabic (Egyptian)" +#~ msgstr "rabe (Exipto)" +#~ msgid "Arabic (Libyan)" +#~ msgstr "rabe (Lbano)" +#~ msgid "Arabic (Algerian)" +#~ msgstr "rabe (Alxeria)" +#~ msgid "Arabic (Moroccan)" +#~ msgstr "rabe (Marrocos)" +#~ msgid "Arabic (Tunisian)" +#~ msgstr "rabe (Tunisia)" +#~ msgid "Arabic (Oman)" +#~ msgstr "rabe (Omn)" +#~ msgid "Arabic (Yemen)" +#~ msgstr "rabe (Iemen)" +#~ msgid "Arabic (Syrian)" +#~ msgstr "rabe (Siria)" +#~ msgid "Arabic (Jordan)" +#~ msgstr "rabe (Xordania)" +#~ msgid "Arabic (Lebanon)" +#~ msgstr "rabe (Lbano)" +#~ msgid "Arabic (Kuwait)" +#~ msgstr "rabe (Kuwait)" +#~ msgid "Arabic (UAE)" +#~ msgstr "rabe (EAU)" +#~ msgid "Arabic (Bahrain)" +#~ msgstr "rabe (Bahrain)" +#~ msgid "Arabic (Qatar)" +#~ msgstr "rabe (Qatar)" +#~ msgid "Armenian" +#~ msgstr "Armenio" +#~ msgid "Azeri (Latin)" +#~ msgstr "Azer (Latno)" +#~ msgid "Azeri (Cyrillic)" +#~ msgstr "Azer (Cirlico)" +#~ msgid "Basque" +#~ msgstr "Euscaro" +#~ msgid "Belarusian" +#~ msgstr "Bielorruso" +#~ msgid "Bulgarian" +#~ msgstr "Blgaro" +#~ msgid "Catalan" +#~ msgstr "Cataln" +#~ msgid "Chinese (Traditional)" +#~ msgstr "Chins (Tradicional)" +#~ msgid "Chinese (Simplified)" +#~ msgstr "Chins (Simplificado)" +#~ msgid "Chinese (Hong Kong)" +#~ msgstr "Chins (Hong Kong)" +#~ msgid "Chinese (Singapore)" +#~ msgstr "Chins (Singapore)" +#~ msgid "Chinese (Macau SAR)" +#~ msgstr "Chins (Macau SAR)" +#~ msgid "Croatian" +#~ msgstr "Croata" +#~ msgid "Czech" +#~ msgstr "Checo" +#~ msgid "Dansk" +#~ msgstr "Dans" +#~ msgid "Dutch" +#~ msgstr "Holands" +#~ msgid "Dutch (Belgium)" +#~ msgstr "Holands (Blxica)" +#~ msgid "English (US)" +#~ msgstr "Ingls (USA)" +#~ msgid "English (UK)" +#~ msgstr "Ingls (UK)" +#~ msgid "English (Australian)" +#~ msgstr "Ingls (Australia)" +#~ msgid "English (Canadian)" +#~ msgstr "Ingls (Canad)" +#~ msgid "English (New Zealand)" +#~ msgstr "Ingls (Nova Celandia)" +#~ msgid "English (Irish)" +#~ msgstr "Ingls (Irlanda)" +#~ msgid "English (So. African)" +#~ msgstr "Ingls (Surfrica)" +#~ msgid "English (Jamaican)" +#~ msgstr "Ingls (Xamaica)" +#~ msgid "English (Caribbean)" +#~ msgstr "Ingls (Caribe)" +#~ msgid "English (Belize)" +#~ msgstr "Ingls (Belize)" +#~ msgid "English (Trinidad)" +#~ msgstr "Ingls (Trindade)" +#~ msgid "English (Zimbabwe)" +#~ msgstr "Ingls (Zimbabwe)" +#~ msgid "English (Philippines)" +#~ msgstr "Ingls (Filipinas)" +#~ msgid "Eesti" +#~ msgstr "Estoniano" +#~ msgid "Faeroese" +#~ msgstr "Feros" +#~ msgid "Farsi" +#~ msgstr "Farsi" +#~ msgid "Suomi" +#~ msgstr "Fins" +#~ msgid "French" +#~ msgstr "Francs" +#~ msgid "French (Belgique)" +#~ msgstr "Francs (Blxica)" +#~ msgid "French (Canada)" +#~ msgstr "Francs (Canad)" +#~ msgid "French (Switzerland)" +#~ msgstr "Francs (Suza)" +#~ msgid "French (Luxembourg)" +#~ msgstr "Francs (Luxemburgo)" +#~ msgid "French (Monaco)" +#~ msgstr "Francs (Mnaco)" +#~ msgid "Georgian" +#~ msgstr "Xeorxiano" +#~ msgid "German (Germany)" +#~ msgstr "Alemn (Alemania)" +#~ msgid "German (Switzerland)" +#~ msgstr "Alemn (Suza)" +#~ msgid "German (Austria)" +#~ msgstr "Alemn (Austria)" +#~ msgid "German (Luxembourg)" +#~ msgstr "Alemn (Luxemburgo)" +#~ msgid "German (Liechtenstein)" +#~ msgstr "Alemn (Liechenstein)" +#~ msgid "Greek" +#~ msgstr "Grego" +#~ msgid "Hebrew" +#~ msgstr "Hebreo" +#~ msgid "Hindi" +#~ msgstr "Hindi" +#~ msgid "Hungarian" +#~ msgstr "Hngaro" +#~ msgid "Icelandic" +#~ msgstr "Islands" +#~ msgid "Indonesian" +#~ msgstr "Indonesio" +#~ msgid "Italian" +#~ msgstr "Italiano" +#~ msgid "Italian (Swiss)" +#~ msgstr "Italiano (Suza)" +#~ msgid "Japanese" +#~ msgstr "Xapons" +#~ msgid "Kashmiri (India)" +#~ msgstr "Kashmir (India)" +#~ msgid "Kazakh" +#~ msgstr "Kazakh" +#~ msgid "Korean" +#~ msgstr "Coreano" +#~ msgid "Korean (Johab)" +#~ msgstr "Coreano (Johab)" +#~ msgid "Latvian" +#~ msgstr "Letn" +#~ msgid "Lithuanian" +#~ msgstr "Lituano" +#~ msgid "Malay (Malaysian)" +#~ msgstr "Malaio (Malasia)" +#~ msgid "Malay (Brunei Darussalam)" +#~ msgstr "Malaio (Brunei)" +#~ msgid "Manipuri" +#~ msgstr "Manipuri" +#~ msgid "Norwegian (Bokml)" +#~ msgstr "Noruegus (Bokml)" +#~ msgid "Norwegian (Nynorsk)" +#~ msgstr "Noruegus (Nynorsk)" +#~ msgid "Polski" +#~ msgstr "Polaco" +#~ msgid "Portugese" +#~ msgstr "Portugus" +#~ msgid "Portugese (Brazil)" +#~ msgstr "Portugus (Brasil)" +#~ msgid "Romanian" +#~ msgstr "Rumano" +#~ msgid "Russian" +#~ msgstr "Ruso" +#~ msgid "Sanskrit" +#~ msgstr "Snscrito" +#~ msgid "Serbian (Latin)" +#~ msgstr "Serbio (latino)" +#~ msgid "Serbian (Cyrillic)" +#~ msgstr "Serbio (cirlico)" +#~ msgid "Sindhi" +#~ msgstr "Sindi" +#~ msgid "Slovak" +#~ msgstr "Eslovaco" +#~ msgid "Slovenian" +#~ msgstr "Eslovenio" +#~ msgid "Spanish" +#~ msgstr "Espaol" +#~ msgid "Spanish (Mexican)" +#~ msgstr "Espaol (Mxico)" +#~ msgid "Spanish (Modern)" +#~ msgstr "Espaol (Moderno)" +#~ msgid "Spanish (Guatemala)" +#~ msgstr "Espaol (Guatemala)" +#~ msgid "Spanish (Costa Rica)" +#~ msgstr "Espaol (Costa Rica)" +#~ msgid "Spanish (Panama)" +#~ msgstr "Espaol (Panam)" +#~ msgid "Spanish (Dominican)" +#~ msgstr "Espaol (Repblica Dominicana)" +#~ msgid "Spanish (Venezuela)" +#~ msgstr "Espaol (Venezuela)" +#~ msgid "Spanish (Colombia)" +#~ msgstr "Espaol (Colombia)" +#~ msgid "Spanish (Peru)" +#~ msgstr "Espaol (Per)" +#~ msgid "Spanish (Argentina)" +#~ msgstr "Espaol (Arxentina)" +#~ msgid "Spanish (Ecuador)" +#~ msgstr "Espaol (Ecuador)" +#~ msgid "Spanish (Chile)" +#~ msgstr "Espaol (Chile)" +#~ msgid "Spanish (Uruguay)" +#~ msgstr "Espaol (Uruguai)" +#~ msgid "Spanish (Paraguay)" +#~ msgstr "Espaol (Paraguai)" +#~ msgid "Spanish (Bolivia)" +#~ msgstr "Espaol (Bolivia)" +#~ msgid "Spanish (El Salvador)" +#~ msgstr "Espaol (O Salvador)" +#~ msgid "Spanish (Honduras)" +#~ msgstr "Espaol (Honduras)" +#~ msgid "Spanish (Nicaragua)" +#~ msgstr "Espaol (Nicaragua)" +#~ msgid "Spanish (Puerto Rico)" +#~ msgstr "Espaol (Porto Rico)" +#~ msgid "Swahili (Kenya)" +#~ msgstr "Suahili (Kenia)" +#~ msgid "Swedish" +#~ msgstr "Sueco" +#~ msgid "Swedish (Finland)" +#~ msgstr "Sueco (Finlandia)" +#~ msgid "Tamil" +#~ msgstr "Tamil" +#~ msgid "Tatar (Tatarstan)" +#~ msgstr "Trtaro (Tartaria)" +#~ msgid "Thai" +#~ msgstr "Tai" +#~ msgid "Turkish" +#~ msgstr "Turco" +#~ msgid "Ukranian" +#~ msgstr "Ucrano" +#~ msgid "Urdu (Pakistan)" +#~ msgstr "Urd (Paquistn)" +#~ msgid "Urdu (India)" +#~ msgstr "Urd (India)" +#~ msgid "Uzbek (Latin)" +#~ msgstr "Usbeco (Latino)" +#~ msgid "Uzbek (Cyrillic)" +#~ msgstr "Usbeco (Cirlico)" +#~ msgid "Vietnamese" +#~ msgstr "Vietnamita" +#~ msgid "" +#~ "Displays the WinMerge User's Guide\n" +#~ "Help" +#~ msgstr "" +#~ "Mostra a gua de usuario de WinMerge\n" +#~ "Axuda" +#~ msgid "" +#~ "Opens WinMerge Help Search\n" +#~ "Help Search" +#~ msgstr "" +#~ "Abre a axuda de Winmerge\n" +#~ "Axuda" + From c65f0445364d22fd153bfb8f2fae4a926fc43bce Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 7 Oct 2008 19:04:16 +0000 Subject: [PATCH 126/168] PATCH: [ 2150177 ] Manual: Add Galician as new localization --HG-- branch : R2_10 --- Docs/Users/Manual/Locales.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 79d9dfd21ac..aa2fa7f2414 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -151,6 +151,10 @@ French + + Galician + + German From 959e09c377ad581f5e72a9eab0cde57d5f996da5 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Thu, 9 Oct 2008 15:01:03 +0000 Subject: [PATCH 127/168] PATCH: [2153339] Patch for 'BUG: 2138555 and 2068790' - 2138555: Cursor position when comparison files are the same - 2068790: "View Margins" & some .HTML Files: Odd Behaviour --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/editlib/ccrystaltextview.cpp | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e8cd5915585..0f745fdce98 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,8 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.2 Change download URL to current URL (#2136765) BugFix: Case-sensitive regexp search didn't work (#1991259) + BugFix: Wrong cursor position when disabling selection margin (#2138555) + BugFix: Showed a black line when disabling selection margin (#2068790) New translation: Galician (#2120685) Translation updates: - Ukrainian (#2131753) diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp index a8314803141..392d2cc7888 100644 --- a/Src/editlib/ccrystaltextview.cpp +++ b/Src/editlib/ccrystaltextview.cpp @@ -4289,9 +4289,10 @@ SetSelectionMargin (BOOL bSelMargin) m_bSelMargin = bSelMargin; if (::IsWindow (m_hWnd)) { - m_nScreenChars = -1; - Invalidate (); + InvalidateScreenRect (); + m_nTopSubLine = GetSubLineIndex(m_nTopLine); RecalcHorzScrollBar (); + UpdateCaret (); } } } From eafb0138803386b02a8fa1befb2db534f19e94af Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 14 Oct 2008 21:39:33 +0000 Subject: [PATCH 128/168] BUG: [ 1663777 ] bad grammar --HG-- branch : R2_10 --- Docs/Developers/readme-developers.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/Developers/readme-developers.html b/Docs/Developers/readme-developers.html index 592a0ff7287..5f16ed817f0 100644 --- a/Docs/Developers/readme-developers.html +++ b/Docs/Developers/readme-developers.html @@ -309,8 +309,8 @@

        Packaging file releases

        executable version numbers before uploading and releasing them.

        - Now that 2.4 release has translations for Shell Extension we must also carefully - version it. If we don't update version number, installer won't install updated version. + Since WinMerge 2.4 we have translations for Shell Extension and must also version it + carefully. If we don't update version number, installer won't install updated version. There are no scripts or other tools to update version number, it must be done by hand to ShellExtension.rc file (make sure you update all four numbers!). Version numbers follow the rule: From 095328888101f8a45cb5524676addc7b2a34245b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 22 Oct 2008 17:50:23 +0000 Subject: [PATCH 129/168] PATCH: [ 2181628 ] Fix manual URLs in Readme.txt --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReadMe.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 0f745fdce98..d439b071a03 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -8,6 +8,7 @@ WinMerge 2.10.2 BugFix: Case-sensitive regexp search didn't work (#1991259) BugFix: Wrong cursor position when disabling selection margin (#2138555) BugFix: Showed a black line when disabling selection margin (#2068790) + BugFix: Fix manual URL in Readme.txt (#2181628) New translation: Galician (#2120685) Translation updates: - Ukrainian (#2131753) diff --git a/Docs/Users/ReadMe.txt b/Docs/Users/ReadMe.txt index 22b00c7ae2f..3484ec345e3 100644 --- a/Docs/Users/ReadMe.txt +++ b/Docs/Users/ReadMe.txt @@ -9,11 +9,11 @@ http://winmerge.org Quick start to WinMerge: Read online-manual Quick-start chapter to get started with WinMerge: -http://www.winmerge.org/2.8/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html HTML Manual: Manual is available online at -http://www.winmerge.org/2.8/manual/ +http://winmerge.org/docs/manual/ it is also possibly installed (if choosed so) locally and downloadable separately from http://www.winmerge.org/ (see documentation) From 6a054e55733ba50eef5c3558c69bf669299da2f2 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Thu, 23 Oct 2008 22:13:48 +0000 Subject: [PATCH 130/168] TODO: [ 1460517 ] Use default settings from HKLM in registry Fixed the following problems: 1) After installing WinMerge, WinMerge's interface language is not Japanese but English. 2) WinMerge icon is not shown on Quick Launch bar. 3) After uninstalling WinMerge, the registry key 'HKEY_CURRENT_USER/Software/Thingamahoochie/WinMerge' is not deleted. 4) and I also noticed that TortoiseCVS and TortoiseSVN integrations have not been worked now. --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Installer/InnoSetup/WinMerge.iss | 23 ++++++++++++--------- Src/OptionsInit.cpp | 35 ++++++++++++++++++++++---------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index d439b071a03..089a5818dd6 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -9,6 +9,8 @@ WinMerge 2.10.2 BugFix: Wrong cursor position when disabling selection margin (#2138555) BugFix: Showed a black line when disabling selection margin (#2068790) BugFix: Fix manual URL in Readme.txt (#2181628) + BugFix: There were some installer regressions + (eg. Installer didn't create Quick Launch icon) (#1460517) New translation: Galician (#2120685) Translation updates: - Ukrainian (#2131753) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index a33703c38a6..74c2b4d7a66 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -309,6 +309,7 @@ Name: {app}\MergePlugins\list.txt; Type: files; Check: not IsComponentSelected(' Name: {group}\{cm:UsersGuide}.lnk; Type: files; Check: not IsComponentSelected('Docs') ;This removes the quick launch icon in case the user chooses not to install it after previously having it installed +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon') Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge.lnk; Type: files; Check: not IsTaskSelected('QuickLauchIcon') ;This removes the desktop icon in case the user chooses not to install it after previously having it installed @@ -452,9 +453,11 @@ Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Ukrainian.txt; IconFileNa Name: {commondesktop}\WinMerge; Filename: {app}\{code:ExeName}; Tasks: desktopicon ;Quick Launch Icon -Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\WinMerge; Filename: {app}\{code:ExeName}; Tasks: quicklaunchicon [Registry] +Root: HKCU; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty +Root: HKCU; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey Root: HKLM; Subkey: Software\Thingamahoochie; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: Software\Thingamahoochie\WinMerge; Flags: uninsdeletekey @@ -498,20 +501,20 @@ Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueNa Root: HKLM; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueName: ContextMenuEnabled; ValueData: 1; Tasks: ShellExtension; Check: not ShellMenuEnabled() ;If WinMerge.exe is installed then we'll automatically configure WinMerge as the differencing application -Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS -Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS -Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS -Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS ;Tells TortoiseCVS to use WinMerge as its differencing application (this happens whether or not Tortoise is current installed, that way ;if it is installed at a later date this will automatically support it) -Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS -Root: HKLM; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS -Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS -Root: HKLM; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS ;Set WinMerge as TortoiseSVN diff tool -Root: HKLM; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN +Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN ;Whatever the user chooses at the [Select Setup Language] dialog should also determine what language WinMerge will start up in ;(unless the user already has a startup language specified) diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp index fedc11f65b2..3ec318c9ae3 100644 --- a/Src/OptionsInit.cpp +++ b/Src/OptionsInit.cpp @@ -16,8 +16,8 @@ // Functions to copy values set by installer from HKLM to HKCU. static void CopyHKLMValues(); -static bool OpenHKLM(HKEY *key); -static bool OpenHKCU(HKEY *key); +static bool OpenHKLM(HKEY *key, LPCTSTR relpath = NULL); +static bool OpenHKCU(HKEY *key, LPCTSTR relpath = NULL); static bool IsFirstRun(HKEY key); static void CopyFromLMtoCU(HKEY lmKey, HKEY cuKey, LPCTSTR valname); static void ResetFirstRun(HKEY key); @@ -234,7 +234,15 @@ static void CopyHKLMValues() { CopyFromLMtoCU(LMKey, CUKey, _T("ContextMenuEnabled")); CopyFromLMtoCU(LMKey, CUKey, _T("Executable")); - CopyFromLMtoCU(LMKey, CUKey, _T("Locale\\LanguageId")); + RegCloseKey(CUKey); + } + RegCloseKey(LMKey); + } + if (OpenHKLM(&LMKey, _T("Locale"))) + { + if (OpenHKCU(&CUKey, _T("Locale"))) + { + CopyFromLMtoCU(LMKey, CUKey, _T("LanguageId")); RegCloseKey(CUKey); } RegCloseKey(LMKey); @@ -244,13 +252,16 @@ static void CopyHKLMValues() /** * @brief Open HKLM registry key. * @param [out] key Pointer to open HKLM key. + * @param [in] relative registry path to open. * @return true if opening succeeded. */ -static bool OpenHKLM(HKEY *key) +static bool OpenHKLM(HKEY *key, LPCTSTR relpath) { + TCHAR valuename[256] = _T("Software\\Thingamahoochie\\WinMerge\\"); + if (relpath) + lstrcat(valuename, relpath); LONG retval = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("Software\\Thingamahoochie\\WinMerge\\"), - 0, KEY_READ, key); + valuename, 0, KEY_READ, key); if (retval == ERROR_SUCCESS) { return true; @@ -262,13 +273,16 @@ static bool OpenHKLM(HKEY *key) * @brief Open HKCU registry key. * Opens the HKCU key for WinMerge. If the key does not exist, creates one. * @param [out] key Pointer to open HKCU key. + * @param [in] relative registry path to open. * @return true if opening succeeded. */ -static bool OpenHKCU(HKEY *key) +static bool OpenHKCU(HKEY *key, LPCTSTR relpath) { + TCHAR valuename[256] = _T("Software\\Thingamahoochie\\WinMerge\\"); + if (relpath) + lstrcat(valuename, relpath); LONG retval = RegOpenKeyEx(HKEY_CURRENT_USER, - _T("Software\\Thingamahoochie\\WinMerge\\"), - 0, KEY_ALL_ACCESS, key); + valuename, 0, KEY_ALL_ACCESS, key); if (retval == ERROR_SUCCESS) { return true; @@ -276,8 +290,7 @@ static bool OpenHKCU(HKEY *key) else if (retval == ERROR_FILE_NOT_FOUND) { retval = RegCreateKeyEx(HKEY_CURRENT_USER, - _T("Software\\Thingamahoochie\\WinMerge\\"), - 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); + valuename, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); if (retval == ERROR_SUCCESS) return true; } From c79547d69386e4d0e6f0e4af83885269f7ce26a2 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 24 Oct 2008 18:38:23 +0000 Subject: [PATCH 131/168] Merge Czech translation update by Jan Hryz from trunk. --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/Czech.po | 58 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 089a5818dd6..53d458b7e43 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -13,6 +13,7 @@ WinMerge 2.10.2 (eg. Installer didn't create Quick Launch icon) (#1460517) New translation: Galician (#2120685) Translation updates: + - Czech (r6038) - Ukrainian (#2131753) WinMerge 2.10 - 2008-09-17 (r5967) diff --git a/Src/Languages/Czech.po b/Src/Languages/Czech.po index 38ba310dce4..9c82906b78c 100644 --- a/Src/Languages/Czech.po +++ b/Src/Languages/Czech.po @@ -286,7 +286,7 @@ msgstr "&Pluginy" #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&Seznam..." #: Merge.rc:152 #: Merge.rc:269 @@ -1842,7 +1842,7 @@ msgstr "Ignorovat &mal #: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr "" +msgstr "Ignorovat rozdly v &koncch dk (Windows/Unix/Mac)" #: Merge.rc:1168 #, c-format @@ -2139,7 +2139,7 @@ msgstr "Cesty plugin #: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" -msgstr "" +msgstr "T&uto zprvu ji pt nezobrazovat.\n(Tuto zprvu mete vdy znovu vyvolat z nabdky Npovda.)" #: Merge.rc:1325 #, c-format @@ -2579,12 +2579,12 @@ msgstr "Ne" #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "Pluginy" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "&Povolit pluginy" #. StringFileInfo.Block #: Merge.rc:1691 @@ -3416,7 +3416,7 @@ msgstr "Regul #: Merge.rc:2037 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." -msgstr "" +msgstr "Filtry byly aktualizovny. Chcete obnovit vechna porovnn sloek?\n\nPokud nechcete obnovit vechna porovnn te, zvolte Ne a obnovte porovnn pozdji." #: Merge.rc:2043 #, c-format @@ -3511,12 +3511,12 @@ msgstr "Vytv #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "Vracen posledn operace..." #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Opakovn pedchoz operace..." #: Merge.rc:2078 #, c-format @@ -4042,17 +4042,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "Opravdu chcete pesunout:" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "Opravdu chcete pesunout %d poloek:" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "Potvrdit pesunut" #: Merge.rc:2227 #, c-format @@ -4557,7 +4557,7 @@ msgstr "" #: Merge.rc:2384 #, 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 "" +msgstr "Konce dk v souboru '%1' jsou rozdlnch typ (Windows/Unix/Mac).\nPodle aktulnch monost budou sjednoceny do hlavnho typu.\nChcete zmnit monosti a zachovat rozdln konce dk?" #: Merge.rc:2385 #, c-format @@ -5226,12 +5226,12 @@ msgstr "" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "Typ" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "Pevad" #: Merge.rc:2620 #, c-format @@ -5266,27 +5266,27 @@ msgstr "Ulo #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "Zmn pro soubor/sloku vlevo stav pouze pro ten" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "Zmn pro soubor/sloku vpravo stav pouze pro ten" #: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" -msgstr "" +msgstr "Pevede konce dk na typ Windows" #: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" -msgstr "" +msgstr "Pevede konce dk na typ Unix" #: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" -msgstr "" +msgstr "Pevede konce dk na typ Mac" #: Merge.rc:2637 #, c-format @@ -5468,12 +5468,12 @@ msgstr "Zobraz #: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" -msgstr "" +msgstr "Umon zvolit jazyk uivatelskho prosted aplikace\nJazyk" #: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" -msgstr "" +msgstr "Uke rozdly v dcch odlinou barvou\nRozdly v dcch" #: Merge.rc:2679 #, c-format @@ -5525,27 +5525,27 @@ msgstr "Vr #: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" -msgstr "" +msgstr "Posune na pedchoz rozdl\nPedchoz rozdl (Alt+Up)" #: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" -msgstr "" +msgstr "Posune na dal rozdl\nDal rozdl (Alt+Down)" #: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" -msgstr "" +msgstr "Posune na prvn rozdl\nPrvn rozdl (Alt+Home)" #: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" -msgstr "" +msgstr "Posune na aktuln rozdl\nAktuln rozdl (Alt+Enter)" #: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" -msgstr "" +msgstr "Posune na posledn rozdl\nPosledn rozdl (Alt+End)" #: Merge.rc:2696 #, c-format @@ -5634,7 +5634,7 @@ msgstr "Vytvo #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "Zobraz seznam dostupnch plugin" #: Merge.rc:2719 #, c-format @@ -5674,7 +5674,7 @@ msgstr "Uvoln #: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" -msgstr "" +msgstr "Aktivovat nsledujc viditeln soubor\nAktivovat nsledujc soubor" #: Merge.rc:2732 #, c-format @@ -5804,7 +5804,7 @@ msgstr "Naposledy pou #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "dn zvraznn" #: Merge.rc:2789 #, c-format From d9a10c0a8eb8ffdd9df6d41682bb2b1ad4e4d795 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Fri, 24 Oct 2008 21:52:24 +0000 Subject: [PATCH 132/168] BUG: [ 2189749 ] UpdatePoFilesFromPotFile.vbs fails in trunk --HG-- branch : R2_10 --- Src/Languages/UpdatePoFilesFromPotFile.vbs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Src/Languages/UpdatePoFilesFromPotFile.vbs b/Src/Languages/UpdatePoFilesFromPotFile.vbs index c7d52334be7..8653ecd6624 100644 --- a/Src/Languages/UpdatePoFilesFromPotFile.vbs +++ b/Src/Languages/UpdatePoFilesFromPotFile.vbs @@ -2,7 +2,7 @@ Option Explicit '' ' This script updates the language PO files from the master POT file. ' -' Copyright (C) 2007 by Tim Gerundt +' Copyright (C) 2007-2008 by Tim Gerundt ' Released under the "GNU General Public License" ' ' ID line follows -- this is updated by SVN @@ -123,6 +123,8 @@ Function GetContentFromPoFile(ByVal sPoPath) Else 'If comment line... iMsgStarted = -1 Select Case Left(sLine, 2) + Case "#~" 'Obsolete message... + iMsgStarted = 0 Case "#." 'Extracted comment... oSubContent.sExtractedComments = oSubContent.sExtractedComments & sLine & vbCrLf Case "#:" 'Reference... @@ -136,7 +138,9 @@ Function GetContentFromPoFile(ByVal sPoPath) ElseIf iMsgStarted <> 0 Then 'If empty line AND there is pending translation... iMsgStarted = 0 'Don't process same translation twice If sMsgId = "" Then sMsgId = "__head__" - oContent.Add sMsgCtxt & sMsgId, oSubContent + If (oContent.Exists(sMsgCtxt & sMsgId) = False) Then 'If the key is NOT already used... + oContent.Add sMsgCtxt & sMsgId, oSubContent + End If sMsgCtxt = "" Set oSubContent = New CSubContent End If From 7afdd2bdf84352ab7fbae3fe243550508f1ddc83 Mon Sep 17 00:00:00 2001 From: Jochen Tucht Date: Sun, 26 Oct 2008 10:31:07 +0000 Subject: [PATCH 133/168] Bug #2138560 --HG-- branch : R2_10 --- Src/MergeCmdLineInfo.cpp | 20 ++++++++++++-------- Src/MergeCmdLineInfo.h | 1 - 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp index 0283221f85e..1c1eb15129a 100644 --- a/Src/MergeCmdLineInfo.cpp +++ b/Src/MergeCmdLineInfo.cpp @@ -68,7 +68,7 @@ LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String ¶m, bool *flag) flag = 0; } } - param.assign(p, q - p); + param.assign(p ? p : _T(""), q - p); if (q > p && flag) { CharLower(&*param.begin()); @@ -329,15 +329,19 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(LPCTSTR q) q = SetOption(q, OPT_CMP_IGNORE_EOL); } } + // If "compare file dir" make it "compare file dir\file". + if (m_Files.size() >= 2) + { + PATH_EXISTENCE p1 = paths_DoesPathExist(m_Files[0].c_str()); + PATH_EXISTENCE p2 = paths_DoesPathExist(m_Files[1].c_str()); + + if ((p1 == IS_EXISTING_FILE) && (p2 == IS_EXISTING_DIR)) + { + m_Files[1] = paths_ConcatPath(m_Files[1], paths_FindFileName(m_Files[0].c_str())); + } + } if (m_bShowUsage) { m_bNonInteractive = false; } } - -/** - * @brief Destructor. - */ -MergeCmdLineInfo::~MergeCmdLineInfo() -{ -} diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h index 6fb6c8ee33a..7d09527a455 100644 --- a/Src/MergeCmdLineInfo.h +++ b/Src/MergeCmdLineInfo.h @@ -41,7 +41,6 @@ class MergeCmdLineInfo { public: MergeCmdLineInfo(LPCTSTR); - ~MergeCmdLineInfo(); public: From 23080678d9676b6e8cea12cc3df62690a9d89cf0 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 26 Oct 2008 13:03:59 +0000 Subject: [PATCH 134/168] Changelog: BugFix: Giving path to file and folder to command line did not work (#2138560) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 53d458b7e43..cdfa39917ae 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -11,6 +11,8 @@ WinMerge 2.10.2 BugFix: Fix manual URL in Readme.txt (#2181628) BugFix: There were some installer regressions (eg. Installer didn't create Quick Launch icon) (#1460517) + BugFix: Giving path to file and folder to command line + did not work (#2138560) New translation: Galician (#2120685) Translation updates: - Czech (r6038) From bee3248562592fbb89b6c1f8eb0a4c6dca1235b4 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 29 Oct 2008 18:59:20 +0000 Subject: [PATCH 135/168] PATCH: [ 2129095 ] Installer: create backup from ClearCase map file --HG-- branch : R2_10 --- Installer/InnoSetup/WinMerge.iss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 74c2b4d7a66..0ea8fe0ca7e 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -977,9 +977,16 @@ Var MapFile: TStringList; FileName: String; I: Integer; + BakFile: String; Begin FileName := ClearCaseMapFile(); + {Create a backup file of the original file first time it gets modified} + BakFile := FileName + '.original'; + if not FileExists(BakFile) then + begin + FileCopy(FileName, BakFile, True); + end; MapFile := TStringList.Create(); {Read the entire map file to a string list} MapFile.LoadFromFile(FileName); From 399a640ae1a72d0df6cc074905c41f583688c827 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 29 Oct 2008 20:05:02 +0000 Subject: [PATCH 136/168] Changelog: Installer: create backup from ClearCase map file --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index cdfa39917ae..e273397546d 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.2 Change download URL to current URL (#2136765) + Installer: create backup of ClearCase config file (#2129095) BugFix: Case-sensitive regexp search didn't work (#1991259) BugFix: Wrong cursor position when disabling selection margin (#2138555) BugFix: Showed a black line when disabling selection margin (#2068790) From 9859b3dade33b35579b577e7c2ca378e725b8ed9 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 29 Oct 2008 20:07:21 +0000 Subject: [PATCH 137/168] BUG: [ 2101780 ] Different carriage return types: Auto-Update is needed --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/LocationView.cpp | 12 ++++++++++++ Src/LocationView.h | 1 + Src/MergeEditView.cpp | 5 +++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e273397546d..e258bd51a7a 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -14,6 +14,8 @@ WinMerge 2.10.2 (eg. Installer didn't create Quick Launch icon) (#1460517) BugFix: Giving path to file and folder to command line did not work (#2138560) + BugFix: If messagebox was shown during file loading location pane + didn't show any differences (#2101780) New translation: Galician (#2120685) Translation updates: - Czech (r6038) diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp index 245f1391509..18fa3c8e531 100644 --- a/Src/LocationView.cpp +++ b/Src/LocationView.cpp @@ -144,6 +144,18 @@ CMergeDoc* CLocationView::GetDocument() // non-debug version is inline ///////////////////////////////////////////////////////////////////////////// // CLocationView message handlers +/** + * @brief Force recalculation and update of location pane. + * This method forces location pane to first recalculate its data and + * then repaint itself. This method bypasses location pane's caching + * of the diff data. + */ +void CLocationView::ForceRecalculate() +{ + m_bRecalculateBlocks = TRUE; + Invalidate(); +} + /** * @brief Update view. */ diff --git a/Src/LocationView.h b/Src/LocationView.h index c52444e688a..57f1fb0092b 100644 --- a/Src/LocationView.h +++ b/Src/LocationView.h @@ -72,6 +72,7 @@ class CLocationView : public CView void SetConnectMovedBlocks(int displayMovedBlocks); void UpdateVisiblePos(int nTopLine = -1, int nBottomLine = -1); void SetFrameHwnd(HWND hwndFrame); + void ForceRecalculate(); protected: diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index da2d898f3e6..fc7d9217ef8 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -2769,12 +2769,13 @@ void CMergeEditView::OnOpenFileWithEditor() } /** - * @brief Force repaint of location pane + * @brief Force repaint of the location pane. */ void CMergeEditView::RepaintLocationPane() { + // Must force recalculation due to caching of data in location pane. if (m_pLocationView) - m_pLocationView->Invalidate(); + m_pLocationView->ForceRecalculate(); } /** From 181f1fe7394ff505dbc85bc39962966cc6ab343b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 29 Oct 2008 20:21:55 +0000 Subject: [PATCH 138/168] PATCH: [ 2182788 ] Disable rest of the plugins calls --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/MergeDoc.cpp | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e258bd51a7a..505055d3d01 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -16,6 +16,7 @@ WinMerge 2.10.2 did not work (#2138560) BugFix: If messagebox was shown during file loading location pane didn't show any differences (#2101780) + BugFix: Some calls made to plugins when plugins were disabled (#2182788) New translation: Galician (#2120685) Translation updates: - Czech (r6038) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 80537ad32e5..9a2792a9c80 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -2130,9 +2130,12 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file DWORD nRightSuccess = LoadOneFile(1, sRightFile.c_str(), bRORight, filelocRight.encoding); + const BOOL bFiltersEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED); + // scratchpad : we don't call LoadFile, so // we need to initialize the unpacker as a "do nothing" one - if (m_nBufferType[0] == BUFFER_UNNAMED && m_nBufferType[1] == BUFFER_UNNAMED) + if (bFiltersEnabled && m_nBufferType[0] == BUFFER_UNNAMED && + m_nBufferType[1] == BUFFER_UNNAMED) m_pInfoUnpacker->Initialize(PLUGIN_MANUAL); // Bail out if either side failed @@ -2207,9 +2210,12 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file // Define the prediffer PackingInfo * infoUnpacker = 0; PrediffingInfo * infoPrediffer = 0; - m_pDirDoc->FetchPluginInfos(m_strBothFilenames.c_str(), &infoUnpacker, &infoPrediffer); - m_diffWrapper.SetPrediffer(infoPrediffer); - m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames); + if (bFiltersEnabled) + { + m_pDirDoc->FetchPluginInfos(m_strBothFilenames.c_str(), &infoUnpacker, &infoPrediffer); + m_diffWrapper.SetPrediffer(infoPrediffer); + m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames); + } BOOL bBinary = FALSE; nRescanResult = Rescan(bBinary, bIdentical); @@ -2229,7 +2235,7 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file // Note: If option enabled, and another side type is not recognized, // we use recognized type for unrecognized side too. String sextL, sextR; - if (m_pInfoUnpacker->textType.length()) + if (bFiltersEnabled && m_pInfoUnpacker->textType.length()) { sextL = sextR = m_pInfoUnpacker->textType; } @@ -2246,9 +2252,9 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file if (syntaxHLEnabled) { bLeftTyped = pLeft->SetTextType(sextL.c_str()); - pLeftDetail->SetTextType(sextL.c_str()); + pLeftDetail->SetTextType(sextL.c_str()); bRightTyped = pRight->SetTextType(sextR.c_str()); - pRightDetail->SetTextType(sextR.c_str()); + pRightDetail->SetTextType(sextR.c_str()); } // If other side didn't have recognized texttype, apply recognized From b64a43cc2e9d5582a4abe8323cf9eef1d5f41e3f Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 4 Nov 2008 22:16:18 +0000 Subject: [PATCH 139/168] PATCH: [ 2222461 ] Remove www. from winmerge.org in User ReadMe's --HG-- branch : R2_10 --- Docs/Users/Languages/ReadMe-Brazilian.txt | 8 ++++---- Docs/Users/Languages/ReadMe-Bulgarian.txt | 8 ++++---- Docs/Users/Languages/ReadMe-Catalan.txt | 8 ++++---- Docs/Users/Languages/ReadMe-ChineseSimplified.txt | 8 ++++---- Docs/Users/Languages/ReadMe-French.txt | 8 ++++---- Docs/Users/Languages/ReadMe-Greek.txt | 8 ++++---- Docs/Users/Languages/ReadMe-Romanian.txt | 8 ++++---- Docs/Users/Languages/ReadMe-Spanish.txt | 8 ++++---- Docs/Users/Languages/ReadMe-Swedish.txt | 10 +++++----- Docs/Users/Languages/ReadMe-Ukrainian.txt | 8 ++++---- Docs/Users/Manual/About_Doc.xml | 4 ++-- Docs/Users/ReadMe.txt | 6 +++--- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Docs/Users/Languages/ReadMe-Brazilian.txt b/Docs/Users/Languages/ReadMe-Brazilian.txt index d7bcb97d9c6..bc09577c06d 100644 --- a/Docs/Users/Languages/ReadMe-Brazilian.txt +++ b/Docs/Users/Languages/ReadMe-Brazilian.txt @@ -4,11 +4,11 @@ WinMerge http://winmerge.org Incio rpido para o WinMerge: Leia o captulo do incio rpido do manual online para se iniciar com o WinMerge: - http://www.winmerge.org/2.8/manual/quickstart.html + http://winmerge.org/docs/manual/QuickStart.html Manual em HTML: O manual est disponvel online em -http://www.winmerge.org/2.8/manual/ ele est tambm possivelmente instalado (se escolhido assim) localmente e descarregvel separadamente de http://www.winmerge.org/ (veja a documentao) Suporte para Arquivos: O -WinMerge usa o 7-Zip para o suporte para arquivos dentro de arquivos. 7-Zip (http://www.7-zip.org) uma ferramenta para arquivos com o cdigo fonte aberto. Para instalar o suporte para arquivos dentro de arquivos, baixe o instalador do plugin do 7-Zip de http://www.winmerge.org/ +http://winmerge.org/docs/manual/ ele est tambm possivelmente instalado (se escolhido assim) localmente e descarregvel separadamente de http://winmerge.org/ (veja a documentao) Suporte para Arquivos: O +WinMerge usa o 7-Zip para o suporte para arquivos dentro de arquivos. 7-Zip (http://www.7-zip.org) uma ferramenta para arquivos com o cdigo fonte aberto. Para instalar o suporte para arquivos dentro de arquivos, baixe o instalador do plugin do 7-Zip de http://winmerge.org/ Instalando o suporte para arquivos: recomendado instalar o aplicativo 7-Zip. Se isto no pode ser feito por alguma razo, o instalador do plugin do 7-Zip pode instalar apenas os arquivos necessrios para ativar o suporte para arquivos dentro dos arquivos. Note que NO permite o uso isolado do 7-Zip, apenas o suporte para arquivos para oWinMerge. @@ -35,4 +35,4 @@ RFE (pedido para fun http://sourceforge.net/tracker/?group_id=13216&atid=363216 -- Os Desenvolvedores do WinMerge \ No newline at end of file +- Os Desenvolvedores do WinMerge diff --git a/Docs/Users/Languages/ReadMe-Bulgarian.txt b/Docs/Users/Languages/ReadMe-Bulgarian.txt index 123621c173e..f524aee10ac 100644 --- a/Docs/Users/Languages/ReadMe-Bulgarian.txt +++ b/Docs/Users/Languages/ReadMe-Bulgarian.txt @@ -9,19 +9,19 @@ http://winmerge.org WinMerge: , WinMerge: -http://www.winmerge.org/2.6/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html HTML : : -http://www.winmerge.org/2.6/manual/ +http://winmerge.org/docs/manual/ ( ) - http://www.winmerge.org/ ( ) + http://winmerge.org/ ( ) : WinMerge 7-Zip . 7-Zip (http://www.7-zip.org) . , (plugin) 7-Zip -http://www.winmerge.org/. +http://winmerge.org/. : 7-Zip. diff --git a/Docs/Users/Languages/ReadMe-Catalan.txt b/Docs/Users/Languages/ReadMe-Catalan.txt index eeebb362b50..0158cb3bac1 100644 --- a/Docs/Users/Languages/ReadMe-Catalan.txt +++ b/Docs/Users/Languages/ReadMe-Catalan.txt @@ -9,19 +9,19 @@ http://winmerge.org Inici rpid amb el WinMerge: Llegiu el captol Quick-start del manual en lnia per a comenar amb el WinMerge: -http://www.winmerge.org/2.6/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html Manual HTML: El manual est disponible en lnia a -http://www.winmerge.org/2.6/manual/ +http://winmerge.org/docs/manual/ Possiblement tamb estigui installada localment (si aix es va triar) i es pot -baixar separadament des de http://www.winmerge.org/ (veieu la documentaci) +baixar separadament des de http://winmerge.org/ (veieu la documentaci) Suport d'arxivament: El WinMerge empra el 7-Zip per al suport de fitxers d'arxivament. 7-Zip (http://www.7-zip.org) s una eina d'arxivament de codi obert. Per tal d'installar el suport de fitxers d'arxivament, baixeu l'installador del connector del 7-Zip des de -http://www.winmerge.org/. +http://winmerge.org/. Tot installant el suport d'arxivament: Es recomana installar l'aplicaci del 7-Zip. De no ser possible per qualsevol motiu, diff --git a/Docs/Users/Languages/ReadMe-ChineseSimplified.txt b/Docs/Users/Languages/ReadMe-ChineseSimplified.txt index c469d010c63..737e74275bb 100644 --- a/Docs/Users/Languages/ReadMe-ChineseSimplified.txt +++ b/Docs/Users/Languages/ReadMe-ChineseSimplified.txt @@ -7,15 +7,15 @@ Windowsƽ̨ WinMerge ţ ĶֲġQuick-start½˽Ⲣʼ WinMerge -http://www.winmerge.org/2.8/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html HTML ֲ᣺ -ûֲԴ http://www.winmerge.org/2.8/manual/ õҲڰװʱѡ -װأҲԵ http://www.winmerge.org/ ء(μĵ) +ûֲԴ http://winmerge.org/docs/manual/ õҲڰװʱѡ +װأҲԵ http://winmerge.org/ ء(μĵ) ѹ֧֣ WinMerge ʹ 7-Zip ֧ѹ7-Zip (http://www.7-zip.org) һԴĴ -Ҫװѹ֧֣ http://www.winmerge.org/ 7-Zip װ +Ҫװѹ֧֣ http://winmerge.org/ 7-Zip װ װѹ֧֣ diff --git a/Docs/Users/Languages/ReadMe-French.txt b/Docs/Users/Languages/ReadMe-French.txt index cdd3d1a28ea..f9dfc77d2e2 100644 --- a/Docs/Users/Languages/ReadMe-French.txt +++ b/Docs/Users/Languages/ReadMe-French.txt @@ -9,20 +9,20 @@ http://winmerge.org Pour dbuter rapidement avec WinMerge: Lisez le manuel en ligne au chapitre du dmarrage rapide de WinMerge: -http://www.winmerge.org/2.6/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html Documentation HTML: Elle est disponible en ligne -http://www.winmerge.org/2.6/manual/ +http://winmerge.org/docs/manual/ Il est galement possible de l'installe localement (si dsir) et de la tlcharger sparment l'adresse (voir la documentation): -http://www.winmerge.org/ +http://winmerge.org/ Support d'archive: WinMerge utilise 7-Zip pour le support d'archivage de fichier. 7-Zip (http://www.7-zip.org) est un logiciel d'archivage libre. Pour installer le support d'archive de fichier, tlcharger le programme -d'installation plugiciel 7-Zip l'adresse http://www.winmerge.org/. +d'installation plugiciel 7-Zip l'adresse http://winmerge.org/. Installer le support d'archive: Il est recommand d'installer l'application 7-Zip. Si cela ne peut tre diff --git a/Docs/Users/Languages/ReadMe-Greek.txt b/Docs/Users/Languages/ReadMe-Greek.txt index 08126f479de..8eaf8c9c237 100644 --- a/Docs/Users/Languages/ReadMe-Greek.txt +++ b/Docs/Users/Languages/ReadMe-Greek.txt @@ -10,13 +10,13 @@ WINMERGE WinMerge: ( ) WinMerge: -http://www.winmerge.org/2.8/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html HTML: -http://www.winmerge.org/2.8/manual/ +http://winmerge.org/docs/manual/ ( ) - http://www.winmerge.org/ + http://winmerge.org/ (. ) : @@ -24,7 +24,7 @@ http://www.winmerge.org/2.8/manual/ 7-zip (http://www.7-zip.org) / , . , 7-zip -http://www.winmerge.org/. +http://winmerge.org/. : 7-zip. diff --git a/Docs/Users/Languages/ReadMe-Romanian.txt b/Docs/Users/Languages/ReadMe-Romanian.txt index 55c53f17527..ab9c77e45aa 100644 --- a/Docs/Users/Languages/ReadMe-Romanian.txt +++ b/Docs/Users/Languages/ReadMe-Romanian.txt @@ -12,20 +12,20 @@ http://winmerge.org Start rapid către utilizarea WinMerge: Citiţi capitolul Quick-start din manualul on-line pentru a vă familiariza cu WinMerge: -http://www.winmerge.org/2.8/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html Manualul HTML: Manualul este disponibil la -http://www.winmerge.org/2.8/manual/ +http://winmerge.org/docs/manual/ este posibil să-l aveţi instalat (dacă s-a optat pentru aceasta) local, -dar este şi copiabil separat de la http://www.winmerge.org/ +dar este şi copiabil separat de la http://winmerge.org/ (vezi documentaţia) Suport arhivare: WinMerge foloseşte 7-Zip pentru a suporta accesul la arhive de fişiere. 7-Zip (http://www.7-zip.org) este o unealtă de arhivare cu Sursă Deschisă. Pentru a instala suportul de arhivare, copiaţi kit-ul plug-in-ului 7-Zip -de la http://www.winmerge.org/ . +de la http://winmerge.org/ . Instalarea suportului de arhivare: Este recomandat să instalaţi aplicaţia 7-Zip. Dacă acest lucru nu poate fi diff --git a/Docs/Users/Languages/ReadMe-Spanish.txt b/Docs/Users/Languages/ReadMe-Spanish.txt index e5fb08a794f..d3d25b9a117 100644 --- a/Docs/Users/Languages/ReadMe-Spanish.txt +++ b/Docs/Users/Languages/ReadMe-Spanish.txt @@ -9,19 +9,19 @@ http://winmerge.org Gua rpida de WinMerge: Lea el captulo Quick-start del manual on-line para comenzar con WinMerge; -http://www.winmerge.org/2.6/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html Manual HTML: el manual est disponible online en: -http://www.winmerge.org/2.6/manual/ +http://winmerge.org/docs/manual/ Posiblemente tambin est instalado (si se eligi as) localmente, y se puede -descargar por separado desde http://www.winmerge.org/ (ver Documentacin) +descargar por separado desde http://winmerge.org/ (ver Documentacin) Soporte de archivado: WinMerge usa 7-Zip para soporte de archivado. 7-Zip (http://www.7-zip.org) es una utilidad de cdigo abierto de compresin. Para instalar el soporte de archivado, descargue el instalador del plugin de 7-Zip desde -http://www.winmerge.org/. +http://winmerge.org/. Instalacin del soporte de archivado: Se recomienda instalar la aplicacin 7-Zip. Si no pudiera ser por alguna razn, diff --git a/Docs/Users/Languages/ReadMe-Swedish.txt b/Docs/Users/Languages/ReadMe-Swedish.txt index 6d2a60e69b0..2c177e7b983 100644 --- a/Docs/Users/Languages/ReadMe-Swedish.txt +++ b/Docs/Users/Languages/ReadMe-Swedish.txt @@ -5,22 +5,22 @@ alla moderna Windowsversioner. N installationer eller komponenter. Senaste versionen av WinMerge och annan WinMerge information finns p -http://www.winmerge.org +http://winmerge.org Snabbstart fr WinMerge (Quick start to WinMerge): Ls online-manualens Quick start-kapitel fr att starta med WinMerge: -http://www.winmerge.org/2.6/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html HTML Manual: Manual finns tillgngling online p -http://www.winmerge.org/2.6/manual/ +http://winmerge.org/docs/manual/ det r ocks mjligtvis installerat (om detta r valt) lokalt och -nerladdningsbart separat frn http://www.winmerge.org/ (se dokumentation). +nerladdningsbart separat frn http://winmerge.org/ (se dokumentation). Arkivstd (Archive Support): WinMerge anvnder 7-Zip fr arkivfilstd. 7-Zip (http://www.7-zip.org) r ett Open Source arkivprogram. Fr att installera arkivstd , ladda ner -7-Zip plugininstalleraren frn http://www.winmerge.org/. +7-Zip plugininstalleraren frn http://winmerge.org/. Installera arkivstd (Installing archive support): Det r rekommenderat att installera 7-Zip programmet. Om detta inte kan gras av diff --git a/Docs/Users/Languages/ReadMe-Ukrainian.txt b/Docs/Users/Languages/ReadMe-Ukrainian.txt index caafe0541a2..d50bf3ecab4 100644 --- a/Docs/Users/Languages/ReadMe-Ukrainian.txt +++ b/Docs/Users/Languages/ReadMe-Ukrainian.txt @@ -9,19 +9,19 @@ http://winmerge.org WinMerge: - WinMerge: -http://www.winmerge.org/2.8/manual/quickstart.html +http://winmerge.org/docs/manual/QuickStart.html HTML-: -http://www.winmerge.org/2.8/manual/ +http://winmerge.org/docs/manual/ ( ) -http://www.winmerge.org/ (. ) +http://winmerge.org/ (. ) ϳ : WinMerge 7-Zip. 7-Zip (http://www.7-zip.org) (Open Source) . , 7-Zip - http://www.winmerge.org/ + http://winmerge.org/ : 7-Zip. , diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index 89483589469..e50a3204dd8 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -69,7 +69,7 @@ Open your Web browser to www.winmerge.org. Under + url="http://winmerge.org/">winmerge.org. Under Features, follow the Online manual link to the latest Help version. @@ -323,4 +323,4 @@

      -
      \ No newline at end of file +
      diff --git a/Docs/Users/ReadMe.txt b/Docs/Users/ReadMe.txt index 3484ec345e3..ad6319103c0 100644 --- a/Docs/Users/ReadMe.txt +++ b/Docs/Users/ReadMe.txt @@ -15,12 +15,12 @@ HTML Manual: Manual is available online at http://winmerge.org/docs/manual/ it is also possibly installed (if choosed so) locally and downloadable -separately from http://www.winmerge.org/ (see documentation) +separately from http://winmerge.org/ (see documentation) Archive Support: WinMerge uses 7-Zip for archive file support. 7-Zip (http://www.7-zip.org) is Open Source archive tool. To install archive file support, download -7-Zip plugin installer from http://www.winmerge.org/. +7-Zip plugin installer from http://winmerge.org/. Installing archive support: It is recommended to Install 7-Zip application. If this cannot be done for @@ -29,7 +29,7 @@ enable archive file support. Note that it DOES NOT allow stand-alone use of 7-Zip, only archive support for WinMerge. Scripts Support: -If you would like to work with scripts youll need to have the Windows +If you would like to work with scripts youll need to have the Windows Scripting Host installed. If you receive any errors relating to your scripts please visit http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.asp From b1786e70c49fb1785dee8e7548163f1227577b4b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 6 Nov 2008 15:11:13 +0000 Subject: [PATCH 140/168] PATCH: [ 2227131 ] Swedish.po + bugreport on broken translations... Submitted by Hans Eriksson --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/Swedish.po | 162 +++++++++++++++++++++++++++++---------- 2 files changed, 124 insertions(+), 39 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 505055d3d01..af76fbd1ebf 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -20,6 +20,7 @@ WinMerge 2.10.2 New translation: Galician (#2120685) Translation updates: - Czech (r6038) + - Swedish (#2227131) - Ukrainian (#2131753) WinMerge 2.10 - 2008-09-17 (r5967) diff --git a/Src/Languages/Swedish.po b/Src/Languages/Swedish.po index a06310d5eb1..2aa6bf7b066 100644 --- a/Src/Languages/Swedish.po +++ b/Src/Languages/Swedish.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2008-08-20 13:00+0100\n" +"PO-Revision-Date: 2008-10-05 23:40+0100\n" "Last-Translator: Hans Eriksson \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -1304,7 +1304,9 @@ msgstr "J #: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." -msgstr "WinMerge tillter att vissa meddelanderutor dljs. Klicka p terstll-knappen fr att gra alla meddelanderutor synliga igen." +msgstr "" +"WinMerge tillter att vissa meddelanderutor dljs.\n" +"Klicka p terstll-knappen fr att gra alla meddelanderutor synliga igen." #: Merge.rc:781 #, c-format @@ -2140,8 +2142,12 @@ msgstr "Plugins i s #: Merge.rc:1321 #, c-format -msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" -msgstr "Visa inte detta &meddelande igen.\n(Du kan alltid f tillbaka detta meddelande frn Hjlp-menyn.)" +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" +msgstr "" +"Visa inte detta &meddelande igen.\n" +"(Du kan alltid f tillbaka detta meddelande frn Hjlp-menyn.)" #: Merge.rc:1325 #, c-format @@ -3047,8 +3053,12 @@ msgstr "H #: Merge.rc:1888 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -msgstr "Utvecklare:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgstr "" +"Utvecklare:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" #: Merge.rc:1889 #, c-format @@ -3417,8 +3427,14 @@ msgstr "Regulj #: Merge.rc:2037 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." -msgstr "Filtren r uppdaterade Vill du uppdatera alla ppna katalogjmfrelser?\n\nOm du inte vill uppdatera alla jmfrelser nu kan du vlja Nej och uppdatera jmfrelser senare." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" +"Filtren r uppdaterade Vill du uppdatera alla ppna katalogjmfrelser?\n" +"\n" +"Om du inte vill uppdatera alla jmfrelser nu kan du vlja Nej och uppdatera jmfrelser senare." #: Merge.rc:2043 #, c-format @@ -3510,15 +3526,17 @@ msgstr "Flyttar filer..." msgid "Creating the report..." msgstr "Skapar rapport..." +# Use action instead operation, like the rest of the undo/redo system. #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "ngrar den frra tgrden" +# Use action instead operation, like the rest of the undo/redo system. #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Gr om den tidigare tgrden" #: Merge.rc:2078 #, c-format @@ -3641,8 +3659,14 @@ msgstr "Kunde inte tolka Konfliktfilen." #: Merge.rc:2115 #, c-format -msgid "The file\n%1\nis not a conflict file." -msgstr "Filen\n%1\nr inte en Konfliktfil." +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." +msgstr "" +"Filen\n" +"%1\n" +"r inte en Konfliktfil." #: Merge.rc:2121 #, c-format @@ -4015,7 +4039,8 @@ msgid "" msgstr "" "r du sker p du att vill ta bort\n" "\n" -"%1 ?" +"%1\n" +"?" #: Merge.rc:2215 #, c-format @@ -4563,8 +4588,14 @@ msgstr "" #: Merge.rc:2384 #, 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 "Radsluten r av olika typer (Windows/Unix/Mac) i filen '%1'.\n Med de aktuella instllningarna, kommer de att ndras till den vanligaste typen.\n Vill du ndra i instllningarna och bevara de olika radsluten ?" +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 "" +"Radsluten r av olika typer (Windows/Unix/Mac) i filen '%1'.\n" +" Med de aktuella instllningarna, kommer de att ndras till den vanligaste typen.\n" +" Vill du ndra i instllningarna och bevara de olika radsluten ?" #: Merge.rc:2385 #, c-format @@ -4583,8 +4614,18 @@ msgstr "Kan inte #: Merge.rc:2388 #, 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 "Katalogen finns bara p andra sidan och kan inte ppnas.\n\nVill du skapa en matchande katalog:\n%1\np andra sidan och ppna dessa kataloger?" +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" +msgstr "" +"Katalogen finns bara p andra sidan och kan inte ppnas.\n" +"\n" +"Vill du skapa en matchande katalog:\n" +"%1\n" +"p andra sidan och ppna dessa kataloger?" #: Merge.rc:2394 #, c-format @@ -5473,13 +5514,21 @@ msgstr "Visar dialog med katalogj #: Merge.rc:2677 #, c-format -msgid "Select the current user interface language\nLanguage" -msgstr "Vljer sprk fr anvndargrnssnittet\nSprk" +msgid "" +"Select the current user interface language\n" +"Language" +msgstr "" +"Vljer sprk fr anvndargrnssnittet\n" +"Sprk" #: Merge.rc:2678 #, c-format -msgid "Shows differences inside lines with different colors\nShow Line Difference" -msgstr "Visar skillnader inom rader med olika frg\nVisa radskillnad" +msgid "" +"Shows differences inside lines with different colors\n" +"Show Line Difference" +msgstr "" +"Visar skillnader inom rader med olika frg\n" +"Visa radskillnad" #: Merge.rc:2679 #, c-format @@ -5530,28 +5579,48 @@ msgstr " #: Merge.rc:2691 #, c-format -msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" -msgstr "Gr till fregende skillnad\nFregende skillnad (Alt+Upp)" +msgid "" +"Scroll to the previous difference\n" +"Previous Difference (Alt+Up)" +msgstr "" +"Gr till fregende skillnad\n" +"Fregende skillnad (Alt+Upp)" #: Merge.rc:2692 #, c-format -msgid "Scroll to the next difference\nNext Difference (Alt+Down)" -msgstr "Gr till nsta skillnad\nNsta skillnad (Alt+Ner)" +msgid "" +"Scroll to the next difference\n" +"Next Difference (Alt+Down)" +msgstr "" +"Gr till nsta skillnad\n" +"Nsta skillnad (Alt+Ner)" #: Merge.rc:2693 #, c-format -msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" -msgstr "Gr till frsta skillnaden\nFrsta skillnad (Alt+Home)" +msgid "" +"Scroll to the first difference\n" +"First Difference (Alt+Home)" +msgstr "" +"Gr till frsta skillnaden\n" +"Frsta skillnad (Alt+Home)" #: Merge.rc:2694 #, c-format -msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" -msgstr "Gr till aktuell skillnad\nAktuell skillnad (Alt+Enter)" +msgid "" +"Scroll to the current difference\n" +"Current Difference (Alt+Enter)" +msgstr "" +"Gr till aktuell skillnad\n" +"Aktuell skillnad (Alt+Enter)" #: Merge.rc:2695 #, c-format -msgid "Scroll to the last difference\nLast Difference (Alt+End)" -msgstr "Gr till sista skillnaden\nSista skillnad (Alt+End)" +msgid "" +"Scroll to the last difference\n" +"Last Difference (Alt+End)" +msgstr "" +"Gr till sista skillnaden\n" +"Sista skillnad (Alt+End)" #: Merge.rc:2696 #, c-format @@ -5679,9 +5748,12 @@ msgstr "St #: Merge.rc:2731 #, c-format -msgid "Activates next visible file\nActivate next File" +msgid "" +"Activates next visible file\n" +"Activate next File" msgstr "" -"Aktiverar nsta synliga fil\nAktivera nsta fil" +"Aktiverar nsta synliga fil\n" +"Aktivera nsta fil" #: Merge.rc:2732 #, c-format @@ -5690,8 +5762,12 @@ msgstr "St #: Merge.rc:2738 #, c-format -msgid "Opens the WinMerge Help\nWinMerge Help" -msgstr "ppnar WinMerge Hjlp\nWinMerge Hjlp" +msgid "" +"Opens the WinMerge Help\n" +"WinMerge Help" +msgstr "" +"ppnar WinMerge Hjlp\n" +"WinMerge Hjlp" #: Merge.rc:2739 #, c-format @@ -5710,13 +5786,21 @@ msgstr "Privat Kompilering: %1" #: Merge.rc:2742 #, c-format -msgid "Opens the release notes document\nRelease Notes" -msgstr "ppnar Releasenoteringsdokumentet\nReleasenoteringar" +msgid "" +"Opens the release notes document\n" +"Release Notes" +msgstr "" +"ppnar Releasenoteringsdokumentet\n" +"Releasenoteringar" #: Merge.rc:2743 #, c-format -msgid "Opens the translations website\nTranslations" -msgstr "ppnar versttningssidan\nversttningar" +msgid "" +"Opens the translations website\n" +"Translations" +msgstr "" +"ppnar versttningssidan\n" +"versttningar" #: Merge.rc:2749 #, c-format From b556092b31efa86e1c52594406d73d3697bcd362 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 6 Nov 2008 15:16:51 +0000 Subject: [PATCH 141/168] PATCH: [ 2222871 ] Docs: Release notes for 2.10.2 --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReleaseNotes.html | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index af76fbd1ebf..d9d391a59c3 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.2 Change download URL to current URL (#2136765) Installer: create backup of ClearCase config file (#2129095) + Release notes update (#2222871) BugFix: Case-sensitive regexp search didn't work (#1991259) BugFix: Wrong cursor position when disabling selection margin (#2138555) BugFix: Showed a black line when disabling selection margin (#2068790) diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html index 81f4c8daa50..b8ed2297205 100644 --- a/Docs/Users/ReleaseNotes.html +++ b/Docs/Users/ReleaseNotes.html @@ -54,6 +54,7 @@

      WinMerge 2.10 Release Notes

      • About This Release
        • +
      • What Is New in 2.10.2?
      • What Is New in 2.10?
      • What Is New in 2.10 RC?
      • What Is New in 2.9.10 Beta?
        • @@ -73,6 +74,37 @@

        About This Release

        "https://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-tracker.

        +

        What Is New in 2.10.2?

        +

        +WinMerge 2.10.2 is a bug fix update for the 2.10.0 release. There are no new +features or other significant changes. Most notable fixes are the fixes for +the installer. +

        + +

        Bugs fixed

        +
          +
        • Installer problems (not setting TortoiseSVN integration, missing + icons)
          • +
        • Case-sensitive regular expression search in editor did not work
          • +
        • Giving path to file and folder to command line did not work + (e.g WinMergeU folder/file.txt folder2 - did not open + file.txt from folder2) +
          • +
        • If a message was shown during the file loading the location pane did not + show any differences
          • +
        • Fix manual URL in Readme.txt
          • +
        + +

        Translations

        +

        +New translation for Galician was added. Two translations were updated: +

        +
          +
        • Czech
          • +
        • Ukrainian
          • +
        + +

        What Is New in 2.10?

        WinMerge 2.10 does not have many new features. Instead many existing features From a19ba2f49f3275038328caceec186ec1606dc82e Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 6 Nov 2008 18:47:42 +0000 Subject: [PATCH 142/168] Manual: bump revision number to 1.4.8. --HG-- branch : R2_10 --- Docs/Users/Manual/WinMerge_help.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index f222df51c2e..21c7c462388 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -26,7 +26,7 @@ WinMerge - Revision 1.4.7 + Revision 1.4.8 2004-2008 From 5d59eece08a5e24f3205bfb866c712151edb6ef3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 6 Nov 2008 18:53:29 +0000 Subject: [PATCH 143/168] WinMerge 2.10.2 release (SVN revision 6075) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index d9d391a59c3..16b8884981d 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,7 +3,7 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.10.2 +WinMerge 2.10.2 - 2008-11-06 (r6075) Change download URL to current URL (#2136765) Installer: create backup of ClearCase config file (#2129095) Release notes update (#2222871) From 2d078c4af825f3be1ebcd1023e0d8fc27ac0deef Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 12 Nov 2008 16:47:29 +0000 Subject: [PATCH 144/168] PATCH: [ 2236651 ] An updated InnoSetup Swedish.isl file for WinMerge Submitted by Hans Eriksson --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 4 ++++ Installer/InnoSetup/Languages/Swedish.isl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 16b8884981d..35de7230f97 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,6 +3,10 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] +WinMerge 2.10.4 + Translation updates: + - Swedish (#2236651) + WinMerge 2.10.2 - 2008-11-06 (r6075) Change download URL to current URL (#2136765) Installer: create backup of ClearCase config file (#2129095) diff --git a/Installer/InnoSetup/Languages/Swedish.isl b/Installer/InnoSetup/Languages/Swedish.isl index 317b30e26bc..b9dfefe2840 100755 --- a/Installer/InnoSetup/Languages/Swedish.isl +++ b/Installer/InnoSetup/Languages/Swedish.isl @@ -336,7 +336,7 @@ CzechLanguage=Tjeckiska menyer och dialoger DanishLanguage=Danska menyer och dialoger DutchLanguage=Nederlndska menyer och dialoger FrenchLanguage=Franska menyer och dialoger -GalicianLanguage=Galician menus and dialogs +GalicianLanguage=Galiciska menyer och dialoger GermanLanguage=Tyska menyer och dialoger GreekLanguage=Grekiska menyer och dialoger HungarianLanguage=Ungerska menyer och dialoger From a9952d6efe3564ef6ab053cad9cbea7b679a6b0c Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Mon, 17 Nov 2008 21:08:58 +0000 Subject: [PATCH 145/168] PATCH: [ 2287227 ] Manual: Fix HtmlHelp IE problems --HG-- branch : R2_10 --- Docs/Users/Manual/css/help.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Docs/Users/Manual/css/help.css b/Docs/Users/Manual/css/help.css index dcbe34924a1..8daba8dadce 100644 --- a/Docs/Users/Manual/css/help.css +++ b/Docs/Users/Manual/css/help.css @@ -1,4 +1,14 @@ @import url("all.css") screen; @import url("print.css") print; -/* Add any HTML Help specific rules below */ \ No newline at end of file +/* Add any HTML Help specific rules below */ + +.article, +.appendix { + border:1px solid white; /* Fix problems with old IE browsers! */ +} + +.titlepage h2 { + margin-top: 0.5em; + margin-bottom: 0; +} \ No newline at end of file From 66a48ad92af6a41d727cd5aaced838369077c5e1 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 25 Nov 2008 22:47:10 +0000 Subject: [PATCH 146/168] PATCH: [ 2329381 ] Add .Git to SourceControl.flt and fix ignore file rules --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Filters/SourceControl.flt | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 35de7230f97..5c144ecd680 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -4,6 +4,7 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.4 + Add Git to Source Control filter and fix ignore file rules (#2329381) Translation updates: - Swedish (#2236651) diff --git a/Filters/SourceControl.flt b/Filters/SourceControl.flt index 7e13aaf8d24..3e4f8bf3d1c 100644 --- a/Filters/SourceControl.flt +++ b/Filters/SourceControl.flt @@ -12,15 +12,17 @@ def: include ## Filters for directories begin with d: ## (Inline comments begin with " ##" and extend to the end of the line) -## f: *\.bzrignore$ ## Bazaar ignore file -## f: *\.cvsignore$ ## CVS ignore file -## f: *\.hgignore$ ## Mercurial ignore file -## f: *\.svnignore$ ## Subversion ignore file +## f: \.bzrignore$ ## Bazaar ignore file +## f: \.cvsignore$ ## CVS ignore file +## f: \.gitignore$ ## Git ignore file +## f: \.hgignore$ ## Mercurial ignore file +## f: \.svnignore$ ## Subversion ignore file f: \.(vs[sp])?scc$ ## Visual SourceSafe files d: \\\.svn$ ## Subversion working copy d: \\_svn$ ## Subversion working copy ASP.NET Hack d: \\cvs$ ## CVS control directory +d: \\\.git$ ## Git directory d: \\\.bzr$ ## Bazaar branch d: \\\.hg$ ## Mercurial repository From 3dfc1779c2ed119202c3215c45d019e171d375dd Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 26 Nov 2008 10:56:08 +0000 Subject: [PATCH 147/168] PATCH: [ 2327565 ] Patch for Bug 2309190 Submitted by Chris Paulse --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/Contributors.txt | 1 + Src/DirActions.cpp | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 5c144ecd680..f5d58856e28 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.4 Add Git to Source Control filter and fix ignore file rules (#2329381) + Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190) Translation updates: - Swedish (#2236651) diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt index 8799076d472..23f375c098d 100644 --- a/Docs/Users/Contributors.txt +++ b/Docs/Users/Contributors.txt @@ -153,6 +153,7 @@ Other Contributors (code, ideas, testing..): * Ryan Mott * Tim Musschoot * Marco De Paoli +* Chris Paulse * Dan Pidcock * Vincent Osele * Scott Rasmussen diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index 63c2079ae78..edfc9e0bbae 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -748,6 +748,7 @@ void CDirView::DoMoveLeftTo() act.dirflag = di.diffcode.isDirectory(); act.context = sel; act.atype = actType; + act.UIOrigin = FileActionItem::UI_LEFT; act.UIResult = FileActionItem::UI_DEL_LEFT; actionScript.AddActionItem(act); ++selCount; @@ -816,6 +817,7 @@ void CDirView::DoMoveRightTo() act.dirflag = di.diffcode.isDirectory(); act.context = sel; act.atype = actType; + act.UIOrigin = FileActionItem::UI_RIGHT; act.UIResult = FileActionItem::UI_DEL_RIGHT; actionScript.AddActionItem(act); ++selCount; From 4414da005515172e848655ae420aeecb01f1742e Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Wed, 26 Nov 2008 23:26:02 +0000 Subject: [PATCH 148/168] PATCH: [ 2347236 ] Add "Maintainer" support to translations status --HG-- branch : R2_10 --- Src/Languages/GetTranslationsStatus.vbs | 33 +++++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/Src/Languages/GetTranslationsStatus.vbs b/Src/Languages/GetTranslationsStatus.vbs index 1fa28445b10..412b527ea1a 100644 --- a/Src/Languages/GetTranslationsStatus.vbs +++ b/Src/Languages/GetTranslationsStatus.vbs @@ -92,8 +92,9 @@ Class CStatus Set Translators = CreateObject("Scripting.Dictionary") End Sub - Public Sub AddTranslator(ByVal sTranslator) + Public Sub AddTranslator(ByVal sTranslator, ByVal bMaintainer) Set Translator = New CTranslator + Translator.Maintainer = bMaintainer Translator.Mail = Trim(GetRegExpSubMatch(sTranslator, "<(.*)>")) If (Translator.Mail <> "") Then 'If mail address exists... Translator.Name = Trim(GetRegExpSubMatch(sTranslator, "(.*) <.*>")) @@ -107,14 +108,14 @@ End Class '' ' ... Class CTranslator - Public Name, Mail + Public Name, Mail, Maintainer End Class '' ' ... Function GetTranslationsStatusFromPoFile(ByVal sPoPath) Dim oStatus, oTextFile, sLine - Dim oMatch, iMsgStarted, sMsgId, sMsgStr, bFuzzy + Dim oMatch, iMsgStarted, sMsgId, sMsgStr, bFuzzy, bMaintainer Dim reMsgId, reMsgStr, reMsgContinued Set reMsgId = New RegExp @@ -135,6 +136,7 @@ Function GetTranslationsStatusFromPoFile(ByVal sPoPath) sMsgId = "" sMsgStr = "" bFuzzy = False + bMaintainer = False Set oTextFile = oFSO.OpenTextFile(sPoPath, ForReading) Do Until oTextFile.AtEndOfStream = True 'For all lines... sLine = Trim(oTextFile.ReadLine) @@ -163,8 +165,12 @@ Function GetTranslationsStatusFromPoFile(ByVal sPoPath) If (InStr(sLine, "fuzzy") > 0) Then 'If "fuzzy"... bFuzzy = True End If - ElseIf (Left(sLine, 4) = "# * ") Then 'If translator... - oStatus.AddTranslator Trim(Mid(sLine, 5)) + ElseIf (sLine = "# Maintainer:") Then 'If maintainer list starts... + bMaintainer = True + ElseIf (sLine = "# Translators:") Then 'If translators list starts... + bMaintainer = False + ElseIf (Left(sLine, 4) = "# * ") Then 'If translator/maintainer... + oStatus.AddTranslator Trim(Mid(sLine, 5)), bMaintainer End If End If Else 'If empty line @@ -201,6 +207,7 @@ End Function ' ... Sub CreateTranslationsStatusHtmlFile(ByVal sHtmlPath, ByVal oTranslationsStatus) Dim oHtmlFile, sLanguage, oLanguageStatus, i + Dim sMaintainerStart, sMaintainerEnd Set oHtmlFile = oFSO.CreateTextFile(sHtmlPath, True) @@ -288,10 +295,16 @@ Sub CreateTranslationsStatusHtmlFile(ByVal sHtmlPath, ByVal oTranslationsStatus) oHtmlFile.WriteLine "

      " oHtmlFile.WriteLine " " @@ -368,7 +381,11 @@ Sub CreateTranslationsStatusXmlFile(ByVal sHtmlPath, ByVal oTranslationsStatus) oXmlFile.WriteLine " " oXmlFile.WriteLine " " For i = 0 To oLanguageStatus.Translators.Count - 1 'For all translators... - oXmlFile.WriteLine " " + If (oLanguageStatus.Translators(i).Maintainer = True) Then 'If maintainer... + oXmlFile.WriteLine " " + Else 'If NOT maintainer... + oXmlFile.WriteLine " " + End If oXmlFile.WriteLine " " & oLanguageStatus.Translators(i).Name & "" If (oLanguageStatus.Translators(i).Mail <> "") Then 'If mail address exists... oXmlFile.WriteLine " " & oLanguageStatus.Translators(i).Mail & "" From fbff2f151a53ac3a88d0870efab613249a695fe6 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Thu, 4 Dec 2008 23:49:08 +0000 Subject: [PATCH 149/168] Update meta informations in Galician PO file --HG-- branch : R2_10 --- Src/Languages/Galician.po | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Src/Languages/Galician.po b/Src/Languages/Galician.po index 63f1114963f..96d984bbafc 100644 --- a/Src/Languages/Galician.po +++ b/Src/Languages/Galician.po @@ -1,6 +1,9 @@ # This file is part from WinMerge # Released under the "GNU General Public License" # +# Translators: +# * Medulio +# # ID line follows -- this is updated by SVN # $Id$ # @@ -9,16 +12,16 @@ msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" "POT-Creation-Date: \n" -"PO-Revision-Date: \n" +"PO-Revision-Date: 2008-09-20 15:42+0100\n" "Last-Translator: Medulio \n" "Language-Team: Galician-CiberIrmandade \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=CP1252\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Galician\n" -"X-Poedit-SourceCharset: iso-8859-1\n" -"X-Generator: CreateMasterPotFile.vbs\n" +"X-Poedit-SourceCharset: CP1252\n" "X-Poedit-Country: Galiza\n" +"X-Poedit-Basepath: ../\n" #. LANGUAGE, SUBLANGUAGE #: Merge.rc:22 From 3b844a3210d72a3ad6b44068acf8382755c12977 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 5 Dec 2008 13:59:20 +0000 Subject: [PATCH 150/168] PATCH: [ 2391000 ] Installer: use translated Readme for Chinese Simplified --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Installer/InnoSetup/WinMerge.iss | 1 + 2 files changed, 2 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index f5d58856e28..597dd1a0c33 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.4 Add Git to Source Control filter and fix ignore file rules (#2329381) Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190) + Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000) Translation updates: - Swedish (#2236651) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 0ea8fe0ca7e..07b21b3bf2a 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -442,6 +442,7 @@ Name: {group}\{cm:ProgramOnTheWeb,WinMerge}; Filename: http://winmerge.org/ Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Brazilian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: PortugueseBrazilian Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Bulgarian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Bulgarian Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Catalan.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Catalan +Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-ChineseSimplified.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Chinese_Simplified Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-French.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: French Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Greek.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Greek Name: {group}\{cm:ReadMe}; Filename: {app}\Docs\ReadMe-Romanian.txt; IconFileName: {win}\NOTEPAD.EXE; Languages: Romanian From 2d51fce182658f7e5b2c7be0eff16ad41d8464ae Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 7 Dec 2008 15:14:16 +0000 Subject: [PATCH 151/168] PATCH: [ 2396437 ] Installer: Install all readme texts --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Installer/InnoSetup/WinMerge.iss | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 597dd1a0c33..dfd4d4b3b55 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -7,6 +7,7 @@ WinMerge 2.10.4 Add Git to Source Control filter and fix ignore file rules (#2329381) Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190) Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000) + Bugfix: Installer didn't install readme.txt for all translations (#2396437) Translation updates: - Swedish (#2236651) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 07b21b3bf2a..a8cdb8ebaa4 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -378,11 +378,13 @@ Source: ..\..\Build\MergeUnicodeRelease\MergeLang.dll; DestDir: {app}; Flags: pr ; Language files Source: ..\..\Src\Languages\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp +Source: ..\..\Docs\Users\Languages\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Source: ..\..\Src\Languages\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp Source: ..\..\Docs\Users\Languages\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian Source: ..\..\Src\Languages\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp Source: ..\..\Docs\Users\Languages\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan Source: ..\..\Src\Languages\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp +Source: ..\..\Docs\Users\Languages\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified Source: ..\..\Src\Languages\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp @@ -402,6 +404,7 @@ Source: ..\..\Src\Languages\Norwegian.po; DestDir: {app}\Languages; Components: Source: ..\..\Src\Languages\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Docs\Users\Languages\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian Source: ..\..\Src\Languages\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp Source: ..\..\Src\Languages\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp From b92a81a0fc8f3e8d5a083bfdaeb0a54f5f62bd3b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 17 Dec 2008 16:19:59 +0000 Subject: [PATCH 152/168] BUG: [ 2427946 ] Command line arguments does not work for Cygwin file pattern --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/MergeCmdLineInfo.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index dfd4d4b3b55..13329810de6 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -8,6 +8,8 @@ WinMerge 2.10.4 Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190) Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000) Bugfix: Installer didn't install readme.txt for all translations (#2396437) + Bugfix: Could not give paths to commandline when started WinMerge + from Cygwin prompt (#2427946) Translation updates: - Swedish (#2236651) diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp index 1c1eb15129a..5d6e56a3e9c 100644 --- a/Src/MergeCmdLineInfo.cpp +++ b/Src/MergeCmdLineInfo.cpp @@ -207,11 +207,16 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(LPCTSTR q) { String param; bool flag; + while ((q = EatParam(q, param, &flag)) != 0) { if (!flag) { - // Not a flag + // Its not a flag so it is a path + // Convert paths given in Linux-style ('/' as separator) given from + // Cygwin to Windows style ('\' as separator) + string_replace(param, String(_T("/")), String(_T("\\"))); + // If shortcut, expand it first if (paths_IsShortcut(param.c_str())) param = ExpandShortcut(param.c_str()); From dff441752be5a6f9ec4d0fa6fe8b84e2345e6586 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Thu, 18 Dec 2008 16:02:56 +0000 Subject: [PATCH 153/168] PATCH: [ 2440742 ] Fix link, title in Help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Locales.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index aa2fa7f2414..9a13593a643 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -1,7 +1,7 @@
      Locale support<indexterm> - <primary>localizing WinMerge </primary> + <primary>localizing WinMerge</primary> </indexterm> The WinMerge user interface is in English by default, but you can @@ -25,8 +25,8 @@ - : Choose one of the - configured language files. + : Choose one of the configured + language files. @@ -84,7 +84,7 @@
      - Changing the Winmerge interface language + Changing the WinMerge interface language If you have configured one or more translation files, as described in the preceding section, you can change the localization of WinMerge to any of From b13229c403e6ca43a04e6e532768d00ec1258a05 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Thu, 18 Dec 2008 23:26:22 +0000 Subject: [PATCH 154/168] PATCH: [ 2445436 ] Customize head title text in HTML manual --HG-- branch : R2_10 --- Docs/Users/Manual/build/build_html.xsl | 90 ++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/Docs/Users/Manual/build/build_html.xsl b/Docs/Users/Manual/build/build_html.xsl index 39440bc2488..114bc6d0790 100644 --- a/Docs/Users/Manual/build/build_html.xsl +++ b/Docs/Users/Manual/build/build_html.xsl @@ -17,5 +17,95 @@ + + + + + + + + + + + + + + + + + + + <xsl:copy-of select="$title"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 73c1543703caf6a19bbcf1ad1d98b6837f324cb7 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 21 Dec 2008 12:20:09 +0000 Subject: [PATCH 155/168] BUG: [2372000] Ampersand in folder names ruins the project file --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/ProjectFile.cpp | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 13329810de6..f1dd8c0fc04 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -10,6 +10,8 @@ WinMerge 2.10.4 Bugfix: Installer didn't install readme.txt for all translations (#2396437) Bugfix: Could not give paths to commandline when started WinMerge from Cygwin prompt (#2427946) + Bugfix: Cound not open project file that contains an ampersand + character in folder names (#2372000) Translation updates: - Swedish (#2236651) diff --git a/Src/ProjectFile.cpp b/Src/ProjectFile.cpp index f15210292bd..c13e7c23b51 100755 --- a/Src/ProjectFile.cpp +++ b/Src/ProjectFile.cpp @@ -287,6 +287,20 @@ scew_element* ProjectFile::AddPathsElement(scew_element * parent) return element; } +/** + * @brief Covert characters that are unsafe for use in XML + * @param [in] str The string to be converted + * @return The converted string + */ +static String EscapeXML(const String &str) +{ + String escapedStr = str; + string_replace(escapedStr, _T("&"), _T("&")); + string_replace(escapedStr, _T("<"), _T("<")); + string_replace(escapedStr, _T(">"), _T(">")); + return escapedStr; +} + /** * @brief Add paths data to the XML tree. * This function adds our paths data to the XML tree. @@ -300,29 +314,23 @@ BOOL ProjectFile::AddPathsContent(scew_element * parent) if (!m_leftFile.IsEmpty()) { - LPCTSTR path; element = scew_element_add(parent, Left_element_name); - path = m_leftFile.GetBuffer(MAX_PATH); - scew_element_set_contents(element, T2UTF8(path)); - m_leftFile.ReleaseBuffer(); + String path = m_leftFile; + scew_element_set_contents(element, T2UTF8(EscapeXML(path).c_str())); } if (!m_rightFile.IsEmpty()) { - LPCTSTR path; element = scew_element_add(parent, Right_element_name); - path = m_rightFile.GetBuffer(MAX_PATH); - scew_element_set_contents(element, T2UTF8(path)); - m_rightFile.ReleaseBuffer(); + String path = m_rightFile; + scew_element_set_contents(element, T2UTF8(EscapeXML(path).c_str())); } if (!m_filter.IsEmpty()) { - LPCTSTR filter; element = scew_element_add(parent, Filter_element_name); - filter = m_filter.GetBuffer(MAX_PATH); - scew_element_set_contents(element, T2UTF8(filter)); - m_filter.ReleaseBuffer(); + String filter = m_filter; + scew_element_set_contents(element, T2UTF8(EscapeXML(filter).c_str())); } element = scew_element_add(parent, Subfolders_element_name); From f3b4d2a7e23d5de1e5a044ba4eacd78787307e93 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 21 Dec 2008 12:26:31 +0000 Subject: [PATCH 156/168] PATCH: [2292456] Patch for BUG:"Modified Date and Size" seems to ignore size --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 ++ Src/FolderCmp.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index f1dd8c0fc04..2143f07eaa5 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -12,6 +12,8 @@ WinMerge 2.10.4 from Cygwin prompt (#2427946) Bugfix: Cound not open project file that contains an ampersand character in folder names (#2372000) + Bugfix: File compare method "Modified Date and Size" ignored file size + (#2455595) Translation updates: - Swedish (#2236651) diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp index c9d4ebdea3e..6e6bd64c159 100644 --- a/Src/FolderCmp.cpp +++ b/Src/FolderCmp.cpp @@ -309,7 +309,7 @@ UINT FolderCmp::prepAndCompareTwoFiles(CDiffContext * pCtxt, DIFFITEM &di) // This is actual CMP_DATE_SIZE method.. // If file sizes differ mark them different - if (pCtxt->m_nCompMethod == CMP_DATE_SIZE && di.diffcode.isResultSame()) + if (pCtxt->m_nCompMethod == CMP_DATE_SIZE) { if (di.left.size != di.right.size) { From 5d9c310e3b4728aaebcddf1d823ad5704edb4ed3 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Mon, 22 Dec 2008 23:33:30 +0000 Subject: [PATCH 157/168] PATCH: [ 2459688 ] Manual: Link to new forum --HG-- branch : R2_10 --- Docs/Users/Manual/Introduction.xml | 6 +++--- Docs/Users/Manual/Locales.xml | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Docs/Users/Manual/Introduction.xml b/Docs/Users/Manual/Introduction.xml index b291c508765..fc0c3ceaf0e 100644 --- a/Docs/Users/Manual/Introduction.xml +++ b/Docs/Users/Manual/Introduction.xml @@ -153,7 +153,7 @@ Getting support and reporting bugs The Open Discussion + url="http://apps.sourceforge.net/phpbb/winmerge/viewforum.php?f=4">Open Discussion forum is the fastest way to get help. Please be patient, it may take some time for somebody to answer. @@ -229,7 +229,7 @@ url="http://winmerge.org/support/mailing-lists.php">development-mailing list is the preferred place for development discussions. Another place is in the developers-forum. + url="http://apps.sourceforge.net/phpbb/winmerge/viewforum.php?f=6">developers-forum. If you are interested in helping with WinMerge development, let us know. If you want to fix one of our , let us know.
      -
      \ No newline at end of file + diff --git a/Docs/Users/Manual/Locales.xml b/Docs/Users/Manual/Locales.xml index 9a13593a643..f6a8816fa43 100644 --- a/Docs/Users/Manual/Locales.xml +++ b/Docs/Users/Manual/Locales.xml @@ -253,7 +253,6 @@ translation) does not require you to have all the compile tools or to know about WinMerge internals, just to follow the instructions in the preceding link. And if you have problems, ask for help from us in one of the WinMerge - forums. + url="http://forums.winmerge.org/">WinMerge forums. - \ No newline at end of file + From 86539335efd598fc535c41df33b3f04566861a9c Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 27 Dec 2008 09:55:14 +0000 Subject: [PATCH 158/168] BUG: [ 2458728 ] Need to remove control chars from command line Fix by Jochen --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/MergeCmdLineInfo.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 2143f07eaa5..2f7061af069 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -14,6 +14,7 @@ WinMerge 2.10.4 character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size (#2455595) + Bugfix: Remove EOL characters from command line (#2458728) Translation updates: - Swedish (#2236651) diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp index 5d6e56a3e9c..6bc7fc00ba9 100644 --- a/Src/MergeCmdLineInfo.cpp +++ b/Src/MergeCmdLineInfo.cpp @@ -50,7 +50,7 @@ */ LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String ¶m, bool *flag) { - if (p && *(p += StrSpn(p, _T(" \t"))) == '\0') + if (p && *(p += StrSpn(p, _T(" \t\r\n"))) == '\0') p = 0; LPCTSTR q = PathGetArgs(p); if (q > p && flag) @@ -74,8 +74,8 @@ LPCTSTR MergeCmdLineInfo::EatParam(LPCTSTR p, String ¶m, bool *flag) CharLower(&*param.begin()); } // Strip any leading or trailing whitespace or quotes - param.erase(0, param.find_first_not_of(_T(" \t\""))); - param.erase(param.find_last_not_of(_T(" \t\"")) + 1); + param.erase(0, param.find_first_not_of(_T(" \t\r\n\""))); + param.erase(param.find_last_not_of(_T(" \t\r\n\"")) + 1); return q; } @@ -215,7 +215,7 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(LPCTSTR q) // Its not a flag so it is a path // Convert paths given in Linux-style ('/' as separator) given from // Cygwin to Windows style ('\' as separator) - string_replace(param, String(_T("/")), String(_T("\\"))); + string_replace(param, _T("/"), _T("\\")); // If shortcut, expand it first if (paths_IsShortcut(param.c_str())) From 032297705f8afdfdf6c1c463d1ccde47952a3fd0 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 6 Jan 2009 14:10:29 +0000 Subject: [PATCH 159/168] PATCH: [ 2481022 ] Updated Dutch translation Submitted by Thomas De Rocker --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 3 +- Docs/Users/Contributors.txt | 1 + Src/Languages/Dutch.po | 1250 ++++++++++++++++++++--------------- 3 files changed, 734 insertions(+), 520 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 2f7061af069..16d45bb59a4 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -10,12 +10,13 @@ WinMerge 2.10.4 Bugfix: Installer didn't install readme.txt for all translations (#2396437) Bugfix: Could not give paths to commandline when started WinMerge from Cygwin prompt (#2427946) - Bugfix: Cound not open project file that contains an ampersand + Bugfix: Could not open project file that contains an ampersand character in folder names (#2372000) Bugfix: File compare method "Modified Date and Size" ignored file size (#2455595) Bugfix: Remove EOL characters from command line (#2458728) Translation updates: + - Dutch (#2481022) - Swedish (#2236651) WinMerge 2.10.2 - 2008-11-06 (r6075) diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt index 23f375c098d..6bc8f55c678 100644 --- a/Docs/Users/Contributors.txt +++ b/Docs/Users/Contributors.txt @@ -50,6 +50,7 @@ Localization: * Dutch: Michel Coene + Thomas De Rocker Ronald Schaap * French: diff --git a/Src/Languages/Dutch.po b/Src/Languages/Dutch.po index 0b9e77e3d68..8a367098aa4 100644 --- a/Src/Languages/Dutch.po +++ b/Src/Languages/Dutch.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: \n" +"POT-Creation-Date: 2008-08-09 00:09+0000\n" "PO-Revision-Date: \n" -"Last-Translator: \n" +"Last-Translator: Thomas De Rocker \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CP1252\n" @@ -52,7 +52,7 @@ msgstr "Naar &links kopi #: Merge.rc:75 #, c-format msgid "&Select Line Difference" -msgstr "" +msgstr "&Selecteer Regelverschil" #: Merge.rc:77 #, c-format @@ -92,7 +92,7 @@ msgstr "&Ga naar..." #: Merge.rc:86 #, c-format msgid "Op&en" -msgstr "" +msgstr "Op&enen" #: Merge.rc:88 #: Merge.rc:527 @@ -127,7 +127,7 @@ msgstr "&Bestand" #: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" -msgstr "" +msgstr "&Nieuw\tCtrl+N" #: Merge.rc:113 #: Merge.rc:194 @@ -141,26 +141,26 @@ msgstr "&Openen...\tCtrl+O" #: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." -msgstr "" +msgstr "Op&en Conflictbestand..." #: Merge.rc:116 #: Merge.rc:197 #: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" -msgstr "" +msgstr "Pro&ject openen...\tCtrl+J" #: Merge.rc:117 #: Merge.rc:198 #: Merge.rc:315 #, c-format msgid "Sa&ve Project..." -msgstr "" +msgstr "Project Op&slaan..." #: Merge.rc:119 #, c-format msgid "Recent Projects" -msgstr "" +msgstr "Recente Projecten" #: Merge.rc:121 #: Merge.rc:205 @@ -195,56 +195,56 @@ msgstr "B&eeld" #: Merge.rc:387 #, c-format msgid "Select &Font..." -msgstr "Kies &Font..." +msgstr "Kies &Font..." #: Merge.rc:130 #: Merge.rc:225 #: Merge.rc:388 #, c-format msgid "Use Default F&ont" -msgstr "Gebruik standaard F&ont" +msgstr "Gebruik standaard F&ont" #: Merge.rc:132 #: Merge.rc:227 #: Merge.rc:409 #, c-format msgid "&Toolbar" -msgstr "" +msgstr "&Werkbalk" #: Merge.rc:134 #: Merge.rc:229 #: Merge.rc:411 #, c-format msgid "&None" -msgstr "" +msgstr "Geen" #: Merge.rc:135 #: Merge.rc:230 #: Merge.rc:412 #, c-format msgid "&Small" -msgstr "" +msgstr "Klein" #: Merge.rc:136 #: Merge.rc:231 #: Merge.rc:413 #, c-format msgid "&Big" -msgstr "" +msgstr "Groot" #: Merge.rc:138 #: Merge.rc:233 #: Merge.rc:415 #, c-format msgid "&Status Bar" -msgstr "&Status Balk" +msgstr "&Statusbalk" #: Merge.rc:139 #: Merge.rc:234 #: Merge.rc:416 #, c-format msgid "Ta&b Bar" -msgstr "" +msgstr "Tab-balk" #: Merge.rc:141 #: Merge.rc:237 @@ -258,35 +258,35 @@ msgstr "&Taal..." #: Merge.rc:442 #, c-format msgid "&Tools" -msgstr "" +msgstr "&Tools" #: Merge.rc:145 #: Merge.rc:261 #: Merge.rc:444 #, c-format msgid "&Filters..." -msgstr "" +msgstr "&Filters..." #: Merge.rc:146 #: Merge.rc:262 #: Merge.rc:445 #, c-format msgid "&Generate Patch..." -msgstr "" +msgstr "Patch &Genereren..." #: Merge.rc:148 #: Merge.rc:265 #: Merge.rc:448 #, c-format msgid "&Plugins" -msgstr "&Plug-ins" +msgstr "&Plugins" #: Merge.rc:150 #: Merge.rc:267 #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "&Lijst..." #: Merge.rc:152 #: Merge.rc:269 @@ -321,21 +321,21 @@ msgstr "Plug-ins he&rladen" #: Merge.rc:464 #, c-format msgid "&Debug" -msgstr "" +msgstr "&Debug" #: Merge.rc:161 #: Merge.rc:278 #: Merge.rc:466 #, c-format msgid "&Load Config..." -msgstr "" +msgstr "Configuratie &Laden..." #: Merge.rc:162 #: Merge.rc:279 #: Merge.rc:467 #, c-format msgid "&Reset Options" -msgstr "" +msgstr "Instellingen &Resetten" #: Merge.rc:164 #: Merge.rc:281 @@ -356,7 +356,7 @@ msgstr "Sluiten" #: Merge.rc:472 #, c-format msgid "Clo&se All" -msgstr "" +msgstr "Alles &Sluiten" #: Merge.rc:169 #: Merge.rc:286 @@ -377,7 +377,7 @@ msgstr "&Horizontaal verdelen" #: Merge.rc:477 #, c-format msgid "Tile &Vertically" -msgstr "&Vertikaal verdelen" +msgstr "&Verticaal verdelen" #: Merge.rc:173 #: Merge.rc:290 @@ -392,35 +392,35 @@ msgstr "&Trapsgewijs" #: Merge.rc:1913 #, c-format msgid "&Help" -msgstr "" +msgstr "&Help" #: Merge.rc:177 #: Merge.rc:294 #: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" -msgstr "" +msgstr "&WinMerge Help\tF1" #: Merge.rc:179 #: Merge.rc:296 #: Merge.rc:484 #, c-format msgid "R&elease Notes" -msgstr "" +msgstr "Uitgave-opme&rkingen" #: Merge.rc:180 #: Merge.rc:297 #: Merge.rc:485 #, c-format msgid "&Translations" -msgstr "" +msgstr "Ver&talingen" #: Merge.rc:181 #: Merge.rc:298 #: Merge.rc:486 #, c-format msgid "C&onfiguration" -msgstr "" +msgstr "C&onfiguratie" #: Merge.rc:182 #: Merge.rc:299 @@ -434,7 +434,7 @@ msgstr "A&rchiefondersteuning uitgeschakeld..." #: Merge.rc:489 #, c-format msgid "&GNU General Public License" -msgstr "" +msgstr "&GNU General Public License" #: Merge.rc:185 #: Merge.rc:302 @@ -458,7 +458,7 @@ msgstr "Re&chts alleen lezen" #: Merge.rc:203 #, c-format msgid "File En&coding" -msgstr "" +msgstr "Bestands&codering" #: Merge.rc:209 #: Merge.rc:359 @@ -469,42 +469,42 @@ msgstr "&Alles selecteren\tCtrl+A" #: Merge.rc:215 #, c-format msgid "Show &Identical Items" -msgstr "" +msgstr "Toon &Identieke Items" #: Merge.rc:216 #, c-format msgid "Show &Different Items" -msgstr "" +msgstr "Toon Verschillen&de Items" #: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" -msgstr "" +msgstr "Toon Linkse Unieke Items" #: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" -msgstr "" +msgstr "Toon Rechtse Unieke Items" #: Merge.rc:219 #, c-format msgid "Show S&kipped Items" -msgstr "" +msgstr "Toon Overgeslagen Items" #: Merge.rc:220 #, c-format msgid "S&how Binary Files" -msgstr "" +msgstr "Toon Binary Files" #: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" -msgstr "" +msgstr "Toon Verborgen Items" #: Merge.rc:235 #, c-format msgid "Compa&re Statistics" -msgstr "" +msgstr "Ve&rgelijk Statistieken" #: Merge.rc:239 #: Merge.rc:422 @@ -515,18 +515,18 @@ msgstr "Verver&sen\tF5" #: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" -msgstr "" +msgstr "Selectie Ve&rversen\tCtrl+F5" #: Merge.rc:242 #: Merge.rc:424 #, c-format msgid "&Merge" -msgstr "" +msgstr "Sa&menvoegen" #: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" -msgstr "" +msgstr "Vergelijken\tEnter" #: Merge.rc:246 #: Merge.rc:426 @@ -562,7 +562,7 @@ msgstr "&Laatste Verschil\tAlt+End" #: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" -msgstr "Kopieer naar &Rechts\tAlt+Right" +msgstr "Kopieer naar &Rechts\tAlt+Right" #: Merge.rc:254 #: Merge.rc:434 @@ -573,7 +573,7 @@ msgstr "Kopieer naar &Links\tAlt+left" #: Merge.rc:256 #, c-format msgid "&Delete\tDel" -msgstr "" +msgstr "Wissen\tDel" #: Merge.rc:260 #: Merge.rc:558 @@ -585,7 +585,7 @@ msgstr "&Kolommen aanpassen..." #: Merge.rc:446 #, c-format msgid "Generate &Report..." -msgstr "" +msgstr "&Rapport Genereren..." #: Merge.rc:317 #, c-format @@ -617,37 +617,37 @@ msgstr "&Rechts opslaan" #: Merge.rc:329 #, c-format msgid "&Print..." -msgstr "" +msgstr "&Afdrukken..." #: Merge.rc:330 #, c-format msgid "Page Se&tup" -msgstr "" +msgstr "Pagina-in&stelling" #: Merge.rc:331 #, c-format msgid "Print Previe&w" -msgstr "" +msgstr "Afdrukvoorbeeld" #: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" -msgstr "" +msgstr "&Converteer regeleindes naar" #: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" -msgstr "" +msgstr "&Windows (CRLF)" #: Merge.rc:339 #, c-format msgid "&Unix (LF)" -msgstr "" +msgstr "&Unix (LF)" #: Merge.rc:340 #, c-format msgid "&Mac (CR)" -msgstr "" +msgstr "&Mac (CR)" #: Merge.rc:343 #, c-format @@ -657,7 +657,7 @@ msgstr "Sa&menvoegmodus\tF9" #: Merge.rc:345 #, c-format msgid "&File Encoding..." -msgstr "" +msgstr "Bestandscodering..." #: Merge.rc:351 #, c-format @@ -687,7 +687,7 @@ msgstr "Pl&akken\tCtrl+V" #: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" -msgstr "" +msgstr "Selecteer Regelverschillen\tF4" #: Merge.rc:361 #, c-format @@ -702,7 +702,7 @@ msgstr "Vervan&gen...\tCtrl+H" #: Merge.rc:364 #, c-format msgid "&Scripts" -msgstr "" +msgstr "&Scripts" #: Merge.rc:366 #: Merge.rc:2752 @@ -713,73 +713,73 @@ msgstr "< Leeg >" #: Merge.rc:369 #, c-format msgid "Advanced" -msgstr "" +msgstr "Geavanceerd" #: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" -msgstr "" +msgstr "&Kopieer Met Regelnummers\tCtrl+Shift+C" #: Merge.rc:374 #, c-format msgid "&Bookmarks" -msgstr "" +msgstr "&Bladwijzers" #: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" -msgstr "" +msgstr "Bladwijzer Aan/Uit\tCtrl+F2" #: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" -msgstr "" +msgstr "Volge&nde Bladwijzer\tF2" #: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" -msgstr "" +msgstr "Vo&rige Bladwijzer\tShift+F2" #: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" -msgstr "" +msgstr "Alle Bladwijzers Wissen" #: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" -msgstr "" +msgstr "&Ga Naar...\tCtrl+G" #: Merge.rc:389 #, c-format msgid "&Zoom" -msgstr "" +msgstr "&Zoom" #: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" -msgstr "" +msgstr "Zoom &In\tCtrl++" #: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" -msgstr "" +msgstr "Zoom &Uit\tCtrl+-" #. Zoom to normal #: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" -msgstr "" +msgstr "&Normaal\tCtrl+*" #: Merge.rc:395 #, c-format msgid "Syntax Highlight" -msgstr "" +msgstr "Syntaxmarkering" #: Merge.rc:400 #, c-format msgid "&Lock Panes" -msgstr "" +msgstr "Vensters Vastzetten" #: Merge.rc:401 #, c-format @@ -789,32 +789,32 @@ msgstr "Wit&ruimte tonen" #: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" -msgstr "" +msgstr "Bekijk Regelverschillen" #: Merge.rc:403 #, c-format msgid "View Line &Numbers" -msgstr "" +msgstr "Bekijk Regel&nummers" #: Merge.rc:404 #, c-format msgid "View &Margins" -msgstr "" +msgstr "Bekijk &Marges" #: Merge.rc:405 #, c-format msgid "W&rap Lines" -msgstr "" +msgstr "Automatische Te&rugloop" #: Merge.rc:407 #, c-format msgid "Sw&ap Panes" -msgstr "" +msgstr "Wissel Vensters" #: Merge.rc:417 #, c-format msgid "Diff &Pane" -msgstr "" +msgstr "Verschilvenster" #: Merge.rc:418 #, c-format @@ -844,22 +844,22 @@ msgstr "Alles naar links kopi #: Merge.rc:457 #, c-format msgid "&Prediffer" -msgstr "" +msgstr "Voorvergelijking" #: Merge.rc:498 #, c-format msgid "Comp&are" -msgstr "" +msgstr "Vergelijken" #: Merge.rc:499 #, c-format msgid "Co&mpare Special" -msgstr "" +msgstr "Vergelijken speciaal" #: Merge.rc:501 #, c-format msgid "&XML" -msgstr "" +msgstr "&XML" #: Merge.rc:506 #, c-format @@ -923,12 +923,12 @@ msgstr "&Beide" #: Merge.rc:522 #, c-format msgid "Re&name" -msgstr "" +msgstr "&Naam wijzigen" #: Merge.rc:523 #, c-format msgid "&Hide Items" -msgstr "" +msgstr "Items Verbergen" #: Merge.rc:525 #, c-format @@ -993,7 +993,7 @@ msgstr "&Verschillen... (%1 van %2)" #: Merge.rc:554 #, c-format msgid "&Refresh" -msgstr "" +msgstr "Ve&rnieuwen" #: Merge.rc:566 #, c-format @@ -1043,12 +1043,12 @@ msgstr "Verplaatste blokken voor huidige vers&chillen" #: Merge.rc:658 #, c-format msgid "About WinMerge" -msgstr "" +msgstr "Over WinMerge" #: Merge.rc:664 #, c-format msgid "(Private Build)" -msgstr "" +msgstr "(Private Versie)" #: Merge.rc:665 #, c-format @@ -1075,12 +1075,12 @@ msgstr "Bezoek deWinMerge HomePage!" #: Merge.rc:1666 #, c-format msgid "OK" -msgstr "" +msgstr "OK" #: Merge.rc:670 #, c-format msgid "Contributors" -msgstr "" +msgstr "Medewerkers" #: Merge.rc:677 #, c-format @@ -1117,7 +1117,7 @@ msgstr "Zoe&ken" #: Merge.rc:1603 #, c-format msgid "&Filter:" -msgstr "" +msgstr "&Filter:" #: Merge.rc:693 #: Merge.rc:1605 @@ -1144,7 +1144,7 @@ msgstr "Ook &in submappen" #: Merge.rc:700 #, c-format msgid "Status:" -msgstr "" +msgstr "Status:" #: Merge.rc:702 #: Merge.rc:732 @@ -1169,7 +1169,7 @@ msgstr "Annuleren" #: Merge.rc:1339 #, c-format msgid "Help" -msgstr "" +msgstr "Help" #: Merge.rc:704 #, c-format @@ -1179,17 +1179,17 @@ msgstr "Bestanden of mappen om te vergelijken" #: Merge.rc:711 #, c-format msgid "Visual SourceSafe" -msgstr "" +msgstr "Visual SourceSafe" #: Merge.rc:716 #, c-format msgid "Database:" -msgstr "" +msgstr "Database:" #: Merge.rc:719 #, c-format msgid "Project:" -msgstr "" +msgstr "Project:" #: Merge.rc:722 #, c-format @@ -1272,39 +1272,39 @@ msgstr "&Allow only one instance to run" #: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" -msgstr "" +msgstr "Vragen bij &sluiten van meerdere vensters" #: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" -msgstr "" +msgstr "Behoud bestandstijd bij bestandsvergelijking" #: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" -msgstr "" +msgstr "Auto-Aanvullen O&penen-venster:" #: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" -msgstr "" +msgstr "Activeer meerdere vergelijkingsvensters voor" #: Merge.rc:775 #: Merge.rc:1618 #, c-format msgid "&Folder compare" -msgstr "" +msgstr "Mappen vergelijken" #: Merge.rc:777 #: Merge.rc:1620 #, c-format msgid "Fil&e compare" -msgstr "" +msgstr "B&estanden vergelijken" #: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." -msgstr "" +msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Reset-knop om alle berichtvensters terug zichtbaar te maken." #: Merge.rc:781 #, c-format @@ -1353,7 +1353,7 @@ msgstr "Reguliere &expressies" #: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" -msgstr "" +msgstr "Bij einde bestand st&oppen" #: Merge.rc:816 #, c-format @@ -1420,7 +1420,7 @@ msgstr "&Alles vervangen" #: Merge.rc:2164 #, c-format msgid "Rational ClearCase" -msgstr "" +msgstr "Rational ClearCase" #: Merge.rc:863 #, c-format @@ -1436,7 +1436,7 @@ msgstr "Opmerkingen" #: Merge.rc:871 #, c-format msgid "CheckIn after checkout" -msgstr "" +msgstr "CheckIn na checkout" #: Merge.rc:877 #, c-format @@ -1446,7 +1446,7 @@ msgstr "Regelfilters" #: Merge.rc:880 #, c-format msgid "Enable Line Filters" -msgstr "" +msgstr "Activeer Regelfilters" #: Merge.rc:883 #, c-format @@ -1456,22 +1456,22 @@ msgstr "Reguliere Expressies ( #: Merge.rc:890 #, c-format msgid "Save" -msgstr "" +msgstr "Opslaan" #: Merge.rc:891 #, c-format msgid "New" -msgstr "" +msgstr "Nieuw" #: Merge.rc:892 #, c-format msgid "Edit" -msgstr "" +msgstr "Bewerken" #: Merge.rc:893 #, c-format msgid "Remove" -msgstr "" +msgstr "Verwijderen" #: Merge.rc:898 #: Merge.rc:1924 @@ -1520,17 +1520,17 @@ msgstr "Verplaatst:" #: Merge.rc:947 #, c-format msgid "Selected Moved:" -msgstr "Geselecteerd verplaatst verschil:" +msgstr "Geselecteerd verplaatst:" #: Merge.rc:954 #, c-format msgid "Word Difference:" -msgstr "" +msgstr "Woordverschil:" #: Merge.rc:961 #, c-format msgid "Selected Word Diff:" -msgstr "" +msgstr "Geselect. Woordverschil:" #: Merge.rc:968 #: Merge.rc:1054 @@ -1562,7 +1562,7 @@ msgstr "Verwijderde bestanden naar de Prullenbak verplaat&sen" #: Merge.rc:989 #, c-format msgid "Integration" -msgstr "" +msgstr "Integratie" #: Merge.rc:990 #, c-format @@ -1577,7 +1577,7 @@ msgstr "Geavanceerd me&nu inschakelen" #: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" -msgstr "" +msgstr "Submappen standaard bijvoegen" #: Merge.rc:996 #, c-format @@ -1587,27 +1587,27 @@ msgstr "&Externe editor:" #: Merge.rc:999 #, c-format msgid "&Filter folder:" -msgstr "" +msgstr "&Filter map:" #: Merge.rc:1001 #, c-format msgid "B&rowse..." -msgstr "" +msgstr "Bladeren..." #: Merge.rc:1002 #, c-format msgid "Temporary files folder" -msgstr "" +msgstr "Map met tijdelijke bestanden" #: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" -msgstr "" +msgstr "Tijdelijke map van het systeem" #: Merge.rc:1005 #, c-format msgid "C&ustom folder:" -msgstr "" +msgstr "Eigen map:" #: Merge.rc:1008 #: Merge.rc:1024 @@ -1658,7 +1658,7 @@ msgstr "St&ijl:" #: Merge.rc:1036 #, c-format msgid "&Context:" -msgstr "" +msgstr "&Context:" #: Merge.rc:1039 #, c-format @@ -1708,12 +1708,12 @@ msgstr "Kolommen weergeven" #: Merge.rc:1080 #, c-format msgid "Move &Up" -msgstr "" +msgstr "Verplaats Omhoog" #: Merge.rc:1081 #, c-format msgid "Move &Down" -msgstr "" +msgstr "Verplaats Omlaag" #: Merge.rc:1091 #, c-format @@ -1743,7 +1743,7 @@ msgstr "Beschrijving:" #: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" -msgstr "" +msgstr "Voortgang Mapvergelijking" #: Merge.rc:1117 #: Merge.rc:1874 @@ -1754,17 +1754,17 @@ msgstr "Stoppen" #: Merge.rc:1122 #, c-format msgid "Comparing items..." -msgstr "" +msgstr "Items vergelijken..." #: Merge.rc:1123 #, c-format msgid "Items compared:" -msgstr "" +msgstr "Items vergeleken:" #: Merge.rc:1124 #, c-format msgid "Items total:" -msgstr "" +msgstr "Totaal aantal items:" #: Merge.rc:1130 #, c-format @@ -1840,7 +1840,7 @@ msgstr "N&iet hoofdlettergevoelig" #: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" -msgstr "" +msgstr "Negee&r regeleindeteken-verschillen (Windows/Unix/Mac)" #: Merge.rc:1168 #, c-format @@ -1850,12 +1850,12 @@ msgstr "Detectie verplaatste blokken i&nschakelen" #: Merge.rc:1170 #, c-format msgid "&Match similar lines" -msgstr "" +msgstr "Laat gelijke lijnen overeenko&men" #: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" -msgstr "" +msgstr "Negeer tijdsverschillen kleiner dan 3 sec&onden" #: Merge.rc:1175 #, c-format @@ -1865,18 +1865,18 @@ msgstr "Met&hode bestandsvergelijking:" #: Merge.rc:1178 #, c-format msgid "S&top after first difference" -msgstr "" +msgstr "S&top na eerste verschil" #: Merge.rc:1181 #, c-format msgid "Filter Comments" -msgstr "" +msgstr "Filter-commentaar" #: Merge.rc:1188 #: Merge.rc:1923 #, c-format msgid "Editor" -msgstr "" +msgstr "Editor" #: Merge.rc:1191 #, c-format @@ -1916,22 +1916,22 @@ msgstr "&Spaties invoegen" #: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" -msgstr "" +msgstr "Kleur van Regelverschillen" #: Merge.rc:1207 #, c-format msgid "View line differences" -msgstr "" +msgstr "Bekijk regelverschillen" #: Merge.rc:1209 #, c-format msgid "&Character level" -msgstr "" +msgstr "Tekenniveau" #: Merge.rc:1211 #, c-format msgid "&Word-level:" -msgstr "" +msgstr "&Woordniveau:" #: Merge.rc:1226 #, c-format @@ -1941,17 +1941,17 @@ msgstr "Bestandsfilters" #: Merge.rc:1232 #, c-format msgid "Test" -msgstr "" +msgstr "Test" #: Merge.rc:1233 #, c-format msgid "Install..." -msgstr "" +msgstr "Installeren..." #: Merge.rc:1234 #, c-format msgid "New..." -msgstr "" +msgstr "Nieuw..." #: Merge.rc:1235 #, c-format @@ -1961,7 +1961,7 @@ msgstr "Bewerken..." #: Merge.rc:1236 #, c-format msgid "Delete..." -msgstr "" +msgstr "Wissen" #: Merge.rc:1242 #, c-format @@ -2001,7 +2001,7 @@ msgstr "Wijzigingen nege&ren" #: Merge.rc:1259 #, c-format msgid "Discard All" -msgstr "" +msgstr "Alles Negeren" #: Merge.rc:1266 #: Merge.rc:1514 @@ -2013,12 +2013,12 @@ msgstr "Tekenset" #: Merge.rc:1269 #, c-format msgid "Default Codepage" -msgstr "" +msgstr "Standaard Codetabel" #: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" -msgstr "" +msgstr "Selecteer de standaard veronderstelde codetabel bij laden van niet-Unicodebestanden:" #: Merge.rc:1272 #, c-format @@ -2027,7 +2027,7 @@ msgid "" "need to restart session" msgstr "" "Tekenset detecteren voor deze bestanden: .html, .rc \n" -"herstarten sessie noodzakelijk" +"Herstarten sessie noodzakelijk" #: Merge.rc:1275 #, c-format @@ -2037,7 +2037,7 @@ msgstr "Tekenset van systeem" #: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" -msgstr "Volgens WinMerge gebruikersinterface" +msgstr "Volgens WinMerge-gebruikersinterface" #: Merge.rc:1279 #, c-format @@ -2047,12 +2047,12 @@ msgstr "Aangepaste tekenset:" #: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" -msgstr "" +msgstr "WinMerge - Archiefondersteuning uitgeschakeld" #: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" -msgstr "" +msgstr "Kon geen 7-zipversie detecteren (niet genstalleerd?)" #: Merge.rc:1293 #, c-format @@ -2060,11 +2060,13 @@ msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" "essential components to be copied to the program directory for standalone operation." msgstr "" +"Archiefondersteuning vereist dat 7-zip 3.11 of later genstalleerd is op uw pc, of dat de\n" +"essentile onderdelen gekopieerd worden naar de programmamap voor standalone-werking." #: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." -msgstr "" +msgstr "Er moet ook een overeenkomstige interface-plugin (Merge7z*.dll) aanwezig zijn op het pad." #: Merge.rc:1297 #, c-format @@ -2072,11 +2074,13 @@ msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" "versions become available." msgstr "" +"Gebruik a.u.b. de hieronder aangeraden versie van 7-zip totdat interface-plugins voor\n" +"latere versies beschikbaar worden." #: Merge.rc:1299 #, c-format msgid "Version" -msgstr "" +msgstr "Versie" #: Merge.rc:1301 #, c-format @@ -2084,128 +2088,134 @@ msgid "" "Plugin required\n" "(dllbuild %04u)" msgstr "" +"Plugin nodig\n" +"(dllbuild %04u)" #: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" -msgstr "" +msgstr "Aangeraden versie van 7-Zip:" #: Merge.rc:1306 #: Merge.rc:1309 #, c-format msgid "present" -msgstr "" +msgstr "aanwezig" #: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" -msgstr "" +msgstr "Merge7z000U.dll" #: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" -msgstr "" +msgstr "7-Zip software genstalleerd op deze pc:" #: Merge.rc:1312 #: Merge.rc:1317 #, c-format msgid "none" -msgstr "" +msgstr "geen" #: Merge.rc:1314 #, c-format msgid "missing" -msgstr "" +msgstr "ontbreekt" #: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" -msgstr "" +msgstr "7-Zip-onderdelen voor standalone-werking:" #: Merge.rc:1319 #, c-format msgid "outdated" -msgstr "" +msgstr "verouderd" #: Merge.rc:1320 #, c-format msgid "Plugins on path:" -msgstr "" +msgstr "Plugins op pad:" #: Merge.rc:1321 #, c-format -msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" +msgid "" +"Don't display this &message again.\n" +"(You can always recall this message from the Help menu.)" msgstr "" +"Toon dit bericht niet meer.\n" +"(U kan dit bericht altijd terugroepen van het Help-menu.)" #: Merge.rc:1325 #, c-format msgid "Plugin Download" -msgstr "" +msgstr "Plugin-download" #: Merge.rc:1334 #, c-format msgid "Options" -msgstr "" +msgstr "Opties" #: Merge.rc:1345 #, c-format msgid " Categories" -msgstr "" +msgstr " Categorien" #: Merge.rc:1347 #, c-format msgid "Import..." -msgstr "" +msgstr "Importeren..." #: Merge.rc:1348 #, c-format msgid "Export..." -msgstr "" +msgstr "Exporteren..." #: Merge.rc:1356 #, c-format msgid "Keywords:" -msgstr "" +msgstr "Sleutelwoorden:" #: Merge.rc:1357 #, c-format msgid "Function names:" -msgstr "" +msgstr "Functienamen" #: Merge.rc:1358 #, c-format msgid "Comments:" -msgstr "" +msgstr "Opmerkingen:" #: Merge.rc:1359 #, c-format msgid "Numbers:" -msgstr "" +msgstr "Nummers:" #: Merge.rc:1360 #, c-format msgid "Operators:" -msgstr "" +msgstr "Operators:" #: Merge.rc:1361 #, c-format msgid "Strings:" -msgstr "" +msgstr "Strings:" #: Merge.rc:1362 #, c-format msgid "Preprocessor:" -msgstr "" +msgstr "Preprocessor:" #: Merge.rc:1363 #, c-format msgid "User 1:" -msgstr "" +msgstr "Gebruiker 1:" #: Merge.rc:1364 #, c-format msgid "User 2:" -msgstr "" +msgstr "Gebruiker 2:" #: Merge.rc:1369 #: Merge.rc:1374 @@ -2218,7 +2228,7 @@ msgstr "" #: Merge.rc:1409 #, c-format msgid "Bold" -msgstr "" +msgstr "Vet" #: Merge.rc:1417 #, c-format @@ -2228,7 +2238,7 @@ msgstr "Directory Compare Report" #: Merge.rc:1420 #, c-format msgid "Report &File:" -msgstr "" +msgstr "Rapporteer &Bestand" #: Merge.rc:1423 #: Merge.rc:1597 @@ -2236,88 +2246,88 @@ msgstr "" #: Merge.rc:1628 #, c-format msgid "Browse..." -msgstr "" +msgstr "Bladeren..." #: Merge.rc:1424 #, c-format msgid "&Style:" -msgstr "" +msgstr "&Stijl:" #: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" -msgstr "" +msgstr "Naar Klembord Kopiren" #: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" -msgstr "" +msgstr "Gedeelde of Persoonlijke Filter" #: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" -msgstr "" +msgstr "Welk type filter wilt u maken?" #: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" -msgstr "" +msgstr "Gedeelde Filter (voor alle gebruikers op deze pc)" #: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" -msgstr "" +msgstr "Private Filter (alleen voor huidige gebruiker)" #: Merge.rc:1450 #: Merge.rc:1930 #, c-format msgid "Archive Support" -msgstr "" +msgstr "Archiefondersteuning" #: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" -msgstr "" +msgstr "Archiefondersteuning vereist dat de 7-Zip-plugin genstalleerd is:" #: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" -msgstr "" +msgstr "Download de 7-Zip-plugin" #: Merge.rc:1456 #, c-format msgid "&Enable archive file support" -msgstr "" +msgstr "Activeer archiefbestand-ondersteuning" #: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" -msgstr "" +msgstr "Gebr&uik stand-alone 7-Zip indien beschikbaar" #: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" -msgstr "" +msgstr "Gebruik lokale 7-Zip van WinMerge-map" #: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" -msgstr "" +msgstr "&Detecteer archieftype via bestandssignatuur" #: Merge.rc:1471 #, c-format msgid "Compare Statistics" -msgstr "" +msgstr "Vergelijkingsstatistieken" #: Merge.rc:1474 #, c-format msgid "Folders:" -msgstr "" +msgstr "Mappen:" #: Merge.rc:1475 #, c-format msgid "Files:" -msgstr "" +msgstr "Bestanden:" #: Merge.rc:1476 #: Merge.rc:2310 @@ -2328,28 +2338,28 @@ msgstr "Verschillend" #: Merge.rc:1477 #, c-format msgid "Text:" -msgstr "" +msgstr "Tekst:" #: Merge.rc:1480 #: Merge.rc:1499 #, c-format msgid "Binary:" -msgstr "" +msgstr "Binary:" #: Merge.rc:1483 #, c-format msgid "Unique" -msgstr "" +msgstr "Uniek" #: Merge.rc:1484 #, c-format msgid "Left:" -msgstr "" +msgstr "Links:" #: Merge.rc:1489 #, c-format msgid "Right:" -msgstr "" +msgstr "Rechts:" #: Merge.rc:1494 #: Merge.rc:2305 @@ -2360,54 +2370,54 @@ msgstr "Identiek" #: Merge.rc:1503 #, c-format msgid "Total:" -msgstr "" +msgstr "Totaal:" #: Merge.rc:1508 #, c-format msgid "Close" -msgstr "" +msgstr "Sluiten" #: Merge.rc:1517 #, c-format msgid "Affects" -msgstr "" +msgstr "Aanpassingen" #: Merge.rc:1520 #: Merge.rc:1523 #, c-format msgid "(Affects)" -msgstr "" +msgstr "(Aanpassingen)" #: Merge.rc:1524 #, c-format msgid "Select Codepage for" -msgstr "" +msgstr "Selecteer Codetabel voor" #: Merge.rc:1525 #, c-format msgid "&File Loading:" -msgstr "" +msgstr "Bestanden Laden:" #: Merge.rc:1527 #: Merge.rc:1530 #, c-format msgid "..." -msgstr "" +msgstr "..." #: Merge.rc:1528 #, c-format msgid "File &Saving:" -msgstr "" +msgstr "Bestanden Op&slaan:" #: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" -msgstr "" +msgstr "Gebr&uik dezelfde codetabel voor beide" #: Merge.rc:1534 #, c-format msgid "&Apply" -msgstr "" +msgstr "Toepassen" #: Merge.rc:1535 #: Merge.rc:1896 @@ -2418,169 +2428,169 @@ msgstr "Annuleren" #: Merge.rc:1540 #, c-format msgid "Test Filter" -msgstr "" +msgstr "Test Filter" #: Merge.rc:1543 #, c-format msgid "Testing filter ..." -msgstr "" +msgstr "Filter testen..." #: Merge.rc:1545 #, c-format msgid "&Enter text to test:" -msgstr "" +msgstr "G&eef tekst op om te testen:" #: Merge.rc:1547 #, c-format msgid "&Folder Name" -msgstr "" +msgstr "Mapnaam" #: Merge.rc:1549 #, c-format msgid "Result:" -msgstr "" +msgstr "Resultaat:" #: Merge.rc:1553 #, c-format msgid "&Test" -msgstr "" +msgstr "&Test" #: Merge.rc:1554 #, c-format msgid "&Close" -msgstr "" +msgstr "Sluiten" #: Merge.rc:1562 #, c-format msgid "&Use customized text colors" -msgstr "" +msgstr "Gebr&uik aangepaste tekstkleuren" #: Merge.rc:1565 #, c-format msgid "Custom text colors" -msgstr "" +msgstr "Aangepaste tekstkleuren" #: Merge.rc:1567 #, c-format msgid "Whitespace:" -msgstr "" +msgstr "Witruimte:" #: Merge.rc:1568 #, c-format msgid "Regular text:" -msgstr "" +msgstr "Gewone tekst:" #: Merge.rc:1569 #, c-format msgid "Selection:" -msgstr "" +msgstr "Selectie:" #: Merge.rc:1592 #, c-format msgid "Paths" -msgstr "" +msgstr "Paden" #: Merge.rc:1598 #, c-format msgid "R&ead-only" -msgstr "" +msgstr "All&een-lezen" #: Merge.rc:1602 #, c-format msgid "Re&ad-only" -msgstr "" +msgstr "&Alleen-lezen" #: Merge.rc:1608 #, c-format msgid "Open..." -msgstr "" +msgstr "Openen..." #: Merge.rc:1609 #, c-format msgid "Save..." -msgstr "" +msgstr "Opslaan..." #: Merge.rc:1614 #: Merge.rc:1931 #, c-format msgid "Backup Files" -msgstr "" +msgstr "Backupbestanden" #: Merge.rc:1617 #, c-format msgid "Create backup files in:" -msgstr "" +msgstr "Maak backupbestanden in:" #: Merge.rc:1622 #, c-format msgid "Create backup files into:" -msgstr "" +msgstr "Maak backupbestanden binnen:" #: Merge.rc:1623 #, c-format msgid "&Original file's folder" -msgstr "" +msgstr "Map van &origineel bestand" #: Merge.rc:1625 #, c-format msgid "&Global backup folder:" -msgstr "" +msgstr "&Globale backupmap:" #: Merge.rc:1629 #, c-format msgid "Backup filename:" -msgstr "" +msgstr "Bestandsnaam backup:" #: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" -msgstr "" +msgstr "Voeg .b&ak-extensie toe" #: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" -msgstr "" +msgstr "Voeg tijdstem&pel toe" #: Merge.rc:1639 #: Merge.rc:2220 #, c-format msgid "Confirm Copy" -msgstr "" +msgstr "Bevestig Kopiren" #: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" -msgstr "" +msgstr "Bent u zeker dat u XXX items wilt kopiren?" #: Merge.rc:1645 #, c-format msgid "From left" -msgstr "" +msgstr "Van links" #: Merge.rc:1648 #, c-format msgid "To right" -msgstr "" +msgstr "Naar rechts" #: Merge.rc:1651 #, c-format msgid "Yes" -msgstr "" +msgstr "Ja" #: Merge.rc:1652 #, c-format msgid "No" -msgstr "" +msgstr "Nee" #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "Plugins" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "Plugins activeren" #. StringFileInfo.Block #: Merge.rc:1691 @@ -2602,32 +2612,32 @@ msgstr "Gereed" #: Merge.rc:1728 #, c-format msgid "EXT" -msgstr "" +msgstr "UIT" #: Merge.rc:1729 #, c-format msgid "CAP" -msgstr "" +msgstr "CAP" #: Merge.rc:1730 #, c-format msgid "NUM" -msgstr "" +msgstr "NUM" #: Merge.rc:1731 #, c-format msgid "SCRL" -msgstr "" +msgstr "SCRL" #: Merge.rc:1732 #, c-format msgid "OVR" -msgstr "" +msgstr "OVR" #: Merge.rc:1733 #, c-format msgid "REC" -msgstr "" +msgstr "OPN" #: Merge.rc:1739 #, c-format @@ -2645,7 +2655,7 @@ msgid "" "Open (Ctrl+O)" msgstr "" "Een bestaand document openen.\n" -"Openen" +"Openen (Ctrl+O)" #: Merge.rc:1741 #, c-format @@ -2707,13 +2717,13 @@ msgid "" "Display full pages\n" "Print Preview" msgstr "" -"Afdrukvoorbeeld.\n" -"Afdruk voorbeeld" +"Toon volledige pagina's\n" +"Afdrukvoorbeeld" #: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" -msgstr "" +msgstr "Maak alle verborgen items terug zichtbaar" #: Merge.rc:1758 #, c-format @@ -2721,31 +2731,33 @@ msgid "" "Open project file\n" "Project file (Ctrl+J)" msgstr "" +"Open projectbestand\n" +"Projectbestand (Ctrl+J)" #: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" -msgstr "" +msgstr "Onbekende fout bij poging tot openen van projectbestand" #: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" -msgstr "" +msgstr "Onbekende fout bij poging tot opslaan van projectbestand" #: Merge.rc:1761 #, c-format msgid "Project File" -msgstr "" +msgstr "Projectbestand" #: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." -msgstr "" +msgstr "Projectbestand met succes geladen." #: Merge.rc:1763 #, c-format msgid "Project file successfully saved." -msgstr "" +msgstr "Projectbestand met succes opgeslagen." #: Merge.rc:1764 #, c-format @@ -2753,6 +2765,8 @@ msgid "" "Save current paths and options to project file\n" "Save Project File" msgstr "" +"Huidige paden en opties opslaan naar projectbestand\n" +"Projectbestand Opslaan" #: Merge.rc:1769 #, c-format @@ -2799,7 +2813,7 @@ msgid "" "Next Pane" msgstr "" "Ga naar het volgende venster deel.\n" -"Volgende deel" +"Volgende Venster" #: Merge.rc:1797 #, c-format @@ -2808,7 +2822,7 @@ msgid "" "Previous Pane" msgstr "" "Ga naar het vorige venster deel.\n" -"Vorige deel" +"Vorige Venster" #: Merge.rc:1803 #, c-format @@ -2942,11 +2956,17 @@ msgid "" "Show or hide the tab bar\n" "Toggle TabBar" msgstr "" +"Toon of verberg de tab-balk\n" +"Tab-balk aan/uit" #: Merge.rc:1828 #, c-format -msgid "Automatically resize panes\nLock Panes" +msgid "" +"Automatically resize panes\n" +"Lock Panes" msgstr "" +"Stel venstergrootte automatisch in\n" +"Vensters Vastzetten" #: Merge.rc:1834 #, c-format @@ -3004,18 +3024,46 @@ msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -"Afdrukvoorbeeld sluiten.\n" +"Afdrukvoorbeeld sluiten\n" "Afsluiten voorbeeld" #: Merge.rc:1860 #, c-format -msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" +msgid "" +"\n" +"FileCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FileCompare\n" +"WinMerge File Compare" msgstr "" - -#: Merge.rc:1861 +"\n" +"BestandsVergelijking\n" +"\n" +"\n" +"\n" +"WinMerge.BestandsVergelijking\n" +"WinMerge BestandsVergelijking" + +#: Merge.rc:1861 #, c-format -msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" +msgid "" +"\n" +"FolderCompare\n" +"\n" +"\n" +"\n" +"WinMerge.FolderCompare\n" +"WinMerge Folder Compare" msgstr "" +"\n" +"MapVergelijking\n" +"\n" +"\n" +"\n" +"WinMerge.MapVergelijking\n" +"WinMerge MapVergelijking" #: Merge.rc:1868 #, c-format @@ -3035,13 +3083,17 @@ msgstr "Klik rechts op het pad om het te kopi #: Merge.rc:1888 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" +"Ontwikkelaars:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" #: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -msgstr "" +msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is gratis software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details." #: Merge.rc:1895 #, c-format @@ -3116,42 +3168,42 @@ msgstr "Deze &vraag niet meer stellen." #: Merge.rc:1925 #, c-format msgid "Syntax colors" -msgstr "" +msgstr "Syntaxkleuren" #: Merge.rc:1926 #, c-format msgid "Text Colors" -msgstr "" +msgstr "Tekstkleuren" #: Merge.rc:1928 #, c-format msgid "Version Control" -msgstr "" +msgstr "Versiebeheer" #: Merge.rc:1938 #, c-format msgid "To:" -msgstr "" +msgstr "Naar:" #: Merge.rc:1939 #, c-format msgid "From left:" -msgstr "" +msgstr "Van links:" #: Merge.rc:1940 #, c-format msgid "To left:" -msgstr "" +msgstr "Naar links:" #: Merge.rc:1941 #, c-format msgid "From right:" -msgstr "" +msgstr "Van rechts:" #: Merge.rc:1942 #, c-format msgid "To right:" -msgstr "" +msgstr "Naar rechts:" #: Merge.rc:1948 #, c-format @@ -3161,12 +3213,12 @@ msgstr "Versie %1 - Nederlands" #: Merge.rc:1949 #, c-format msgid "Unicode" -msgstr "" +msgstr "Unicode" #: Merge.rc:1955 #, c-format msgid "Options (%1)" -msgstr "Eigenschappen" +msgstr "Opties (%1)" #: Merge.rc:1956 #, c-format @@ -3181,7 +3233,7 @@ msgstr "De huidige bestandsvergelijkingssessie is gewijzigd. Sommige instellinge #: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." -msgstr "De geselecteerde wijziging van het lettertype wordt niet verwerkt in de openstaande vensters." +msgstr "De geselecteerde wijziging van het lettertype wordt niet toegepast in de openstaande vensters." #: Merge.rc:1960 #, c-format @@ -3190,6 +3242,9 @@ msgid "" "\n" "Please use values 1 - %1." msgstr "" +"Waarde in Tabgrootte-veld is niet binnen acceptatiebereik van WinMerge\n" +"\n" +"Gebruik waarden 1 - %1." #: Merge.rc:1962 #, c-format @@ -3198,6 +3253,9 @@ msgid "" "\n" "Please re-start WinMerge after the reset." msgstr "" +"Bent u zeker dat u alle WinMerge-opties wilt herstellen naar de standaardwaarden?\n" +"\n" +"Herstart WinMerge na herstellen." #: Merge.rc:1968 #, c-format @@ -3217,72 +3275,72 @@ msgstr "Alle bestanden (*.*)|*.*||" #: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" -msgstr "" +msgstr "WinMerge Projectbestanden (*.WinMerge)|*.WinMerge||" #: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" -msgstr "" +msgstr "Optie-bestanden (*.ini)|*.ini|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -msgstr "" +msgstr "Tekstbestanden (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -msgstr "" +msgstr "HTML-bestanden (*.htm,*.html)|*.htm;*.html|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" -msgstr "" +msgstr "XML-bestanden (*.xml)|*.xml|Alle Bestanden (*.*)|*.*||" #: Merge.rc:1987 #, c-format msgid "UTF-8" -msgstr "" +msgstr "UTF-8" #: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" -msgstr "" +msgstr "UTF-8 (B)" #: Merge.rc:1989 #, c-format msgid "UCS-2 LE" -msgstr "" +msgstr "UCS-2 LE" #: Merge.rc:1990 #, c-format msgid "UCS-2 BE" -msgstr "" +msgstr "UCS-2 BE" #: Merge.rc:1996 #, c-format msgid "Full Contents" -msgstr "" +msgstr "Volledige Inhoud" #: Merge.rc:1997 #, c-format msgid "Quick Contents" -msgstr "" +msgstr "Snelle Inhoud" #: Merge.rc:1998 #, c-format msgid "Modified Date" -msgstr "Laatst veranderd datum" +msgstr "Datum Laatste Wijziging" #: Merge.rc:1999 #, c-format msgid "Modified Date and Size" -msgstr "" +msgstr "Aangepaste Datum en Grootte" #: Merge.rc:2000 #, c-format msgid "Size" -msgstr "" +msgstr "Grootte" #: Merge.rc:2006 #: Merge.rc:2616 @@ -3293,33 +3351,33 @@ msgstr "Naam" #: Merge.rc:2007 #, c-format msgid "Location" -msgstr "Lokatie" +msgstr "Locatie" #: Merge.rc:2008 #, c-format msgid "Filters" -msgstr "" +msgstr "Filters" #: Merge.rc:2009 #, c-format msgid "[F] " -msgstr "" +msgstr "[F] " #: Merge.rc:2010 #: Merge.rc:2618 #, c-format msgid "Description" -msgstr "" +msgstr "Beschrijving" #: Merge.rc:2011 #, c-format msgid "Select filename for new filter" -msgstr "" +msgstr "Selecteer bestandsnaam voor nieuwe filter" #: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" -msgstr "" +msgstr "Bestandsfilters (*.flt)|*.flt|Alle Bestanden (*.*)|*.*||" #: Merge.rc:2014 #, c-format @@ -3329,6 +3387,10 @@ msgid "" "Please copy file %1 to WinMerge/Filters -folder:\n" "%2." msgstr "" +"Kan bestandsfilter-sjabloon niet vinden!\n" +"\n" +"Kopieer bestand %1 naar map WinMerge/Filters:\n" +"%2." #: Merge.rc:2016 #, c-format @@ -3338,6 +3400,10 @@ msgid "" "\n" "Please make sure the folder exists and is writable." msgstr "" +"Kan filtersjabloonbestand niet kopiren naar filtermap:\n" +"%1\n" +"\n" +"Ga na of de map bestaat en schrijfbaar is." #: Merge.rc:2018 #, c-format @@ -3346,6 +3412,9 @@ msgid "" "\n" "Please select filter folder in Options/System." msgstr "" +"Filterbestandsmap van gebruiker is niet gedefinieerd!\n" +"\n" +"Selecteer filtermap in Opties/Systeem." #: Merge.rc:2020 #, c-format @@ -3355,11 +3424,15 @@ msgid "" "\n" "Maybe the file is read-only?" msgstr "" +"Wissen van filterbestand mislukt:\n" +"%1\n" +"\n" +"Misschien is het bestand alleen-lezen?" #: Merge.rc:2021 #, c-format msgid "Locate filter file to install" -msgstr "" +msgstr "Localiseer te installeren filterbestand" #: Merge.rc:2023 #, c-format @@ -3368,21 +3441,30 @@ msgid "" "\n" "Could not copy new filter file to filter folder." msgstr "" +"Installeren filterbestand mislukt.\n" +"\n" +"Kon nieuwe filter niet kopiren naar filtermap." #: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" -msgstr "" +msgstr "Filterbestand bestaat reeds. Bestaande filter overschrijven?" #: Merge.rc:2031 #, c-format msgid "Regular expression" -msgstr "" +msgstr "Reguliere expressie" #: Merge.rc:2037 #, c-format -msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" +"Filters werden gepdatet. Wilt u alle geopende mapvergelijkingen vernieuwen?\n" +"\n" +"Indien u dit nu niet wilt doen, kan u Nee selecteren en de vergelijkingen later vernieuwen." #: Merge.rc:2043 #, c-format @@ -3417,12 +3499,12 @@ msgstr "Geen titel rechts" #: Merge.rc:2054 #, c-format msgid "Theirs File" -msgstr "" +msgstr "Hun Bestand" #: Merge.rc:2055 #, c-format msgid "Mine File" -msgstr "" +msgstr "Mijn Bestand" #: Merge.rc:2061 #, c-format @@ -3472,17 +3554,17 @@ msgstr "Bezig met verplaatsen van bestanden..." #: Merge.rc:2070 #, c-format msgid "Creating the report..." -msgstr "" +msgstr "Rapport genereren..." #: Merge.rc:2071 #, c-format msgid "Undoing the last operation..." -msgstr "" +msgstr "Laatste operatie ongedaan maken..." #: Merge.rc:2072 #, c-format msgid "Redoing the previous operation..." -msgstr "" +msgstr "Vorige operatie opnieuw doen..." #: Merge.rc:2078 #, c-format @@ -3528,12 +3610,12 @@ msgstr "AL" #: Merge.rc:2091 #, c-format msgid "Item %1 of %2" -msgstr "" +msgstr "Item %1 van %2" #: Merge.rc:2092 #, c-format msgid "Items: %1" -msgstr "" +msgstr "Items: %1" #: Merge.rc:2098 #, c-format @@ -3601,12 +3683,18 @@ msgstr "" #: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." -msgstr "" +msgstr "Analyseren van conflictbestand mislukt." #: Merge.rc:2115 #, c-format -msgid "The file\n%1\nis not a conflict file." +msgid "" +"The file\n" +"%1\n" +"is not a conflict file." msgstr "" +"Bestand\n" +"%1\n" +"is geen conflictbestand." #: Merge.rc:2121 #, c-format @@ -3641,6 +3729,10 @@ msgid "" "\n" "Continue anyway?" msgstr "" +"Kon geen backup maken van origineel bestand:\n" +"%1\n" +"\n" +"Toch doorgaan?" #: Merge.rc:2128 #, c-format @@ -3743,6 +3835,9 @@ msgid "" "\n" "Refresh documents before continuing." msgstr "" +"Kan geen verschillen samenvoegen wanneer documenten niet gelijklopend zijn.\n" +"\n" +"Vernieuw documenten voordat u doorgaat." #: Merge.rc:2147 #, c-format @@ -3786,6 +3881,9 @@ msgid "" " Please, check config spec of used view.\n" " Undo checkout operation?" msgstr "" +"Versie-systeem gaf een fout bij een poging tot een bestands-checkin.\n" +" Controleer configuratie-specificaties van de gebruikte weergave.\n" +" Checkout ongedaan maken?" #: Merge.rc:2155 #, c-format @@ -3793,6 +3891,8 @@ msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" " Please, check config spec of used view. " msgstr "" +"Versie-systeem gaf een fout bij een poging tot het ongedaan maken van een bestands-checkout.\n" +" Controleer configuratie-specificaties van de gebruikte weergave." #: Merge.rc:2161 #: Merge.rc:2600 @@ -3813,24 +3913,24 @@ msgstr "Visual SourceSafe (5.0 en hoger)" #: Merge.rc:2165 #, c-format msgid "Break at whitespace" -msgstr "" +msgstr "Afbreken bij witruimte" #: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" -msgstr "" +msgstr "Afbreken bij witruimte of interpunctie" #: Merge.rc:2172 #: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" -msgstr "" +msgstr "Kopieer geselecteerd item naar genoemde map" #: Merge.rc:2173 #: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" -msgstr "" +msgstr "Kopieer geselecteerd item naar aangepaste map" #: Merge.rc:2176 #, c-format @@ -3850,12 +3950,12 @@ msgstr "Geselecteerde item(s) aan beide kanten verwijderen" #: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" -msgstr "" +msgstr "Verberg geselecteerd(e) item(s) (on-the-fly-filter)" #: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" -msgstr "" +msgstr "Herbenoem geselecteerd item aan beide kanten" #: Merge.rc:2181 #, c-format @@ -3929,7 +4029,7 @@ msgstr "Rechts (%1 of %2)" #: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" -msgstr "" +msgstr "Beide (%1 of %2)" #: Merge.rc:2200 #, c-format @@ -3939,22 +4039,22 @@ msgstr "Selecteer doelmap" #: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" -msgstr "" +msgstr "Linkerkant - selecteer doelmap:" #: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" -msgstr "" +msgstr "Rechterkant - selecteer doelmap:" #: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" -msgstr "" +msgstr "(%1 Bestanden Aangepast)" #: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" -msgstr "" +msgstr "(%1 van %2 Bestanden Aangepast)" #: Merge.rc:2214 #, c-format @@ -3971,12 +4071,12 @@ msgstr "" #: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" -msgstr "" +msgstr "Bent u zeker dat u het volgende wilt kopiren:" #: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" -msgstr "" +msgstr "Bent u zeker dat u %d items wilt kopiren:" #: Merge.rc:2217 #, c-format @@ -3989,21 +4089,28 @@ msgid "" "\n" "Please refresh the compare." msgstr "" +"Bewerking afgebroken!\n" +"\n" +"Inhoud van de map op de schijven is veranderd, pad\n" +"%1\n" +"werd niet gevonden.\n" +"\n" +"Vernieuw a.u.b. de vergelijking." #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "Bent u zeker dat u wilt verplaatsen:" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "Bent u zeker dat u %d items wilt verplaatsen:" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "Bevestig Verplaatsen" #: Merge.rc:2227 #, c-format @@ -4038,12 +4145,12 @@ msgstr "Rechter bestand openen met..." #: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" -msgstr "" +msgstr "Uitvoeren externe editor mislukt: %1" #: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" -msgstr "" +msgstr "Onbekende extensie bij externe editor: %1" #: Merge.rc:2235 #, c-format @@ -4143,12 +4250,12 @@ msgstr "Grootte rechts" #: Merge.rc:2266 #, c-format msgid "Right Size (Short)" -msgstr "" +msgstr "Rechtse Grootte (Kort)" #: Merge.rc:2267 #, c-format msgid "Left Size (Short)" -msgstr "" +msgstr "Linkse Grootte (Kort)" #: Merge.rc:2273 #, c-format @@ -4193,12 +4300,12 @@ msgstr "Attributen rechts" #: Merge.rc:2281 #, c-format msgid "Left EOL" -msgstr "" +msgstr "Links regeleinde" #: Merge.rc:2282 #, c-format msgid "Right EOL" -msgstr "" +msgstr "Rechts regeleinde" #: Merge.rc:2288 #, c-format @@ -4213,12 +4320,12 @@ msgstr "Tekenset rechts" #: Merge.rc:2290 #, c-format msgid "Ignored Diff." -msgstr "" +msgstr "Genegeerde Versch." #: Merge.rc:2291 #, c-format msgid "Differences" -msgstr "" +msgstr "Verschillen" #: Merge.rc:2292 #: Merge.rc:2596 @@ -4234,7 +4341,7 @@ msgstr "Kan bestanden niet vergelijken" #: Merge.rc:2299 #, c-format msgid "Item aborted" -msgstr "" +msgstr "Item afgebroken" #: Merge.rc:2300 #, c-format @@ -4249,12 +4356,12 @@ msgstr "Map overgeslagen" #: Merge.rc:2302 #, c-format msgid "Left only: %1" -msgstr "" +msgstr "Alleen links: %1" #: Merge.rc:2303 #, c-format msgid "Right only: %1" -msgstr "" +msgstr "Alleen rechts: %1" #: Merge.rc:2304 #, c-format @@ -4284,7 +4391,7 @@ msgstr "Alleen rechts" #: Merge.rc:2311 #, c-format msgid "Error" -msgstr "" +msgstr "Fout" #: Merge.rc:2317 #, c-format @@ -4344,12 +4451,12 @@ msgstr "Bestandsgrootte in bytes voor rechter zijde." #: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." -msgstr "" +msgstr "Linker bestandsgrootte ingekort." #: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." -msgstr "" +msgstr "Rechter bestandsgrootte ingekort." #: Merge.rc:2340 #, c-format @@ -4394,12 +4501,12 @@ msgstr "Attributen rechter zijde." #: Merge.rc:2348 #, c-format msgid "Left side file EOL type" -msgstr "" +msgstr "Type regeleinde linker bestand" #: Merge.rc:2349 #, c-format msgid "Right side file EOL type" -msgstr "" +msgstr "Type regeleinde rechter bestand" #: Merge.rc:2355 #, c-format @@ -4414,12 +4521,12 @@ msgstr "Tekenset rechter zijde." #: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." -msgstr "" +msgstr "Aantal genegeerde verschillen in bestand. Deze verschillen worden genegeerd door WinMerge en kunnen niet samengevoegd worden." #: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." -msgstr "" +msgstr "Aantal verschillen in bestand. Dit aantal is zonder genegeerde verschillen." #: Merge.rc:2359 #, c-format @@ -4434,27 +4541,27 @@ msgstr "%1 met %2 vergelijken" #: Merge.rc:2366 #, c-format msgid "Comma-separated list" -msgstr "" +msgstr "Komma-gescheiden lijst" #: Merge.rc:2367 #, c-format msgid "Tab-separated list" -msgstr "" +msgstr "Tab-gescheiden lijst" #: Merge.rc:2368 #, c-format msgid "Simple HTML" -msgstr "" +msgstr "Simpele html" #: Merge.rc:2369 #, c-format msgid "Simple XML" -msgstr "" +msgstr "Simpele xml" #: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" -msgstr "" +msgstr "Het rapportbestand bestaat reeds. Wilt u het bestaande bestand overschrijven?" #: Merge.rc:2372 #, c-format @@ -4462,11 +4569,13 @@ msgid "" "Error creating the report:\n" "%1" msgstr "" +"Fout bij maken van rapport:\n" +"%1" #: Merge.rc:2373 #, c-format msgid "The report has been created successfully." -msgstr "" +msgstr "Het rapport is met succes opgesteld." #: Merge.rc:2379 #, c-format @@ -4497,31 +4606,52 @@ msgid "" "\n" "Note: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)." msgstr "" +"Deze bestanden gebruiken verschillende regeleinde-types.\n" +"\n" +"Wilt u alle regeleinde-types behandelen als equivalent voor deze vergelijking?\n" +"\n" +"Opmerking: Indien u op elk moment alle regeleinde-types als equivalent wilt behandelen, stel optie \"Negeer regeleindeteken-verschillen...\" dan in in de Vergelijken-tab van het opties-venster (beschikbaar onder Wijzigen/Opties)" #: Merge.rc:2384 #, 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 ?" +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 "" +"De regeleindes zijn verschillende types (Windows/Unix/Mac) in bestand '%1'.\n" +" Met de huidige opties zullen ze n gemaakt worden naar het hoofdtype.\n" +" Wilt u de opties wijzigen en de verschillende regeleindes behouden?" #: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." -msgstr "" +msgstr "Er trad een fout op bij het voorvergelijken van bestand '%1' met plugin '%2'. De voorvergelijking is niet meer toegepast." #: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." -msgstr "" +msgstr "De geselecteerde map is ongeldig." #: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." -msgstr "" +msgstr "Kan geen binair bestand openen met de editor." #: Merge.rc:2388 #, 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?" +msgid "" +"The folder exists only in other side and cannot be opened.\n" +"\n" +"Do you want to create a matching folder:\n" +"%1\n" +"to the other side and open these folders?" msgstr "" +"De map bestaat slechts aan de andere kant en kan niet geopend worden.\n" +"\n" +"Wilt u een gelijkaardige map:\n" +"%1\n" +"maken aan de andere kant en deze mappen openen?" #: Merge.rc:2394 #, c-format @@ -4530,26 +4660,29 @@ msgid "" "Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n" "Would you like to treat both files as being in the default windows codepage (recommended)?" msgstr "" +"Verschillende codetabellen gevonden in linker (cp%d) en rechter (cp%d) bestanden. \n" +"Elk bestand in zijn eigen codetabel weergeven zal resulteren in een betere weergave, maar samenvoegen/kopiren zal gevaarlijk zijn.\n" +"Wilt u beide bestanden behandelen alsof ze in de standaard Windows-codetabel zijn (aangeraden)?" #: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." -msgstr "" +msgstr "Waarschuwing: Bestanden gebruiken verschillende coderingen, links=%s en rechts=%s, en samenvoegen kan leiden tot verlies van informatie." #: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" -msgstr "" +msgstr "Informatie verloren gegaan wegens coderingsfouten: beide bestanden" #: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" -msgstr "" +msgstr "Informatie verloren gegaan wegens coderingsfouten: rechter bestand" #: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" -msgstr "" +msgstr "Informatie verloren gegaan wegens coderingsfouten: linker bestand" #: Merge.rc:2404 #, c-format @@ -4559,7 +4692,7 @@ msgstr "Geen verschil" #: Merge.rc:2405 #, c-format msgid "Line difference" -msgstr "Verschil binnen regel" +msgstr "Regelverschil" #: Merge.rc:2411 #, c-format @@ -4584,12 +4717,12 @@ msgstr "Bestandsnaam kopi #: Merge.rc:2425 #, c-format msgid "Location Pane" -msgstr "" +msgstr "Locatievenster" #: Merge.rc:2426 #, c-format msgid "Diff Pane" -msgstr "" +msgstr "Verschilvenster" #: Merge.rc:2432 #, c-format @@ -4624,7 +4757,7 @@ msgstr "Normaal" #: Merge.rc:2438 #, c-format msgid "Context" -msgstr "" +msgstr "Context" #: Merge.rc:2439 #, c-format @@ -4639,12 +4772,12 @@ msgstr "Kan niet schrijven naar bestand %1." #: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" -msgstr "" +msgstr "Het gespecifieerde uitvoerpad is geen absoluut pad: %1" #: Merge.rc:2442 #, c-format msgid "Specify an output file" -msgstr "" +msgstr "Specifieer een uitvoerbestand" #: Merge.rc:2443 #, c-format @@ -4663,11 +4796,14 @@ msgid "" "\n" "Creating a patch requires that there are no unsaved changes in files." msgstr "" +"Sla alle bestanden eerst op.\n" +"\n" +"Een patch genereren vereist dat er geen niet-opgeslagen veranderingen in bestanden zijn." #: Merge.rc:2446 #, c-format msgid "Folder does not exist." -msgstr "" +msgstr "Map bestaat niet." #: Merge.rc:2451 #, c-format @@ -4681,6 +4817,9 @@ msgid "" "All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n" "See manual for more info about archive support and how to enable it." msgstr "" +"Archiefondersteuning is niet ingeschakeld.\n" +"Er kon geen enkel onderdeel voor archiefondersteuning (7-zip and/or Merge7z*.dll) gevonden worden.\n" +"Zie de handleiding voor meer info over archiefondersteuning en hoe het te activeren." #: Merge.rc:2453 #, c-format @@ -4688,6 +4827,8 @@ msgid "" "\n" "Note: 7-Zip integration is disabled in WinMerge settings." msgstr "" +"\n" +"Opmerking: 7-Zip-integratie is uitgeschakeld in de instellingen van WinMerge." #: Merge.rc:2454 #, c-format @@ -4695,36 +4836,38 @@ msgid "" "\n" "Note: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" +"\n" +"Opmerking: 7-Zip-integratie is gelimiteerd tot standalone-operatie in de instellingen van WinMerge." #: Merge.rc:2455 #, c-format msgid "Select file for export" -msgstr "" +msgstr "Selecteer te exporteren bestand" #: Merge.rc:2456 #, c-format msgid "Select file for import" -msgstr "" +msgstr "Selecteer te importeren bestand" #: Merge.rc:2457 #, c-format msgid "Options imported from the file." -msgstr "" +msgstr "Opties gemporteerd van bestand" #: Merge.rc:2458 #, c-format msgid "Options exported to the file." -msgstr "" +msgstr "Opties gexporteerd naar bestand." #: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." -msgstr "" +msgstr "Opties importeren van bestand mislukt." #: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." -msgstr "" +msgstr "Opties schrijven naar bestand mislukt." #: Merge.rc:2461 #, c-format @@ -4733,6 +4876,9 @@ msgid "" "\n" "Do you want to continue?" msgstr "" +"U staat op het punt verschillende vergelijkingsvensters tegelijk te sluiten.\n" +"\n" +"Wilt u doorgaan?" #: Merge.rc:2467 #, c-format @@ -4822,353 +4968,353 @@ msgstr "Geen overeenkomende ) of \\)" #: Merge.rc:2493 #, c-format msgid "Western European" -msgstr "" +msgstr "West-Europees" #: Merge.rc:2494 #, c-format msgid "Eastern European" -msgstr "" +msgstr "Oost-Europees" #: Merge.rc:2495 #, c-format msgid "East Asian" -msgstr "" +msgstr "Oost-Aziatisch" #: Merge.rc:2496 #, c-format msgid "SE & SW Asian" -msgstr "" +msgstr "ZO- & ZW-Aziatisch" #: Merge.rc:2497 #, c-format msgid "Middle Eastern" -msgstr "" +msgstr "Midden-Oosters" #: Merge.rc:2498 #: Merge.rc:2508 #, c-format msgid "Not applicable" -msgstr "" +msgstr "Niet toepasbaar" #: Merge.rc:2504 #, c-format msgid "MS-Windows" -msgstr "" +msgstr "MS-Windows" #: Merge.rc:2505 #, c-format msgid "MS-DOS" -msgstr "" +msgstr "MS-DOS" #: Merge.rc:2506 #, c-format msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #: Merge.rc:2507 #, c-format msgid "IBM" -msgstr "" +msgstr "IBM" #: Merge.rc:2514 #, c-format msgid "EBCDIC" -msgstr "" +msgstr "EBCDIC" #: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" -msgstr "" +msgstr "IBM EBCDIC Cyrillisch" #: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" -msgstr "" +msgstr "MS-DOS Latijn US" #: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" -msgstr "" +msgstr "MS-DOS Arabisch" #: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" -msgstr "" +msgstr "MS-DOS Grieks" #: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" -msgstr "" +msgstr "MS-DOS Baltisch" #: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" -msgstr "" +msgstr "MS-DOS Latijn 1" #: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" -msgstr "" +msgstr "MS-DOS Grieks 1" #: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" -msgstr "" +msgstr "MS-DOS Latijn 2" #: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" -msgstr "" +msgstr "MS-DOS Cyrillisch" #: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" -msgstr "" +msgstr "MS-DOS Turks" #: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" -msgstr "" +msgstr "MS-DOS Portugees" #: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" -msgstr "" +msgstr "MS-DOS IJslands" #: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" -msgstr "" +msgstr "MS-DOS Hebreeuws" #: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" -msgstr "" +msgstr "MS-DOS Frans Canada" #: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" -msgstr "" +msgstr "MS-DOS Nordisch" #: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" -msgstr "" +msgstr "MS-DOS Cyrillisch CIS 1" #: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" -msgstr "" +msgstr "MS-DOS Grieks 2" #: Merge.rc:2547 #, c-format msgid "Windows Thai" -msgstr "" +msgstr "Windows Thai" #: Merge.rc:2548 #, c-format msgid "Windows Japanese" -msgstr "" +msgstr "Windows Japans" #: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" -msgstr "" +msgstr "Windows Simplified Chinees" #: Merge.rc:2550 #, c-format msgid "Windows Korean" -msgstr "" +msgstr "Windows Koreaans" #: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" -msgstr "" +msgstr "Windows Traditioneel Chinees" #: Merge.rc:2552 #, c-format msgid "Windows Latin 2" -msgstr "" +msgstr "Windows Latijn 2" #: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" -msgstr "" +msgstr "Windows Cyrillisch (Slavisch)" #: Merge.rc:2554 #, c-format msgid "Windows Latin 1" -msgstr "" +msgstr "Windows Latijn 1" #: Merge.rc:2555 #, c-format msgid "Windows Greek" -msgstr "" +msgstr "Windows Grieks" #: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" -msgstr "" +msgstr "Windows Latijn 5 (Turks)" #: Merge.rc:2557 #, c-format msgid "Windows Hebrew" -msgstr "" +msgstr "Windows Hebreeuws" #: Merge.rc:2558 #, c-format msgid "Windows Arabic" -msgstr "" +msgstr "Windows Arabisch" #: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" -msgstr "" +msgstr "Windows Baltisch Rim" #: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" -msgstr "" +msgstr "Windows Vietnamees" #: Merge.rc:2566 #, c-format msgid "Macintosh Roman" -msgstr "" +msgstr "Macintosh Romeins" #: Merge.rc:2567 #, c-format msgid "Macintosh Greek" -msgstr "" +msgstr "Macintosh Grieks" #: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" -msgstr "" +msgstr "Macintosh Cyrillisch" #: Merge.rc:2569 #, c-format msgid "Macintosh " -msgstr "" +msgstr "Macintosh " #: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" -msgstr "" +msgstr "Macintosh Centraal-Europa" #: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" -msgstr "" +msgstr "Macintosh Turks" #: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" -msgstr "" +msgstr "Benadert ISO-8859-2" #: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" -msgstr "" +msgstr "Benadert ISO-8859-1" #: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" -msgstr "" +msgstr "Benadert ISO-8859-7" #: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" -msgstr "" +msgstr "Benadert ISO-8859-9" #: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" -msgstr "" +msgstr "Benadert ISO-8859-8" #: Merge.rc:2592 #, c-format msgid "Win" -msgstr "" +msgstr "Win" #: Merge.rc:2593 #, c-format msgid "Mac" -msgstr "" +msgstr "Mac" #: Merge.rc:2594 #, c-format msgid "Unix" -msgstr "" +msgstr "Unix" #: Merge.rc:2595 #, c-format msgid "Mixed" -msgstr "" +msgstr "Gemengd" #: Merge.rc:2597 #, c-format msgid "LF" -msgstr "" +msgstr "LF" #: Merge.rc:2598 #, c-format msgid "CR" -msgstr "" +msgstr "CR" #: Merge.rc:2599 #, c-format msgid "CRLF" -msgstr "" +msgstr "CRLF" #: Merge.rc:2606 #, c-format msgid " B" -msgstr "" +msgstr " B" #: Merge.rc:2607 #, c-format msgid " KB" -msgstr "" +msgstr " KB" #: Merge.rc:2608 #, c-format msgid " MB" -msgstr "" +msgstr " MB" #: Merge.rc:2609 #, c-format msgid " GB" -msgstr "" +msgstr " GB" #: Merge.rc:2610 #, c-format msgid " TB" -msgstr "" +msgstr " TB" #: Merge.rc:2611 #, c-format msgid " PB" -msgstr "" +msgstr " PB" #: Merge.rc:2617 #, c-format msgid "Type" -msgstr "" +msgstr "Type" #: Merge.rc:2619 #, c-format msgid "Unpacker" -msgstr "" +msgstr "Uitpakker" #: Merge.rc:2620 #, c-format msgid "Prediffer" -msgstr "" +msgstr "Voorvergelijken" #: Merge.rc:2621 #, c-format msgid "Editor script" -msgstr "" +msgstr "Editor-script" #: Merge.rc:2628 #, c-format @@ -5193,27 +5339,27 @@ msgstr "Het rechter bestand opslaan met de naam..." #: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" -msgstr "" +msgstr "Verander alleen-lezen-status van linker bestand/map" #: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" -msgstr "" +msgstr "Verander alleen-lezen-status van rechter bestand/map" #: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" -msgstr "" +msgstr "Converteer regeleinde naar Windows-modus" #: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" -msgstr "" +msgstr "Converteer regeleinde naar Unix-modus" #: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" -msgstr "" +msgstr "Converteer regeleinde naar Mac-modus" #: Merge.rc:2637 #, c-format @@ -5226,11 +5372,13 @@ msgid "" "View and adjust file encoding properties\n" "File encoding properties" msgstr "" +"Bekijk en wijzig bestandscoderin-eigenschappen\n" +"Bestandscodering-eigenschappen" #: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" -msgstr "" +msgstr "Open en verplaats conflictbestand" #: Merge.rc:2645 #, c-format @@ -5238,6 +5386,8 @@ msgid "" "Select difference area in the current line\n" "Difference in the Current Line" msgstr "" +"Selecteer verschilgebied in de huidige regel\n" +"Verschil in Huidige Regel" #: Merge.rc:2646 #, c-format @@ -5269,32 +5419,32 @@ msgstr "" #: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" -msgstr "" +msgstr "Kopieer geselecteerde regels naar het klembord en voeg regelnummers toe aan het begin van elke regel" #: Merge.rc:2650 #, c-format msgid "Refresh selected items" -msgstr "" +msgstr "Vernieuw geselecteerde items" #: Merge.rc:2651 #, c-format msgid "Toggle bookmark" -msgstr "" +msgstr "Bladwijzer aan/uit" #: Merge.rc:2652 #, c-format msgid "Go to next bookmark" -msgstr "" +msgstr "Ga naar volgende bladwijzer" #: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" -msgstr "" +msgstr "Ga naar vorige bladwijzer" #: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" -msgstr "" +msgstr "Alle bladwijzers wissen" #: Merge.rc:2660 #, c-format @@ -5302,6 +5452,8 @@ msgid "" "Displays items that are exactly the same\n" "Show Identical Items" msgstr "" +"Toont items die exact hetzelfde zijn\n" +"Toon Identieke Items" #: Merge.rc:2661 #, c-format @@ -5309,6 +5461,8 @@ msgid "" "Displays items that have differences\n" "Show Different Items" msgstr "" +"Toont items die verschillen bevatten\n" +"Toon Verschillende Items" #: Merge.rc:2662 #, c-format @@ -5316,6 +5470,8 @@ msgid "" "Displays items that exist in only on the left side\n" "Show Left Unique Items" msgstr "" +"Toont items die alleen aan de linkerkant bestaan\n" +"Toon Linker Unieke Items" #: Merge.rc:2663 #, c-format @@ -5323,6 +5479,8 @@ msgid "" "Displays items that exist in only on the right side\n" "Show Right Unique Items" msgstr "" +"Toont items die alleen aan de rechterkant bestaan\n" +"Toon Rechter Unieke Items" #: Merge.rc:2664 #, c-format @@ -5330,6 +5488,8 @@ msgid "" "Displays binary files\n" "Show Binary Files" msgstr "" +"Toont binaire bestanden\n" +"Toon Binaire Bestanden" #: Merge.rc:2665 #, c-format @@ -5337,6 +5497,8 @@ msgid "" "Displays skipped items\n" "Show Skipped Items" msgstr "" +"Toont overgeslagen items\n" +"Toon Overgeslagen Items" #: Merge.rc:2671 #, c-format @@ -5374,22 +5536,30 @@ msgstr "Locatievenster toont overzichtsweergave van bestanden" #: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" -msgstr "" +msgstr "Toon venster met mapvergelijkingsstatistieken" #: Merge.rc:2677 #, c-format -msgid "Select the current user interface language\nLanguage" +msgid "" +"Select the current user interface language\n" +"Language" msgstr "" +"Selecteer de interfacetaal voor de huidige gebruiker\n" +"Taal" #: Merge.rc:2678 #, c-format -msgid "Shows differences inside lines with different colors\nShow Line Difference" +msgid "" +"Shows differences inside lines with different colors\n" +"Show Line Difference" msgstr "" +"Toont verschillen binnen dezelfde regel met verschillende kleuren\n" +"Toon Regelverschil" #: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" -msgstr "" +msgstr "Wissel de plaats van de twee vensters" #: Merge.rc:2680 #, c-format @@ -5397,6 +5567,8 @@ msgid "" "Shows line numbers\n" "Show Line Numbers" msgstr "" +"Toont regelnummers\n" +"Toon Regelnummers" #: Merge.rc:2681 #, c-format @@ -5404,6 +5576,8 @@ msgid "" "Enable word wrap\n" "Wrap Lines" msgstr "" +"Activeer woordterugloop\n" +"Regelterugloop" #: Merge.rc:2682 #, c-format @@ -5411,46 +5585,68 @@ msgid "" "Shows selection margins for both panes\n" "Show Selection Margins" msgstr "" +"Toont selectiemarges voor beide vensters\n" +"Toon Selectiemarges" #: Merge.rc:2683 #, c-format msgid "Increase text size" -msgstr "" +msgstr "Vergroot tekst" #: Merge.rc:2684 #, c-format msgid "Decrease text size" -msgstr "" +msgstr "Verklein tekst" #: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" -msgstr "" +msgstr "Herstel tekst-zoom naar standaardgrootte" #: Merge.rc:2691 #, c-format -msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" +msgid "" +"Scroll to the previous difference\n" +"Previous Difference (Alt+Up)" msgstr "" +"Scroll naar het Vorige verschil\n" +"Vorige Verschil (Alt+Omhoog)" #: Merge.rc:2692 #, c-format -msgid "Scroll to the next difference\nNext Difference (Alt+Down)" +msgid "" +"Scroll to the next difference\n" +"Next Difference (Alt+Down)" msgstr "" +"Scroll naar het volgende verschil\n" +"Volgende Verschil (Alt+Omlaag)" #: Merge.rc:2693 #, c-format -msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" +msgid "" +"Scroll to the first difference\n" +"First Difference (Alt+Home)" msgstr "" +"Scroll naar het eerste verschil\n" +"Eerste Verschil (Alt+Home)" #: Merge.rc:2694 #, c-format -msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" +msgid "" +"Scroll to the current difference\n" +"Current Difference (Alt+Enter)" msgstr "" +"Scroll naar het huidige verschil\n" +"Huidig Verschil (Alt+Enter)" #: Merge.rc:2695 #, c-format -msgid "Scroll to the last difference\nLast Difference (Alt+End)" +msgid "" +"Scroll to the last difference\n" +"Last Difference (Alt+End)" msgstr "" +"Scroll naar het laatste verschil\n" +"Laatste Verschil (Alt+End)" #: Merge.rc:2696 #, c-format @@ -5509,12 +5705,12 @@ msgstr "" #: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" -msgstr "" +msgstr "Geselecteerde items uit beide mappen wissen" #: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" -msgstr "" +msgstr "Vergelijk geselecteerd item (vergelijk eerste item indien meerdere items geselecteerd)" #: Merge.rc:2709 #, c-format @@ -5534,12 +5730,12 @@ msgstr "Filters selecteren en wijzigen" #: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" -msgstr "" +msgstr "Genereert een rapport met vergelijkingsresultaten" #: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" -msgstr "" +msgstr "Toont een lijst met beschikbare plugins" #: Merge.rc:2719 #, c-format @@ -5578,18 +5774,26 @@ msgstr "Alle plug-ins opnieuw inladen (voor ontwikkelaars)" #: Merge.rc:2731 #, c-format -msgid "Activates next visible file\nActivate next File" +msgid "" +"Activates next visible file\n" +"Activate next File" msgstr "" +"Activeert volgend zichtbaar bestand\n" +"Activeer volgend bestand" #: Merge.rc:2732 #, c-format msgid "Closes all open windows" -msgstr "" +msgstr "Sluit alle geopende vensters" #: Merge.rc:2738 #, c-format -msgid "Opens the WinMerge Help\nWinMerge Help" +msgid "" +"Opens the WinMerge Help\n" +"WinMerge Help" msgstr "" +"Opent de WinMerge Help\n" +"WinMerge Help" #: Merge.rc:2739 #, c-format @@ -5599,22 +5803,30 @@ msgstr "De huidige WinMerge versie en configuratie naar een tekstbestand wegschr #: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" -msgstr "" +msgstr "Toon de GNU General Public License" #: Merge.rc:2741 #, c-format msgid "Private Build: %1" -msgstr "" +msgstr "Private Versie: %1" #: Merge.rc:2742 #, c-format -msgid "Opens the release notes document\nRelease Notes" +msgid "" +"Opens the release notes document\n" +"Release Notes" msgstr "" +"Opent het document met vrijgave-opmerkingen\n" +"Vrijgave-opmerkingen" #: Merge.rc:2743 #, c-format -msgid "Opens the translations website\nTranslations" +msgid "" +"Opens the translations website\n" +"Translations" msgstr "" +"Opent de vertalingen-website\n" +"Vertalingen" #: Merge.rc:2749 #, c-format @@ -5649,17 +5861,17 @@ msgstr "" #: Merge.rc:2761 #, c-format msgid "Open the file with registered application" -msgstr "" +msgstr "Open bestand met geregistreerde applicatie" #: Merge.rc:2762 #, c-format msgid "Open the file with external editor" -msgstr "" +msgstr "Open bestand met externe editor" #: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" -msgstr "" +msgstr "Open bestand met een bepaald programma" #: Merge.rc:2769 #, c-format @@ -5669,7 +5881,7 @@ msgstr "Verplaatste blokken niet weergeven" #: Merge.rc:2770 #, c-format msgid "Display all moved blocks" -msgstr "" +msgstr "Toon alle verplaatste blokken" #: Merge.rc:2771 #, c-format @@ -5694,190 +5906,190 @@ msgstr "G&a naar regel %1" #: Merge.rc:2780 #, c-format msgid "Disabled" -msgstr "" +msgstr "Uitgeschakeld" #: Merge.rc:2781 #, c-format msgid "From file system" -msgstr "" +msgstr "Van bestandssysteem" #: Merge.rc:2782 #, c-format msgid "From MRU list" -msgstr "" +msgstr "Van MRU-lijst" #: Merge.rc:2788 #, c-format msgid "No Highlighting" -msgstr "" +msgstr "Geen Markering" #: Merge.rc:2789 #, c-format msgid "ASP" -msgstr "" +msgstr "ASP" #: Merge.rc:2790 #, c-format msgid "Basic" -msgstr "" +msgstr "Basic" #: Merge.rc:2791 #, c-format msgid "Batch" -msgstr "" +msgstr "Batch" #: Merge.rc:2792 #, c-format msgid "C/C++" -msgstr "" +msgstr "C/C++" #: Merge.rc:2793 #, c-format msgid "C#" -msgstr "" +msgstr "C#" #: Merge.rc:2794 #, c-format msgid "CSS" -msgstr "" +msgstr "CSS" #: Merge.rc:2795 #, c-format msgid "DCL" -msgstr "" +msgstr "DCL" #: Merge.rc:2796 #, c-format msgid "Fortran" -msgstr "" +msgstr "Fortran" #: Merge.rc:2797 #, c-format msgid "HTML" -msgstr "" +msgstr "HTML" #: Merge.rc:2798 #, c-format msgid "INI" -msgstr "" +msgstr "INI" #: Merge.rc:2799 #, c-format msgid "InnoSetup" -msgstr "" +msgstr "InnoSetup" #: Merge.rc:2800 #, c-format msgid "InstallShield" -msgstr "" +msgstr "InstallShield" #: Merge.rc:2801 #, c-format msgid "Java" -msgstr "" +msgstr "Java" #: Merge.rc:2802 #, c-format msgid "AutoLISP" -msgstr "" +msgstr "AutoLISP" #: Merge.rc:2803 #, c-format msgid "NSIS" -msgstr "" +msgstr "NSIS" #: Merge.rc:2804 #, c-format msgid "Pascal" -msgstr "" +msgstr "Pascal" #: Merge.rc:2805 #, c-format msgid "Perl" -msgstr "" +msgstr "Perl" #: Merge.rc:2806 #, c-format msgid "PHP" -msgstr "" +msgstr "PHP" #: Merge.rc:2807 #, c-format msgid "Portable Object" -msgstr "" +msgstr "Draagbaar Object" #: Merge.rc:2808 #, c-format msgid "PowerShell" -msgstr "" +msgstr "PowerShell" #: Merge.rc:2809 #, c-format msgid "Python" -msgstr "" +msgstr "Python" #: Merge.rc:2810 #, c-format msgid "REXX" -msgstr "" +msgstr "REXX" #: Merge.rc:2811 #, c-format msgid "Resources" -msgstr "" +msgstr "Bronnen" #: Merge.rc:2812 #, c-format msgid "Ruby" -msgstr "" +msgstr "Ruby" #: Merge.rc:2813 #, c-format msgid "SGML" -msgstr "" +msgstr "SGML" #: Merge.rc:2814 #, c-format msgid "Shell" -msgstr "" +msgstr "Shell" #: Merge.rc:2815 #, c-format msgid "SIOD" -msgstr "" +msgstr "SIOD" #: Merge.rc:2816 #, c-format msgid "SQL" -msgstr "" +msgstr "SQL" #: Merge.rc:2817 #, c-format msgid "TCL" -msgstr "" +msgstr "TCL" #: Merge.rc:2818 #, c-format msgid "TEX" -msgstr "" +msgstr "TEX" #: Merge.rc:2819 #, c-format msgid "XML" -msgstr "" +msgstr "XML" #: Merge.rc:2824 #, c-format msgid "Hide the toolbar" -msgstr "" +msgstr "Verberg de werkbalk" #: Merge.rc:2825 #, c-format msgid "Show small toolbar" -msgstr "" +msgstr "Toon kleine werkbalk" #: Merge.rc:2826 #, c-format msgid "Show big toolbar" -msgstr "" +msgstr "Toon grote werkbalk" From dee02962906ac28f89b5becfaf7e7f8292ec22a3 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 6 Jan 2009 20:49:20 +0000 Subject: [PATCH 160/168] BUG: [ 2490594 ] Manual says wrong how you find the web version --HG-- branch : R2_10 --- Docs/Users/Manual/About_Doc.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index e50a3204dd8..01fce2cb6b9 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -70,10 +70,9 @@ Open your Web browser to winmerge.org. Under - Features, follow the Online - manual link to the latest Help version. - - + Documentation, + follow the Manual + link to the latest Help version. From 413ed733d7f4b089dc4a3c692f335d5bc095e5fe Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 6 Jan 2009 21:28:06 +0000 Subject: [PATCH 161/168] TODO: [ 2483094 ] Manual: Introduction page says registration is not required --HG-- branch : R2_10 --- Docs/Users/Manual/Introduction.xml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Docs/Users/Manual/Introduction.xml b/Docs/Users/Manual/Introduction.xml index fc0c3ceaf0e..a8124b1bd60 100644 --- a/Docs/Users/Manual/Introduction.xml +++ b/Docs/Users/Manual/Introduction.xml @@ -177,15 +177,12 @@ . - We prefer that you register with - SourceForge.net before posting - a bug report (registration is public and free), so that you receive email - notifications if we post follow-up questions to your bug. Registration is - not currently required for you to post a bug report. However, we generally - give less priority to unregistered bug reports, because it has been our - experience that unregistered posters often do not return to answer follow-up - questions. + You must register + with SourceForge.net before posting a bug report (registration is + free). We require registering because anonymous submissions caused a lot of + spam and also because there were no possibility to contact people for asking + more information. We rarely sent direct emails but you'll get notifications + when we ask questions in the bug item.
      From 7aae1ec896741cee4f750bfc40bc66a9aa4e4ed4 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 7 Jan 2009 14:59:08 +0000 Subject: [PATCH 162/168] Manual: bump revision number (to 1.4.9), expand copyright year to 2009. --HG-- branch : R2_10 --- Docs/Users/Manual/WinMerge_help.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 21c7c462388..56ee282dd6e 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -26,10 +26,10 @@ WinMerge - Revision 1.4.8 + Revision 1.4.9 - 2004-2008 + 2004-2009 Thingamahoochie Software. From 493606779d27f3ec374a8eecbe4934f7abdcca63 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 7 Jan 2009 21:23:10 +0000 Subject: [PATCH 163/168] PATCH: [ 2490137 ] Docs: 2.10.4 release notes --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReleaseNotes.html | 33 +++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 16d45bb59a4..b403ff33485 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -5,6 +5,7 @@ http://winmerge.org/tracker/[tracker-id] WinMerge 2.10.4 Add Git to Source Control filter and fix ignore file rules (#2329381) + Release notes update for 2.10.4 release (#2490137) Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190) Bugfix: Use translated version of readme.txt for Chinese Simplified (#2391000) Bugfix: Installer didn't install readme.txt for all translations (#2396437) diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html index b8ed2297205..1dd6667bf28 100644 --- a/Docs/Users/ReleaseNotes.html +++ b/Docs/Users/ReleaseNotes.html @@ -54,13 +54,14 @@

      WinMerge 2.10 Release Notes

      -

      September 2008

      +

      January 2009

      About This Release

      @@ -74,6 +75,31 @@

      About This Release

      "https://sourceforge.net/tracker/?group_id=13216&atid=113216">bug-tracker.

      +

      What Is New in 2.10.4?

      +

      +For a complete changelog history, see the ChangeLog.txt +file located in the Docs folder under the WinMerge program folder. +

      + +

      +WinMerge 2.10.2 is a bug fix update for the previous 2.10. releases. There are +no new features or other significant changes.

      + +

      Bugs fixed

      +
        +
      • Move confirmation dialog sometimes had wrong paths
        • +
      • Translated readme.txt was not installed for some translations
        • +
      • Could not give paths to WinMerge from Cygwin console
        • +
      • File compare method "Modified Date and Size" ignored file size
        • +
      + +

      Translation updates

      +
        +
      • Dutch
        • +
      • Swedish
        • +
      + +

      What Is New in 2.10.2?

      WinMerge 2.10.2 is a bug fix update for the 2.10.0 release. There are no new @@ -116,11 +142,6 @@

      What Is New in 2.10?

      and beta release changes below for more complete change list in this release.

      -

      -For a complete changelog history, see the ChangeLog.txt -file located in the Docs folder under the WinMerge program folder. -

      -

      What Is New in 2.10 RC?

      Improved user manual

      From e49071828c58fee3bee10076f8ed5fbfd1655886 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Thu, 8 Jan 2009 21:02:57 +0000 Subject: [PATCH 164/168] PATCH: [ 2477693 ] Manual: Softer border colors for notes, warning, ... --HG-- branch : R2_10 --- Docs/Users/Manual/css/all.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Docs/Users/Manual/css/all.css b/Docs/Users/Manual/css/all.css index 911579957ed..3c40c1925ca 100644 --- a/Docs/Users/Manual/css/all.css +++ b/Docs/Users/Manual/css/all.css @@ -116,23 +116,23 @@ div.section h4 { .caution { background-color: #FFDDAA; - border: 1px solid olive; + border: 1px solid #FF9966; } .important { background-color: #FFFFDD; - border: 1px solid olive; + border: 1px solid #FFFF66; } .note { background-color: #DDDDFF; - border: 1px solid blue; + border: 1px solid #6666FF; } .tip { background-color: #DDFFDD; - border: 1px solid green; + border: 1px solid #66FF66; } .warning { background-color: #FFDDDD; - border: 1px solid red; + border: 1px solid #FF6666; } /* Examples */ From 45b3884a5966075637e6e066f22b6ff86eaa679b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 11 Jan 2009 19:13:25 +0000 Subject: [PATCH 165/168] PATCH: [ 2494378 ] Updated Dutch translation for trunk & branch Submitted by Thomas De Rocker --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- Src/Languages/Dutch.po | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index b403ff33485..d50e4ee9459 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -17,7 +17,7 @@ WinMerge 2.10.4 (#2455595) Bugfix: Remove EOL characters from command line (#2458728) Translation updates: - - Dutch (#2481022) + - Dutch (#2481022, #2494378) - Swedish (#2236651) WinMerge 2.10.2 - 2008-11-06 (r6075) diff --git a/Src/Languages/Dutch.po b/Src/Languages/Dutch.po index 8a367098aa4..f6f764b5223 100644 --- a/Src/Languages/Dutch.po +++ b/Src/Languages/Dutch.po @@ -4,6 +4,7 @@ # Translators: # * Ronald Schaap # * Michel Coene +# * Thomas De Rocker # # ID line follows -- this is updated by SVN # $Id$ @@ -1085,7 +1086,7 @@ msgstr "Medewerkers" #: Merge.rc:677 #, c-format msgid "Select Files or Folders" -msgstr "Bestanden of mappen selecteren" +msgstr "Bestanden of Mappen Selecteren" #: Merge.rc:680 #: Merge.rc:1595 @@ -1267,7 +1268,7 @@ msgstr "Paden automatisch controleren in het venster Openen" #: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" -msgstr "&Allow only one instance to run" +msgstr "Slechts n draaiende toepassing toestaan" #: Merge.rc:765 #, c-format @@ -1304,7 +1305,7 @@ msgstr "B&estanden vergelijken" #: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." -msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Reset-knop om alle berichtvensters terug zichtbaar te maken." +msgstr "WinMerge staat toe dat een aantal algemene berichtvensters verborgen worden. Druk de Herstellen-knop om alle berichtvensters terug zichtbaar te maken." #: Merge.rc:781 #, c-format @@ -3093,7 +3094,7 @@ msgstr "" #: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." -msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is gratis software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details." +msgstr "WinMerge komt ABSOLUUT ZONDER GARANTIE. Dit is vrije software, en u mag het herverdelen onder bepaalde omstandigheden; zie de GNU General Public License in het Help-menu voor details." #: Merge.rc:1895 #, c-format @@ -3469,12 +3470,12 @@ msgstr "" #: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" -msgstr "&Pad naar cleartool.exe :" +msgstr "&Pad naar cleartool.exe:" #: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" -msgstr "&Pad naar SS.EXE :" +msgstr "&Pad naar SS.EXE:" #: Merge.rc:2050 #, c-format @@ -3812,11 +3813,11 @@ msgid "" "\n" "If you want to refresh files close current file compare and load files again." msgstr "" -"Een ander programma heeft bestand\n" -"%1\n" -"gewijzigd nadat WinMerge het voor de laatste keer heeft gescand.\n" +"Een andere toepassing heeft bestand\n" +"%1 gepdated\n" +"sinds WinMerge het de laatste keer scande.\n" "\n" -"Als u de bestanden wilt verversen, sluit dan de huidige bestandsvergelijking en laad de bestanden opnieuw." +"Wilt u het bestand opnieuw laden?" #: Merge.rc:2134 #, c-format @@ -5526,7 +5527,7 @@ msgstr "Toont tekens witruimte" #: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" -msgstr "Omschakelen verschilvenster" +msgstr "Verschilvenster Aan/Uit" #: Merge.rc:2675 #, c-format @@ -5755,7 +5756,7 @@ msgstr "Selecteer een uitpakker om dit bestand te wijzigen" #: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" -msgstr "Geen voorvergelijking (normal)" +msgstr "Geen voorvergelijking (normaal)" #: Merge.rc:2723 #, c-format From ccb63be6ffdb2e7b76d13f76391e2430bc958720 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Mon, 12 Jan 2009 20:18:21 +0000 Subject: [PATCH 166/168] PATCH: [ 2499994 ] Updated Dutch translation: Installer/ReadMe Submitted by Thomas De Rocker --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- Installer/InnoSetup/Languages/Dutch.isl | 88 ++++++++++++------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index d50e4ee9459..e916b62e0b8 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -17,7 +17,7 @@ WinMerge 2.10.4 (#2455595) Bugfix: Remove EOL characters from command line (#2458728) Translation updates: - - Dutch (#2481022, #2494378) + - Dutch (#2481022, #2494378, #2499994) - Swedish (#2236651) WinMerge 2.10.2 - 2008-11-06 (r6075) diff --git a/Installer/InnoSetup/Languages/Dutch.isl b/Installer/InnoSetup/Languages/Dutch.isl index 8f5a50bb609..e23702a3489 100755 --- a/Installer/InnoSetup/Languages/Dutch.isl +++ b/Installer/InnoSetup/Languages/Dutch.isl @@ -288,7 +288,7 @@ StatusUninstalling=Verwijderen van %1... ;Inno Setup Built-in Custom Messages NameAndVersion=%1 versie %2 AdditionalIcons=Extra snelkoppelingen: -OptionalFeatures=Optional Features: +OptionalFeatures=Optionele Functies: CreateDesktopIcon=Maak een snelkoppeling op het &bureaublad CreateQuickLaunchIcon=Maak een snelkoppeling op de &Snel starten werkbalk ProgramOnTheWeb=%1 op het Web @@ -301,65 +301,65 @@ AssocingFileExtension=Bezig met koppelen van %1 aan de %2 bestandsextensie... CompanyName=Thingamahoochie Software ;Types -TypicalInstallation=Typical Installation -FullInstallation=Full Installation -CompactInstallation=Compact Installation -CustomInstallation=Custom Installation +TypicalInstallation=Standaard Installatie +FullInstallation=Volledige Installatie +CompactInstallation=Compacte Installatie +CustomInstallation=Persoonlijke Installatie ;Components -AppCoreFiles=WinMerge Core Files +AppCoreFiles=WinMerge Basisbestanden ApplicationRuntimes=Application Runtimes Filters=Filters Plugins=Plugins ;Localization Components -Languages=Languages -BulgarianLanguage=Bulgarian menus and dialogs -CatalanLanguage=Catalan menus and dialogs -ChineseSimplifiedLanguage=Chinese (Simplified) menus and dialogs -ChineseTraditionalLanguage=Chinese (Traditional) menus and dialogs -CroatianLanguage=Croatian menus and dialogs -CzechLanguage=Czech menus and dialogs -DanishLanguage=Danish menus and dialogs -DutchLanguage=Dutch menus and dialogs -FrenchLanguage=French menus and dialogs -GalicianLanguage=Galician menus and dialogs -GermanLanguage=German menus and dialogs -GreekLanguage=Greek menus and dialogs -HungarianLanguage=Hungarian menus and dialogs -ItalianLanguage=Italian menus and dialogs -JapaneseLanguage=Japanese menus and dialogs -KoreanLanguage=Korean menus and dialogs -NorwegianLanguage=Norwegian menus and dialogs -PolishLanguage=Polish menus and dialogs -PortugueseBrazilLanguage=Portuguese (Brazilian) menus and dialogs -PortugueseLanguage=Portuguese menus and dialogs -RomanianLanguage=Romanian menus and dialogs -RussianLanguage=Russian menus and dialogs -SlovakLanguage=Slovak menus and dialogs -SlovenianLanguage=Slovenian menus and dialogs -SpanishLanguage=Spanish menus and dialogs -SwedishLanguage=Swedish menus and dialogs -TurkishLanguage=Turkish menus and dialogs -UkrainianLanguage=Ukrainian menus and dialogs +Languages=Talen +BulgarianLanguage=Bulgaarse menus en vensters +CatalanLanguage=Catalaanse menus en vensters +ChineseSimplifiedLanguage=Chinese (versimpeld) menus en vensters +ChineseTraditionalLanguage=Chinese (traditioneel) menus en vensters +CroatianLanguage=Kroatische menus en vensters +CzechLanguage=Tsjechische menus en vensters +DanishLanguage=Deense menus en vensters +DutchLanguage=Nederlandstalige menus en vensters +FrenchLanguage=Franse menus en vensters +GalicianLanguage=Galicische menus en vensters +GermanLanguage=Duitse menus en vensters +GreekLanguage=Griekse menus en vensters +HungarianLanguage=Hongaarse menus en vensters +ItalianLanguage=Italiaanse menus en vensters +JapaneseLanguage=Japanse menus en vensters +KoreanLanguage=Koreaanse menus en vensters +NorwegianLanguage=Noorse menus en vensters +PolishLanguage=Poolse menus en vensters +PortugueseBrazilLanguage=Portugese (Braziliaanse) menus en vensters +PortugueseLanguage=Portugese menus en vensters +RomanianLanguage=Roemeense menus en vensters +RussianLanguage=Russische menus en vensters +SlovakLanguage=Slovaakse menus en vensters +SlovenianLanguage=Sloveense menus en vensters +SpanishLanguage=Spaanse menus en vensters +SwedishLanguage=Zweedse menus en vensters +TurkishLanguage=Turkse menus en vensters +UkrainianLanguage=Oekraense menus en vensters ;Tasks -ExplorerContextMenu=&Enable Explorer context menu integration -IntegrateTortoiseCVS=Integrate with &TortoiseCVS -IntegrateTortoiseSVN=Integrate with T&ortoiseSVN -IntegrateClearCase=Integrate with Rational &ClearCase +ExplorerContextMenu=&Activeer integratie in contextmenu van Verkenner +IntegrateTortoiseCVS=Integreren met &TortoiseCVS +IntegrateTortoiseSVN=Integreren met T&ortoiseSVN +IntegrateClearCase=Integreren met Rational &ClearCase IntegrateDelphi4=Borland Delphi &4 Binary File Support UpdatingCommonControls=Updating the System's Common Controls ;Icon Labels -ReadMe=Read Me -UsersGuide=User's Guide +ReadMe=Lees Mij +UsersGuide=Gebruikershandleiding UpdatingCommonControls=Updating the System's Common Controls -ViewStartMenuFolder=&View the WinMerge Start Menu Folder +ViewStartMenuFolder=Bekijk de WinMerge startmenu-map PluginsText=Plugins ;Code Dialogs -DeletePreviousStartMenu=The installer has detected that you changed the location of your start menu from "%s" to "%s". Would you like to delete the previous start menu folder? +DeletePreviousStartMenu=De installer heeft ontdekt dat u de locatie van uw startmenu veranderd heeft van "%s" naar "%s". Wilt u de vorige startmenu-map wissen? ; Project file description -ProjectFileDesc=WinMerge Project file +ProjectFileDesc=WinMerge Projectbestand From a9290a310a909b57047e660a9396f135e5156b6f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 13 Jan 2009 17:13:22 +0000 Subject: [PATCH 167/168] WinMerge 2.10.4 release (SVN revision 6318) --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e916b62e0b8..d600cd0ebab 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -3,7 +3,7 @@ Numbers in parentheses refer to SourceForge.net tracker item numbers (#XXXXX) or to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL: http://winmerge.org/tracker/[tracker-id] -WinMerge 2.10.4 +WinMerge 2.10.4 - 2009-01-13 (r6318) Add Git to Source Control filter and fix ignore file rules (#2329381) Release notes update for 2.10.4 release (#2490137) Bugfix: Move confirmation dialog sometimes had wrong paths (#2327565, #2309190) From 4d3e28e644bf171ff9430d866815342e7ff5ec4d Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Fri, 16 Aug 2019 14:05:23 +0900 Subject: [PATCH 168/168] Close R2_10 branch --HG-- branch : R2_10

      " & sLanguage & "" For i = 0 To oLanguageStatus.Translators.Count - 1 'For all translators... + sMaintainerStart = "" + sMaintainerEnd = "" + If (oLanguageStatus.Translators(i).Maintainer = True) Then 'If maintainer... + sMaintainerStart = "" + sMaintainerEnd = "" + End If If (oLanguageStatus.Translators(i).Mail <> "") Then 'If mail address exists... - oHtmlFile.WriteLine " " & oLanguageStatus.Translators(i).Name & "
      " + oHtmlFile.WriteLine " " & sMaintainerStart & "" & oLanguageStatus.Translators(i).Name & "" & sMaintainerEnd & "
      " Else 'If mail address NOT exists... - oHtmlFile.WriteLine " " & oLanguageStatus.Translators(i).Name & "
      " + oHtmlFile.WriteLine " " & sMaintainerStart & oLanguageStatus.Translators(i).Name & sMaintainerEnd & "
      " End If Next oHtmlFile.WriteLine "
    8. What Is New in 2.9.10?
      9. Getting and installing WinMerge - WinMerge can be installed using the installer or by unzipping files from an archive. Using the installer is the recommended method. + WinMerge can be installed using the installer or by unzipping files from + an archive. Using the installer is the recommended method. - Currently the WinMerge installer works natively only for 32-bit Windows. There is no separate version of WinMerge for 64-bit Windows (WinXP/2003/Vista). 64-bit Windows versions can run the installer and WinMerge as 32-bit applications. For the shell Integration, the installer includes the 64-bit version of the extension. + Currently the WinMerge installer works natively only for 32-bit + Windows. There is no separate version of WinMerge for 64-bit Windows + (WinXP/2003/Vista). 64-bit Windows versions can run the installer and + WinMerge as 32-bit applications. For the shell Integration, the installer + includes the 64-bit version of the extension.
      Getting files - The latest release can be always downloaded from the WinMerge home page: WinMerge.org. Note that delays can occur in updating home pages for the latest releases, but the project status page at SourceForge.net shows the latest files. There is also a mailing list for release announcements. Stable releases are also available in several file download sites. + The latest release can be always downloaded from the WinMerge home + page: WinMerge.org. Note that + delays can occur in updating home pages for the latest releases, but the + project status page at SourceForge.net + shows the latest files. There is also a mailing list for release + announcements. Stable releases are also available in several file download + sites.
      Using the installer (recommended) - The installer requires Administrator user privileges in Windows NT4/2000/XP. If you don't have admin user privileges, you can install WinMerge by unzipping from an archive file (see Installing from an archive). + The installer requires Administrator user privileges in Windows + NT4/2000/XP. If you don't have admin user privileges, you can install + WinMerge by unzipping from an archive file (see ). - Using the installer is recommended for most users. The installer prompts for the location where WinMerge is installed. It then installs the files, configures the shell integration, and adds WinMerge to the Start menu. To install WinMerge: + Using the installer is recommended for most users. The installer + prompts for the location where WinMerge is installed. It then installs the + files, configures the shell integration, and adds WinMerge to the Start + menu. To install WinMerge: - Start the installer executable (usually named WinMerge-version-setup.exe). + Start the installer executable (usually named + WinMerge-version-setup.exe). - Click Next in the Welcome screen. + Click Next in the Welcome + screen. - Click Next in the License Agreement screen. + Click Next in the License Agreement + screen. - In the Select Destination Location page, accept the location for WinMerge or, if you choose another location, we recommend that you install WinMerge in its own folder. Click Next. + In the Select Destination Location page, accept the location + for WinMerge or, if you choose another location, we recommend that you + install WinMerge in its own folder. Click + Next. - In the Select Components page, choose one of the preconfigured installations in the top control. We recommend the Typical configuration for most users. The lower box shows all the available components. You can modify a preconfigured installation by checking or unchecking components. For example, you might choose additional language files. Components are: + In the Select Components page, choose one of the preconfigured + installations in the top control. We recommend the + Typical configuration for most users. The lower box + shows all the available components. You can modify a preconfigured + installation by checking or unchecking components. For example, you + might choose additional language files. Components are: WinMerge core files - WinMerge executable, Help, and other needed files. Cannot be unchecked. + WinMerge executable, Help, and other needed files. Cannot be + unchecked. @@ -72,7 +102,8 @@ Languages - WinMerge translation files. After installing translation file user interface language can be selected from menu + WinMerge translation files. After installing translation + file user interface language can be selected from menu View Language @@ -85,15 +116,18 @@ - In the Select Start Menu Folder page, configure WinMerge shortcuts. + In the Select Start Menu Folder page, configure WinMerge + shortcuts. - Accept the default setting to create a program shortcut, or specify a different folder. + Accept the default setting to create a program shortcut, or + specify a different folder. - Optionally, check the option, Don't create a Start Menu folder. + Optionally, check the option, Don't create a Start + Menu folder. @@ -101,14 +135,16 @@ - In the Select Additional Tasks page, specify any additional tasks: + In the Select Additional Tasks page, specify any additional + tasks: Enable Explorer context menu integration - Enables basic WinMerge shell integration (can be enabled later in WinMerge options). + Enables basic WinMerge shell integration (can be enabled + later in WinMerge options). @@ -132,7 +168,8 @@ Integrate with ClearCase - Sets WinMerge to be the ClearCase diff and merge application + Sets WinMerge to be the ClearCase diff and merge + application @@ -157,11 +194,17 @@ - In the Ready to Install page, verify your install selections. If necessary, click Back to change anything in a previous page. When you are sure that you are ready to proceed, click Install. + In the Ready to Install page, verify your install selections. + If necessary, click Back to change anything in a + previous page. When you are sure that you are ready to proceed, click + Install. - After the installer has copied files, the final screen appears. Using the two check boxes, confirm whether the created WinMerge Start menu folder should be opened, and whether the WinMerge application should be started. + After the installer has copied files, the final screen appears. + Using the two check boxes, confirm whether the created WinMerge Start + menu folder should be opened, and whether the WinMerge application + should be started.
      @@ -169,38 +212,73 @@
      Installing from an archive - WinMerge is pretty much independent of other system components. It is not tightly integrated with Windows, and does not use many DLLs. + WinMerge is pretty much independent of other system components. It is + not tightly integrated with Windows, and does not use many DLLs. - WinMerge[U].exe itself depends on MFC71[U].dll , MSVCR71.dll and MSVCP71.dll, in addition to some system DLLs. So if these DLLs are already installed on a system, only WinMerge[U].exe is needed to run WinMerge. The DLL files listed above are also available as a downloadable runtime package. + WinMerge[U].exe itself depends on + MFC71[U].dll , MSVCR71.dll and + MSVCP71.dll, in addition to some system DLLs. So if these DLLs + are already installed on a system, only WinMerge[U].exe + is needed to run WinMerge. The DLL files listed above are also available as + a downloadable runtime package. - WinMerge 2.6.0 and later versions require a new version of runtime libraries. When you update from older WinMerge versions using archive files, you need the new runtime files from the runtime package. + WinMerge 2.6.0 and later versions require a new version of runtime + libraries. When you update from older WinMerge versions using archive + files, you need the new runtime files from the runtime package. - Archive files have the correct folder structure. WinMerge should be unzipped preserving this folder structure in the destination folder. For example, the root folder created under C:\Program Files\ has the name, WinMerge-version (for example, WinMerge-2.6.0). You can rename this folder or copy its files to another folder (preserving the folder structure!). - - After the files are unzipped, WinMerge is ready to run! Shell integration and archive integration may need additional steps, as described in the next section. + Archive files have the correct folder structure. WinMerge should be + unzipped preserving this folder structure in the destination folder. For + example, the root folder created under C:\Program Files\ has the name, WinMerge-version + (for example, WinMerge-2.6.0). You + can rename this folder or copy its files to another folder (preserving the + folder structure!). + + After the files are unzipped, WinMerge is ready to run! Shell + integration and archive integration may need additional steps, as described + in the next section.
      Shell integration - The installer enables shell integration when you choose the Enable Explorer context menu integration option in the Select Additional Tasks page. If you do not use the install program: you must register the shell integration DLL (ShellExtension*.dll) separately. + The installer enables shell integration when you choose the + Enable Explorer context menu integration option in the + Select Additional Tasks page. If you do not use the install program: you + must register the shell integration DLL + (ShellExtension*.dll) separately. - Installing shell integration requires Administrator user privileges. + Installing shell integration requires Administrator user + privileges. - First, uninstall the current shell integration version by running unregister.bat from the WinMerge directory. Then restart the computer so that Windows completes the uninstall. + First, uninstall the current shell integration version by running + unregister.bat from the WinMerge directory. Then + restart the computer so that Windows completes the uninstall. - To register the shell integration DLL (ShellExtension*.dll), run register.bat from the WinMerge directory. We recommend that you restart the computer after installing shell integration, so that Windows updates all its references. + To register the shell integration DLL + (ShellExtension*.dll), run + register.bat from the WinMerge directory. We recommend + that you restart the computer after installing shell integration, so that + Windows updates all its references.
      64-bit shell integration - Starting with Version 2.6, WinMerge supports 64-bit Windows versions by including 64-bit shell integration. The WinMerge installer recognizes 64-bit versions of Windows and can install the correct shell integration version. + Starting with Version 2.6, WinMerge supports 64-bit Windows versions + by including 64-bit shell integration. The WinMerge installer recognizes + 64-bit versions of Windows and can install the correct shell integration + version. - When you install shell integration manually from an archive file, the shell integration DLL is named ShellExtensionX64.dll. You can register and unregister this file by using register.bat and unregister.bat, as with 32-bit versions. + When you install shell integration manually from an archive file, + the shell integration DLL is named + ShellExtensionX64.dll. You can register and + unregister this file by using register.bat and + unregister.bat, as with 32-bit versions.
      @@ -209,19 +287,42 @@ installing archive support 7-Zip and archive support - WinMerge uses 7-Zip for archive support, but the WinMerge installer does not install 7-Zip or archive support. Installing the 7-Zip application is recommended but not required for archive support. The 7-Zip installer is available for downloading from 7-Zip.org. + WinMerge uses 7-Zip for + archive support, but the WinMerge installer does not install 7-Zip or + archive support. Installing the 7-Zip application is recommended but not + required for archive support. The 7-Zip installer is available for + downloading from 7-Zip.org. - There are 7-Zip MSI installers that do not install all the files WinMerge needs (specifically, 7zip_pad.xml in the 7-Zip program folder). If there are problems with archive support enabling, try running the EXE version of the 7-Zip installer. + There are 7-Zip MSI installers that do not install all the files + WinMerge needs (specifically, 7zip_pad.xml in the + 7-Zip program folder). If there are problems with archive support + enabling, try running the EXE version of the 7-Zip installer. - To install archive support, download and install the7-Zip plugin from WinMerge.org, as described in the Merge7zInstaller section of this topic. - - WinMerge automatically detects an installed 7-zip in the system, so no configuration is needed. - - 7-zip integration needs a compatible Merge7z*.dll file in the WinMerge program directory, where * is the 7-Zip version installed. For example, 7-Zip version 4.42 requires Merge7z442.dll. And if WinMergeU.exe (the Unicode version) is used, then U is also added to filename, as in: Merge7z442U.dll. If the required DLL file is missing for any reason, you can copy it to the WinMerge directory, for example from the 7z-Plugin archive that is available from the WinMerge download page. - - If the Merge7z*.dll file is missing, WinMerge displays a message that includes the name of the missing file and the recommended version of 7-Zip. You can also display this message by clicking + To install archive support, download and install the7-Zip plugin from + WinMerge.org, as described in the + section of this topic. + + WinMerge automatically detects an installed 7-zip in the system, so no + configuration is needed. + + 7-zip integration needs a compatible Merge7z*.dll + file in the WinMerge program directory, where * is the + 7-Zip version installed. For example, 7-Zip version 4.42 requires + Merge7z442.dll. And if + WinMergeU.exe (the Unicode version) is used, then + U is also added to filename, as in: + Merge7z442U.dll. If the required DLL file is missing + for any reason, you can copy it to the WinMerge directory, for example from + the 7z-Plugin archive that is available from the + WinMerge download page. + + If the Merge7z*.dll file is missing, WinMerge + displays a message that includes the name of the missing file and the + recommended version of 7-Zip. You can also display this message by clicking + Help Archive Support Disabled @@ -230,22 +331,37 @@
      Merge7zInstaller - Merge7zInstaller is a stand-alone installer for 7-Zip integration. + Merge7zInstaller is a stand-alone installer for + 7-Zip integration. - Installer file names may seem strange at first, but there is reason for them: they show the supported versions. The file name is formatted as + Installer file names may seem strange at first, but there is reason + for them: they show the supported versions. The file name is formatted + as Merge7zInstallerXXX-YYY-ZZZ.exe - where XXX is the build number, YYY is the earliest 7-Zip version supported, and ZZZ is the latest 7-Zip version supported. + where XXX is the build number, + YYY is the earliest 7-Zip version supported, + and ZZZ is the latest 7-Zip version + supported. - For example, Merge7zInstaller0014-311-426.exe means build version 14, support for 7-Zip versions 3.11 to 4.26. + For example, Merge7zInstaller0014-311-426.exe + means build version 14, support for 7-Zip versions 3.11 to 4.26. - This separate installer is much more flexible, because we can update it whenever 7-Zip is updated, and we don't add files to the base installer that users don't need. + This separate installer is much more flexible, because we can update + it whenever 7-Zip is updated, and we don't add files to the base installer + that users don't need. - The latest version is always available at 7-Zip plugin in our download page at SourceForge.net, and of course from our home page at WinMerge.org. + The latest version is always available at 7-Zip plugin in our download page at SourceForge.net, + and of course from our home page at WinMerge.org. - If you want to know immediately when we release new versions, you can monitor our releases. You are then notified through e-mail of new releases when they happen. + If you want to know immediately when we release new versions, you + can monitor our releases. You are then notified through e-mail of new + releases when they happen. Running the Merge7zInstaller is simple: @@ -256,14 +372,18 @@ - Select the installation type and the DLL files (supported 7-zip versions) to install: + Select the installation type and the DLL files (supported + 7-zip versions) to install: Shared installation - Copies the 7-Zip plugin files to the system directory so they can be shared between multiple WinMerge installations and other programs using the 7-zip plugin. This is the recommended installation. + Copies the 7-Zip plugin files to the system directory so + they can be shared between multiple WinMerge installations and + other programs using the 7-zip plugin. This is the recommended + installation. @@ -271,9 +391,13 @@ Application specific installation - Copies the 7-zip plugin files to the program directory. Files are then usable only by that program. + Copies the 7-zip plugin files to the program directory. + Files are then usable only by that program. - When you choose this option, you must select the executable in the directory where the plugin files are installed. Select the WinMerge executable file when installing to the WinMerge directory. + When you choose this option, you must select the + executable in the directory where the plugin files are + installed. Select the WinMerge executable file when installing + to the WinMerge directory. @@ -281,9 +405,17 @@ Enable standalone operation - Also installs the required 7-Zip files to the program's application-specific installation directory. This allows the minimal usable installation of 7-Zip for archive support. You can use this option when the 7-Zip application is not wanted or needed. - - This installation type contains only the files needed for WinMerge (or other application) to enable archive support. It does not install the 7-Zip user interface or other related tools or files. After this installation it is not possible to open or create 7-Zip archive files outside of WinMerge. + Also installs the required 7-Zip files to the program's + application-specific installation directory. This allows the + minimal usable installation of 7-Zip for archive support. You + can use this option when the 7-Zip application is not wanted + or needed. + + This installation type contains only the files needed + for WinMerge (or other application) to enable archive support. + It does not install the 7-Zip user interface or other related + tools or files. After this installation it is not possible to + open or create 7-Zip archive files outside of WinMerge. diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 6177f99c1ae..2d91a9abb19 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -2,27 +2,53 @@
      Overview of file comparing and merging - This topic describes how WinMerge detects and displays differences within files, and demonstrates simple file comparing and merging operations. + This topic describes how WinMerge detects and displays differences + within files, and demonstrates simple file comparing and merging + operations.
      Comparing files - We usually compare two files that are related in some way, such as two versions that were edited at different times, or by different people. If you examine two such files you can usually see some similar areas, and also identify several types of differences: different characters and words, different lines, even entire blocks of text that are different. But trying to understanding all the differences between two files by scanning them in your favorite editor can be tedious and error-prone. Specialized difference/merging tools like WinMerge are designed make this work more systematic and efficient. - - For example, a spell checker is a difference utility that most people have used: it can systematically step you through a document, highlight words that are different from those in its dictionary, and help you resolve each spelling problem. However, looking only at characters and words is not an effective way to do more complicated comparisons: many text utilities use lines as the basic unit of comparison instead. - - WinMerge also uses lines as its basic unit of difference. Words and spaces are not treated individually in comparing and merging operations. To illustrate, consider two files that are identical except for one line that is different. If the two versions of the line have four words that are different and one version has an extra space, then we say that the file has one difference, not five. - - If it's quicker to compare lines than characters, sometimes it's also useful to treat an entire block of lines as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too. + We usually compare two files that are related in some way, such as two + versions that were edited at different times, or by different people. If you + examine two such files you can usually see some similar areas, and also + identify several types of differences: different characters and words, + different lines, even entire blocks of text that are different. But trying + to understanding all the differences between two files by scanning them in + your favorite editor can be tedious and error-prone. Specialized + difference/merging tools like WinMerge are designed make this work more + systematic and efficient. + + For example, a spell checker is a difference utility that most people + have used: it can systematically step you through a document, highlight + words that are different from those in its dictionary, and help you resolve + each spelling problem. However, looking only at characters and words is not + an effective way to do more complicated comparisons: many text utilities use + lines as the basic unit of comparison instead. + + WinMerge also uses lines as its basic unit of difference. Words and + spaces are not treated individually in comparing and merging operations. To + illustrate, consider two files that are identical except for one line that + is different. If the two versions of the line have four words that are + different and one version has an extra space, then we say that the file has + one difference, not five. + + If it's quicker to compare lines than characters, sometimes it's also + useful to treat an entire block of lines as a single difference, instead of + comparing one line at a time. As we will see later, detecting multiple-line + differences makes merging more efficient too.
      Simple compare operation - This section offers a simple example that demonstrates how to compare line differences between two files in WinMerge: + This section offers a simple example that demonstrates how to + compare line differences between two files in WinMerge: - Using a text editor, create two files with the names and contents shown here, being careful to preserve the words and line breaks exactly: + Using a text editor, create two files with the names and + contents shown here, being careful to preserve the words and line + breaks exactly: Fle1: @@ -55,11 +81,16 @@ Believe it or not. - In the Select Files and Folders dialog, specify File1 as the Left file and File2 as the Right file, then click OK. The File Compare window displays the two files in the left and right pane, like this: + In the Select Files and Folders dialog, specify + File1 as the Left file and + File2 as the Right file, + then click OK. The File Compare window displays + the two files in the left and right pane, like this: - + @@ -67,14 +98,17 @@ Believe it or not. - The window elements are described in more detail in Comparing Files. Here are some features you should notice in this example: + The window elements are described in more detail in . Here are some features you should notice in + this example: Number of differences - The message in the status bar (at the bottom) tells you that two differences were detected. + The message in the status bar (at the bottom) tells you + that two differences were detected. @@ -82,7 +116,13 @@ Believe it or not. Difference colors - WinMerge marks differences with various background colors (which you can configure in WinMerge options). The basic difference color is gold, by default. Within each line difference, WinMerge marks words and characters that are different with a lighter background color. Identical lines (like the third line in the example) are unmarked: they have white backgrounds. + WinMerge marks differences with various background colors + (which you can configure in WinMerge options). The basic + difference color is gold, by default. Within each line + difference, WinMerge marks words and characters that are + different with a lighter background color. Identical lines (like + the third line in the example) are unmarked: they have white + backgrounds. @@ -90,36 +130,58 @@ Believe it or not. Blank lines - Notice that in the left comparison pane, the second line has text: the other pane has a blank gray line in the same location. This blank line does not exist in the File2 source file, so what is it doing in WinMerge? - - WinMerge inserts one or more gray blank lines in one version of a difference when the other version has more lines. These empty gray lines do not represent blank lines in the source file; they are only placeholders in the display. The purpose of placeholder lines is to keep the left and right versions of differences vertically aligned. Thus in our example, the text, WinMerge compares lines, appears side by side in the Comparison window, even though they are on different lines in the source files. This makes it easier to compare differences in WinMerge than in a conventional editor. + Notice that in the left comparison pane, the second line + has text: the other pane has a blank gray line in the same + location. This blank line does not exist in the + File2 source file, so what is it doing in + WinMerge? + + WinMerge inserts one or more gray blank lines in one + version of a difference when the other version has more lines. + These empty gray lines do not represent blank lines in the + source file; they are only placeholders in the display. The + purpose of placeholder lines is to keep the left and right + versions of differences vertically aligned. Thus in our example, + the text, WinMerge compares + lines, appears side by side in the Comparison + window, even though they are on different lines in the source + files. This makes it easier to compare differences in WinMerge + than in a conventional editor. - One consequence of the blank lines is that both panes in the File Compare window always display the same total number of lines, even if their source files do not. + One consequence of the blank lines is that both panes in + the File Compare window always display the same total number + of lines, even if their source files do not. - Now that you understand how WinMerge detects and displays differences, you can use the comparing functions effectively, as shown in the next steps. + Now that you understand how WinMerge detects and displays + differences, you can use the comparing functions effectively, as shown + in the next steps. Click - + Current Difference button - Current Difference in the toolbar (or press + Current Difference in + the toolbar (or press Alt Enter - ). If this button is not enabled (for example, if your cursor is in a different line), click + ). If this button is not enabled (for example, if your + cursor is in a different line), click - + @@ -131,11 +193,15 @@ Believe it or not. Home ) instead. - When you select a difference, the two versions are loaded in the Diff pane. The Diff pane confirms which lines are included in a difference, and lets you examine them in isolation from the rest of the file. In our example, Difference 1 clearly has two lines. + When you select a difference, the two versions are loaded in the + Diff pane. The Diff pane confirms which lines are included in a + difference, and lets you examine them in isolation from the rest of + the file. In our example, Difference 1 clearly has two lines. - + @@ -147,19 +213,26 @@ Believe it or not. Click - + Current Difference button - Next Difference in the toolbar (or click + Next Difference in the + toolbar (or click Alt Enter - ). This jumps over the identical line (which is not a difference) and selects the last line. - - You have reached the end of the file and had a chance to examine every difference. This was a trivial example — there were only two differences — and there are other ways to compare differences in WinMerge. But it demonstrates the efficiency of using the WinMerge navigation controls. + ). This jumps over the identical line (which is not a + difference) and selects the last line. + + You have reached the end of the file and had a chance to examine + every difference. This was a trivial example — there were only two + differences — and there are other ways to compare differences in + WinMerge. But it demonstrates the efficiency of using the WinMerge + navigation controls.
      @@ -168,86 +241,136 @@ Believe it or not.
      Merging files - The purpose of merging is to combine changes from two files into one file. Merging extends the concepts and functions used in comparing operation: please read the preceding section before beginning this section. In addition to detecting differences between two file versions, we resolve the differences and save the result in a single target version. - - Merging files makes concurrent development possible, and it is a common task in team environments. For example, suppose you and another person want to add code to the same program file at the same time. You both begin with an identical copy of the file, but during development you create separate versions that are not identical. At some point, the two versions must be merged into one version that preserves the changes from each contributor. - - Merging can be prompted (or even initiated) by version control systems like Subversion and ClearCase. For example, your version control system might prevent you from submitting changes to its repository because of merge conflicts. A conflict can occur if someone else checked in a different version of the same file while you were working on your version, and the version control system was not able to automatically merge the differences. When that happens, you might need to merge the conflicting versions before trying again to contribute your version. Many systems have integrated difference and merge tools, but you might prefer to use WinMerge instead. - - Just as with comparing, you use WinMerge's toolbar controls (or keyboard shortcuts) to systematically step through the differences. Resolve each difference by copying either its left or right candidate to the other side. When you have resolved all the differences, WinMerge lets you know that all differences are resolved (the versions are identical), and you are done merging. + The purpose of merging is to combine changes from two files into one + file. Merging extends the concepts and functions used in comparing + operation: please read the preceding section before beginning this section. + In addition to detecting differences between two file versions, we resolve + the differences and save the result in a single + target version. + + Merging files makes concurrent development possible, and it is a + common task in team environments. For example, suppose you and another + person want to add code to the same program file at the same time. You both + begin with an identical copy of the file, but during development you create + separate versions that are not identical. At some point, the two versions + must be merged into one version that preserves the changes from each + contributor. + + Merging can be prompted (or even initiated) by version control systems + like Subversion and ClearCase. For example, your version control system + might prevent you from submitting changes to its repository because of merge + conflicts. A conflict can occur if someone else checked in a different + version of the same file while you were working on your version, and the + version control system was not able to automatically merge the differences. + When that happens, you might need to merge the conflicting versions before + trying again to contribute your version. Many systems have integrated + difference and merge tools, but you might prefer to use WinMerge + instead. + + Just as with comparing, you use WinMerge's toolbar controls (or + keyboard shortcuts) to systematically step through the differences. Resolve + each difference by copying either its left or right + candidate to the other side. When you have resolved + all the differences, WinMerge lets you know that all differences are + resolved (the versions are identical), and you are done merging.
      Simple merge operation - This short exercise demonstrates how to use the controls in the File Compare window in a systematic way to merge the simple files shown earlier: + This short exercise demonstrates how to use the controls in the File + Compare window in a systematic way to merge the simple files shown + earlier: Click - + Current Difference button - Current Difference in the toolbar to select the first difference. If this button is not enabled, click + Current Difference in + the toolbar to select the first difference. If this button is not + enabled, click - + First Difference button - First Difference instead. + First Difference + instead. Click - + Copy Right button - Copy Right to merge difference 1 from File1 to File2. In File2, notice that the single difference line is replaced by the two lines from File1, and the gray blank line is now gone. + Copy Right to merge + difference 1 from File1 to + File2. In File2, notice that + the single difference line is replaced by the two lines from + File1, and the gray blank line is now + gone. Click - + Next Difference button - Next Difference to select Difference 2. This is easier than finding and selecting the difference yourself. It's especially useful if you want to step through all differences without accidentally missing any. + Next Difference to + select Difference 2. This is easier than finding and selecting the + difference yourself. It's especially useful if you want to step + through all differences without accidentally missing any. Click - + Copy Left button - Copy Left to merge Difference 2 from File2 to File1. + Copy Left to merge + Difference 2 from File2 to + File1. - The message that the the files are identical tells you that the merge is complete: + The message that the the files are identical tells you that the + merge is complete: - + - Click OK to dismiss the message. The status Difference message changes from Difference 1 of 1 to identical. + Click OK to dismiss the message. The + status Difference message changes from Difference 1 of + 1 to + identical. @@ -263,11 +386,15 @@ Believe it or not.
      Choosing a merge result file - You control where your merge result is preserved. The WinMerge Compare window does not have a separate result pane, unlike some merge tools. So the simplest strategy is to save your changes in one or both source files. Press + You control where your merge result is preserved. The WinMerge + Compare window does not have a separate result pane, unlike some merge + tools. So the simplest strategy is to save your changes in one or both + source files. Press Ctrl S - at any time to save the current changes to both files; alternatively, click + at any time to save the current changes to both files; + alternatively, click File Save Left @@ -277,13 +404,17 @@ Believe it or not. Save Right to save only one file. - To write to a third file instead of either source file, use + To write to a third file instead of either source file, use + File Save As - . For example, your target file might be the difference or conflict file generated by a version control system. + . For example, your target file might be the difference or + conflict file generated by a version control system. - Similarly, in the WinMerge command line, you can leave both source versions unchanged by using the optional argument, as described in Command Line. + Similarly, in the WinMerge command line, you can leave both source + versions unchanged by using the optional + argument, as described in .
      diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index 96b43707a83..fcf3355f4d5 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -26,9 +26,9 @@
      Select Files or Folders dialog - Quick start describes the Select - Files or Folders dialog. This section provides more details, and some tips - for using the Select Files or Folders dialog more efficiently. + describes the Select Files or Folders + dialog. This section provides more details, and some tips for using the + Select Files or Folders dialog more efficiently.
      Environment variables @@ -44,9 +44,8 @@
      Opening archive files - WinMerge archive support is provided in the 7-Zip plugin. See Installing instructions to install this - plugin. + WinMerge archive support is provided in the 7-Zip plugin. See to install this plugin. Opening two archive files is similar to opening normal files: specify two archive files in the Open-dialog's Left @@ -54,10 +53,9 @@ format, it opens the contents of the archive files in the Folder Compare window. - The Folder Compare topic - describes how to work with archive files. For example, if an archive file - contains two subfolders named Original/ and The topic describes how to work with + archive files. For example, if an archive file contains two subfolders + named Original/ and Altered/, you can compare the contents of the two subfolders by specifying the same archive file in both sides in the Select Files or Folders dialog or WinMerge command line. @@ -293,8 +291,8 @@ to compare one file/folder against several files/folders. --> while dropping paths. Another useful key when dropping paths is Shift: To open the same path in both sides of a Compare window, press and hold Shift while dropping only one path. - This is a handy way to open archive files (see Opening archive files). + This is a handy way to open archive files (see . You can drop paths into the Select Files or Folders dialog. A typical procedure is to drag and drop the first path into the WinMerge window, and diff --git a/Docs/Users/Manual/Plugins.xml b/Docs/Users/Manual/Plugins.xml index b64d7dc1428..7602810446e 100644 --- a/Docs/Users/Manual/Plugins.xml +++ b/Docs/Users/Manual/Plugins.xml @@ -29,9 +29,8 @@
      Three categories of plugins - "Plugins" is a generic name for extra-feature - dll or scriptlets. Plugins features are spread over three - categories: + "Plugins" is a generic name for extra-feature dll + or scriptlets. Plugins features are spread over three categories:
      Editor complement @@ -39,9 +38,8 @@ Operate custom operations on the currently selected text from the active editor pane. - Example plugin: editor - addin.sct (Turn the selection to UPPER CASE or lower - case.) + Example plugin: (Turn the selection + to UPPER CASE or lower case.)
      @@ -52,10 +50,10 @@ transformed file is created and loaded in WinMerge. Sometimes the transformed file can be packed back. (See the plugin - details to know if it supports packing back.) Then you may merge and - save the transformed file. The packing is done automatically in this - case. To avoid problems, you are proposed to change the filename when - saving a changed file. + details to know if it supports packing back.) Then you may merge and save + the transformed file. The packing is done automatically in this case. To + avoid problems, you are proposed to change the filename when saving a + changed file. When you compare folders, WinMerge doesn't need to display the @@ -67,23 +65,20 @@ folder, or when you merge two versions of a file. - Example plugin: DisplayXMLFiles.dll - (Display XML files nicely, by consistently inserting tabs and - linebreaks.) + Example plugin: (Display XML + files nicely, by consistently inserting tabs and linebreaks.)
      Prediffer - Preprocess files to hide some differences - The plugin is not apply to the files displayed in the editor. It - is applied only to temporary copies of the files, and this copies are - then scanned to create the difference list. + The plugin is not apply to the files displayed in the editor. It is + applied only to temporary copies of the files, and this copies are then + scanned to create the difference list. - Example plugin: IgnoreColumns.dll - (Ignore the differences inside given columns, while displaying the - characters in these columns.) + Example plugin: (Ignore the + differences inside given columns, while displaying the characters in these + columns.)
      @@ -94,15 +89,15 @@ "<guilabel>Suggested plugin</guilabel>" and "<guilabel>Automatic mode</guilabel>" - Each plugin specifies a list of file extensions (see plugins - details for more info). When the file extension, either from the left or - from the right file, matches the plugin list, the plugin is called - "a suggested plugin". + Each plugin specifies a list of file extensions (see plugins details + for more info). When the file extension, either from the left or from the + right file, matches the plugin list, the plugin is called "a + suggested plugin". - When "Automatic mode" is on, WinMerge - searches for a suggested plugin and applies it if it is avaialble. When - two suggested plugins are available for a file, WinMerge applies the - first one only (alphabetical order). + When "Automatic mode" is on, WinMerge searches + for a suggested plugin and applies it if it is avaialble. When two + suggested plugins are available for a file, WinMerge applies the first one + only (alphabetical order). "Automatic Unpacking" and @@ -148,9 +143,9 @@ Open dialog: Select the two files first and then press the Select button right from the field - "Unpacker". WinMerge displays the standard - dialog for unpacker selection. Use the top combobox to select the - plugin. Two generic choices "None" and + "Unpacker". WinMerge displays the standard dialog + for unpacker selection. Use the top combobox to select the plugin. Two + generic choices "None" and "Automatic" are also available. @@ -160,8 +155,8 @@ Automatic Unpacking is checked: Just double click to open the file. The - suggested plugin used during the folder comparison is used to load - the file in the editor. + suggested plugin used during the folder comparison is used to load the + file in the editor.       @@ -170,11 +165,10 @@ Plugins Edit with Unpacker - . WinMerge displays the dialog for unpacker - selection. Select an unpacker and press OK, - WinMerge opens the editor view and applies this unpacker to load the - file. This plugin is forgotten when you close the editor - view. + . WinMerge displays the dialog for unpacker selection. + Select an unpacker and press OK, WinMerge opens + the editor view and applies this unpacker to load the file. This + plugin is forgotten when you close the editor view.
      @@ -187,16 +181,16 @@ Plugin Settings Prediffer Settings - and select "Auto prediffer" - or "No prediffer". Refresh the view + and select "Auto prediffer" or + "No prediffer". Refresh the view (F5) to update the results. - "Auto prediffer" is a per-file - option. Some files in the same folder can be in mode "No + "Auto prediffer" is a per-file option. + Some files in the same folder can be in mode "No prediffer" and some in mode "Auto - prediffer". When you change folder during a - non-recursive compare, the mode is always reset to "No + prediffer". When you change folder during a non-recursive + compare, the mode is always reset to "No prediffer".
      @@ -208,8 +202,8 @@ From the folder view when "Auto prediffer" is checked for a file: Just double click to - open the file. The plugin used during the folder comparison is used - in the editor before the diff algorithm. + open the file. The plugin used during the folder comparison is used in + the editor before the diff algorithm. @@ -235,9 +229,8 @@ <filename>CompareMSExcelFiles.dll</filename> Displays the text content of a Microsoft - Excel file, stripping away all formatting and - embedded objects. + class="registered">Microsoft Excel + file, stripping away all formatting and embedded objects. Categorie @@ -256,9 +249,7 @@ No Microsoft - Excel, Visual Basic runtime - library + Excel,
      @@ -289,8 +280,7 @@ MicrosoftWord, - Visual Basic - runtime library +
      @@ -298,9 +288,9 @@
      <filename>DisplayXMLFiles.dll</filename> - This plugin display XML files nicely, by consistently inserting - tabs and linebreaks. This is to fix XML files which do not have line - returns in convenient locations. + This plugin display XML files nicely, by consistently inserting tabs + and linebreaks. This is to fix XML files which do not have line returns in + convenient locations. Categorie @@ -330,13 +320,13 @@ - MakeUpper convert the selection - to UPPER CASE. + MakeUpper convert the selection to + UPPER CASE. - MakeLower convert the selection - to lower case. + MakeLower convert the selection to + lower case. @@ -353,8 +343,8 @@ <filename>IgnoreColumns.dll</filename> The plugin ignore the characters at specified columns. It does not - support files with tabulations (no crash, but all tabs will be treated - as a normal character). The first column has number 1. + support files with tabulations (no crash, but all tabs will be treated as + a normal character). The first column has number 1. For the parameters, you just need to rename the dll with the following syntax: @@ -396,8 +386,8 @@ IgnoreColumns_1,30 to 40.dll - Ignore all the characters in column 1, and in columns - 30 to 40. + Ignore all the characters in column 1, and in columns 30 + to 40. @@ -449,8 +439,8 @@ as delimiters (CSV files for example). It ignore the characters in the specified fields. First field has number 1. - Modify the filename to specify the fields. See IgnoreColumns.dll for the syntax. + Modify the filename to specify the fields. See for the syntax. Categorie @@ -471,11 +461,11 @@ The plugin is for files with fields and tabulations as delimiters (Excel files saved in format *.txt for example). It ignore the - characters in the specified fields. First field has number 1. + class="extension">*.txt for example). It ignore the characters + in the specified fields. First field has number 1. - Modify the filename to specify the fields. See IgnoreColumns.dll for the syntax. + Modify the filename to specify the fields. See for the syntax. Categorie @@ -508,8 +498,7 @@ *.nc - Visual - Basic runtime library +
      @@ -548,9 +537,9 @@ <filename>RCLocalizationHelper.dll</filename>, <filename>RCLocalizationHelperU.dll</filename> - The plugin preprocesses RC files by stripping out localized - strings, to enable comparing differnt language versions of the same RC - file and ignoring the translations. + The plugin preprocesses RC files by stripping out localized strings, + to enable comparing differnt language versions of the same RC file and + ignoring the translations. RCLocalizationHelperU.dll is the Unicode version. @@ -582,8 +571,8 @@ - WatchEndOfLog.dll truncates the files - to the first 1/10th. + WatchEndOfLog.dll truncates the files to + the first 1/10th. @@ -615,8 +604,8 @@
      Windows Script Host - Some editor complements need this optional component from - Microsoft. + Some editor complements need this optional component from Microsoft. If the list of editor complements does not present all editor plugins, this component is probably missing. You can check easily. @@ -630,8 +619,8 @@
      <application>Visual Basic</application> runtime library - Some plugins require Visual Basic - runtime library to work. + Some plugins require Visual Basic runtime + library to work. You can download the required file msvbvm60.dll diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index e775b966cac..7376cbc576f 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -4,7 +4,7 @@
      <indexterm> - <primary>Getting started with WinMerge </primary> + <primary>Getting started with WinMerge</primary> </indexterm><indexterm> <primary>Opening files and folders</primary> @@ -147,8 +147,7 @@ consider enabling the <guilabel>Open-dialog Auto-completion</guilabel> option. With this option, WinMerge shows a list of paths available as you type in the fields. See - <link linkend="Configuration">Options & configuration</link> - for details.</para> + <xref linkend="Configuration" /> for details.</para> </tip> </listitem> @@ -212,8 +211,8 @@ <para>File filtering is more powerful than extension filtering. Click the <guibutton>Select</guibutton> button next to the <guilabel>Filters</guilabel> field to choose from a list of - available filters. See <link linkend="Filters">Filters</link> for - full details.</para> + available filters. See <xref linkend="Filters" /> for full + details.</para> </listitem> </varlistentry> </variablelist> @@ -271,8 +270,8 @@ </listitem> </itemizedlist> - <para>See <link linkend="OpenPaths">Opening files and folders</link> - for more information about project files.</para> + <para>See <xref linkend="OpenPaths" /> for more information about + project files.</para> </listitem> <listitem> From 970cf4a09150f0104993d1ea3408f5b59ceab822 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Wed, 23 Jul 2008 14:25:22 +0000 Subject: [PATCH 033/168] PATCH: [ 2024587 ] Revised help topics Modifications per comments in forum. Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Compare_dirs.xml | 39 +++++++++--------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index 896216557e2..40d15fbc39a 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -58,14 +58,13 @@ <note> <title>Compare by Quick Contents option - WinMerge 2.4 introduced the Quick Contents - method for file comparison, described in . - This method can be useful when you compare big binary files; and it is - automatically used to compare files bigger than 4 MB. Possible - disadvantages are that line filters do not work, and there is no - difference counts information in the Folder Compare window. This should - not matter In most cases, because such large files are usually - binary. + The Quick Contents method for file comparison, + described in , can be useful when you + compare big binary files; and it is automatically used to compare files + bigger than 4 MB. Possible disadvantages are that line filters do not + work, and there is no difference counts information in the Folder Compare + window. This should not matter In most cases, because such large files are + usually binary. To use this method, configure it before your compare operation: in the Compare page of the WinMerge options, click the File Compare @@ -119,20 +118,6 @@ window is displayed with the results calculated at that time, omitting any uncompleted results. - - - Note to users of previous WinMerge versions - - The new Progress window was one of most visible changes in - WinMerge Version 2.6. The new design is simpler, eliminating details - that were not useful for comparing. Also, the window is closed - automatically because the data is no longer needed: you can view - statistics for the current results by clicking - View - - Compare Statistics - . -
      @@ -774,11 +759,9 @@ added/deleted/copied. User can create a new archive file using above menuitems i If you browse to a subfolder that exists only the left or - right side, the new result has two sides with identical files and - folders. For example, browsing to C:\work\ - opens C:\work\ as the left file and and - C:\work\ as the right file. (WinMerge 2.6 and - earlier versions prevented this usage). + right side, WinMerge can create a new, matching folder on the other + side. See for details. +       @@ -831,7 +814,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i
      - Browsing unique folders<indexterm> + <title id="CompareDirs_browse_unique">Browsing unique folders<indexterm> <primary>unique folders</primary> <secondary>comparing</secondary> From fae854c2dd40085151d522fec2059a3e925d2c87 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Fri, 25 Jul 2008 11:04:29 +0000 Subject: [PATCH 034/168] BUG: [ 2023734 ] Errors Moving Files - v.2.4.8.0 Unicode Disable moving protected items. --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/DirView.cpp | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 0d9f9a85591..df4779cc286 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -17,6 +17,7 @@ WinMerge 2.9.1.6 BugFix: Detected UTF-8 encoding shown as 65001 (#2012377) Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) + BugFix: Moving was allowed for protected items (#2023734) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/DirView.cpp b/Src/DirView.cpp index 0c377651809..3d678a84610 100644 --- a/Src/DirView.cpp +++ b/Src/DirView.cpp @@ -2885,7 +2885,14 @@ void CDirView::OnCtxtDirMoveRightTo() */ void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) { - DoUpdateCtxtDirMoveRightTo(pCmdUI); + // Because move deletes original item, origin side + // cannot be read-only + if (GetDocument()->GetReadOnly(FALSE)) + pCmdUI->Enable(FALSE); + else + { + DoUpdateCtxtDirMoveRightTo(pCmdUI); + } } /** @@ -2893,7 +2900,14 @@ void CDirView::OnUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI) */ void CDirView::OnUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI) { - DoUpdateCtxtDirMoveLeftTo(pCmdUI); + // Because move deletes original item, origin side + // cannot be read-only + if (GetDocument()->GetReadOnly(TRUE)) + pCmdUI->Enable(FALSE); + else + { + DoUpdateCtxtDirMoveLeftTo(pCmdUI); + } } /** From 02e59f0af427331e03c747b49f1003e49022ab2e Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Fri, 25 Jul 2008 11:15:23 +0000 Subject: [PATCH 035/168] PATCH: [ 2025781 ] Disable changing EOL for protected file --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/MergeEditView.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index df4779cc286..66f97246e43 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -18,6 +18,7 @@ WinMerge 2.9.1.6 Bugfix: Don't warn about closing multiple windows when only one window is open (#2010463) BugFix: Moving was allowed for protected items (#2023734) + BugFix: Could change EOL style for protected file (#2025781) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index cd7bf7bd915..c61c32cece7 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -2152,6 +2152,10 @@ void CMergeEditView::OnUpdateConvertEolTo(CCmdUI* pCmdUI) nStyle != m_pTextBuffer->GetCRLFMode()) { pCmdUI->SetRadio(FALSE); + + // Don't allow selecting other EOL style for protected pane + if (IsReadOnly(m_nThisPane)) + pCmdUI->Enable(FALSE); } else pCmdUI->SetRadio(TRUE); From dda38417b1f50f81e7c82b254479be133313e8a2 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Fri, 25 Jul 2008 11:48:35 +0000 Subject: [PATCH 036/168] PATCH: [ 2025472 ] Add Conflict Open to all menus --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/English.pot | 2410 +++++++++++++++++++------------------ Src/Merge.rc | 2 + 3 files changed, 1209 insertions(+), 1204 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 66f97246e43..58179e5eac6 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -11,6 +11,7 @@ WinMerge 2.9.1.6 New option to enable plugins (disabled by default) (#2013845) Add dialog listing available plugins (#2021722) Refresh compare after changing filter (#2017426) + Add "Open Conflict" for file/folder compare menus (#2025472) 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) diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index 15b7e5357f0..cd254c26869 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" 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-21 22:22+0000\n" +"POT-Creation-Date: 2008-07-25 14:47+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n" @@ -68,7 +68,7 @@ msgstr "" #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:502 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "" @@ -80,7 +80,7 @@ msgid "&Paste" msgstr "" #: Merge.rc:84 -#: Merge.rc:583 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "" @@ -91,62 +91,64 @@ msgid "Op&en" msgstr "" #: Merge.rc:88 -#: Merge.rc:525 -#: Merge.rc:531 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "" #: Merge.rc:89 -#: Merge.rc:526 -#: Merge.rc:532 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "" #: Merge.rc:90 -#: Merge.rc:527 -#: Merge.rc:533 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "" #: Merge.rc:110 #: Merge.rc:191 -#: Merge.rc:307 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "" #: Merge.rc:112 #: Merge.rc:193 -#: Merge.rc:309 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "" #: Merge.rc:113 #: Merge.rc:194 -#: Merge.rc:310 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "" #: Merge.rc:116 -#: Merge.rc:196 -#: Merge.rc:312 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "" #: Merge.rc:117 -#: Merge.rc:197 -#: Merge.rc:313 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "" @@ -157,2558 +159,2556 @@ msgid "Recent Projects" msgstr "" #: Merge.rc:121 -#: Merge.rc:204 -#: Merge.rc:345 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "" #: Merge.rc:123 -#: Merge.rc:206 -#: Merge.rc:347 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "" #: Merge.rc:125 -#: Merge.rc:210 -#: Merge.rc:381 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "" #: Merge.rc:127 -#: Merge.rc:212 -#: Merge.rc:383 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "" #: Merge.rc:129 -#: Merge.rc:223 -#: Merge.rc:385 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "" #: Merge.rc:130 -#: Merge.rc:224 -#: Merge.rc:386 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "" #: Merge.rc:132 -#: Merge.rc:226 -#: Merge.rc:407 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "" #: Merge.rc:134 -#: Merge.rc:228 -#: Merge.rc:409 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "" #: Merge.rc:135 -#: Merge.rc:229 -#: Merge.rc:410 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "" #: Merge.rc:136 -#: Merge.rc:230 -#: Merge.rc:411 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "" #: Merge.rc:138 -#: Merge.rc:232 -#: Merge.rc:413 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "" #: Merge.rc:139 -#: Merge.rc:233 -#: Merge.rc:414 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "" #: Merge.rc:141 -#: Merge.rc:236 -#: Merge.rc:418 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "" #: Merge.rc:143 -#: Merge.rc:257 -#: Merge.rc:440 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "" #: Merge.rc:145 -#: Merge.rc:260 -#: Merge.rc:442 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "" #: Merge.rc:146 -#: Merge.rc:261 -#: Merge.rc:443 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "" #: Merge.rc:148 -#: Merge.rc:264 -#: Merge.rc:446 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "" #: Merge.rc:150 -#: Merge.rc:266 -#: Merge.rc:448 +#: Merge.rc:267 +#: Merge.rc:450 #, c-format msgid "&List..." msgstr "" #: Merge.rc:152 -#: Merge.rc:268 -#: Merge.rc:450 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "" #: Merge.rc:153 -#: Merge.rc:269 -#: Merge.rc:451 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "" #: Merge.rc:155 -#: Merge.rc:271 -#: Merge.rc:453 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "" #: Merge.rc:157 -#: Merge.rc:273 -#: Merge.rc:460 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "" #: Merge.rc:159 -#: Merge.rc:275 -#: Merge.rc:462 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "" #: Merge.rc:161 -#: Merge.rc:277 -#: Merge.rc:464 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "" #: Merge.rc:162 -#: Merge.rc:278 -#: Merge.rc:465 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "" #: Merge.rc:164 -#: Merge.rc:280 -#: Merge.rc:467 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "" #: Merge.rc:166 -#: Merge.rc:282 -#: Merge.rc:469 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "" #: Merge.rc:167 -#: Merge.rc:283 -#: Merge.rc:470 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "" #: Merge.rc:169 -#: Merge.rc:285 -#: Merge.rc:472 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "" #: Merge.rc:171 -#: Merge.rc:287 -#: Merge.rc:474 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "" #: Merge.rc:172 -#: Merge.rc:288 -#: Merge.rc:475 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "" #: Merge.rc:173 -#: Merge.rc:289 -#: Merge.rc:476 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "" #: Merge.rc:175 -#: Merge.rc:291 -#: Merge.rc:478 -#: Merge.rc:1911 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "" #: Merge.rc:177 -#: Merge.rc:293 -#: Merge.rc:480 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "" #: Merge.rc:179 -#: Merge.rc:295 -#: Merge.rc:482 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "" #: Merge.rc:180 -#: Merge.rc:296 -#: Merge.rc:483 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "" #: Merge.rc:181 -#: Merge.rc:297 -#: Merge.rc:484 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "" #: Merge.rc:182 -#: Merge.rc:298 -#: Merge.rc:485 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "" #: Merge.rc:184 -#: Merge.rc:300 -#: Merge.rc:487 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "" #: Merge.rc:185 -#: Merge.rc:301 -#: Merge.rc:488 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr "" -#: Merge.rc:199 -#: Merge.rc:331 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "" -#: Merge.rc:200 -#: Merge.rc:332 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "" -#: Merge.rc:202 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "" -#: Merge.rc:208 -#: Merge.rc:357 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "" -#: Merge.rc:214 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "" -#: Merge.rc:215 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "" -#: Merge.rc:216 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "" -#: Merge.rc:217 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "" -#: Merge.rc:218 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "" -#: Merge.rc:219 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "" -#: Merge.rc:221 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "" -#: Merge.rc:234 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "" -#: Merge.rc:238 -#: Merge.rc:420 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "" -#: Merge.rc:239 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "" -#: Merge.rc:241 -#: Merge.rc:422 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "" -#: Merge.rc:243 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "" -#: Merge.rc:245 -#: Merge.rc:424 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "" -#: Merge.rc:246 -#: Merge.rc:425 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "" -#: Merge.rc:248 -#: Merge.rc:427 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "" -#: Merge.rc:249 -#: Merge.rc:428 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "" -#: Merge.rc:250 -#: Merge.rc:429 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "" -#: Merge.rc:252 -#: Merge.rc:431 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "" -#: Merge.rc:253 -#: Merge.rc:432 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "" -#: Merge.rc:255 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "" -#: Merge.rc:259 -#: Merge.rc:556 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "" -#: Merge.rc:262 -#: Merge.rc:444 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "" -#: Merge.rc:315 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "" -#: Merge.rc:316 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "" -#: Merge.rc:318 -#: Merge.rc:323 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "" -#: Merge.rc:319 -#: Merge.rc:324 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "" -#: Merge.rc:321 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "" -#: Merge.rc:327 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "" -#: Merge.rc:328 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "" -#: Merge.rc:329 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "" -#: Merge.rc:334 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "" -#: Merge.rc:336 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "" -#: Merge.rc:337 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "" -#: Merge.rc:338 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "" -#: Merge.rc:341 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "" -#: Merge.rc:343 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "" -#: Merge.rc:349 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "" -#: Merge.rc:350 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "" -#: Merge.rc:352 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "" -#: Merge.rc:353 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "" -#: Merge.rc:354 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "" -#: Merge.rc:356 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "" -#: Merge.rc:359 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "" -#: Merge.rc:360 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "" -#: Merge.rc:362 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "" -#: Merge.rc:364 -#: Merge.rc:2744 +#: Merge.rc:366 +#: Merge.rc:2746 #, c-format msgid "< Empty >" msgstr "" -#: Merge.rc:367 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "" -#: Merge.rc:369 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "" -#: Merge.rc:372 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "" -#: Merge.rc:374 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "" -#: Merge.rc:375 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "" -#: Merge.rc:376 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "" -#: Merge.rc:377 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "" -#: Merge.rc:379 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "" -#: Merge.rc:387 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "" -#: Merge.rc:389 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "" -#: Merge.rc:390 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "" #. Zoom to normal -#: Merge.rc:391 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "" -#: Merge.rc:393 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "" -#: Merge.rc:398 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "" -#: Merge.rc:399 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "" -#: Merge.rc:400 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "" -#: Merge.rc:401 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "" -#: Merge.rc:402 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "" -#: Merge.rc:403 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "" -#: Merge.rc:405 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "" -#: Merge.rc:415 +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "" -#: Merge.rc:416 +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" msgstr "" -#: Merge.rc:434 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "" -#: Merge.rc:435 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "" -#: Merge.rc:437 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "" -#: Merge.rc:438 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "" -#: Merge.rc:455 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "" -#: Merge.rc:496 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "" -#: Merge.rc:497 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "" -#: Merge.rc:499 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "" -#: Merge.rc:504 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "" -#: Merge.rc:505 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "" -#: Merge.rc:506 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "" -#: Merge.rc:507 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "" -#: Merge.rc:509 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "" -#: Merge.rc:511 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "" -#: Merge.rc:512 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "" -#: Merge.rc:514 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "" -#: Merge.rc:516 -#: Merge.rc:1134 -#: Merge.rc:1516 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "" -#: Merge.rc:517 -#: Merge.rc:1136 -#: Merge.rc:1519 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "" -#: Merge.rc:518 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "" -#: Merge.rc:520 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "" -#: Merge.rc:521 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "" -#: Merge.rc:523 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "" -#: Merge.rc:529 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "" -#: Merge.rc:536 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "" -#: Merge.rc:538 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "" -#: Merge.rc:539 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "" -#: Merge.rc:540 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "" -#: Merge.rc:542 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "" -#: Merge.rc:544 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "" -#: Merge.rc:546 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "" -#: Merge.rc:547 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "" -#: Merge.rc:548 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "" -#: Merge.rc:549 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "" -#: Merge.rc:552 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "" -#: Merge.rc:564 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "" -#: Merge.rc:565 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "" -#: Merge.rc:571 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "" -#: Merge.rc:573 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "" -#: Merge.rc:574 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "" -#: Merge.rc:582 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "" -#: Merge.rc:585 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "" -#: Merge.rc:586 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "" -#: Merge.rc:587 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "" -#: Merge.rc:656 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr "" -#: Merge.rc:662 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "" -#: Merge.rc:663 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "" -#: Merge.rc:664 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "" -#: Merge.rc:667 -#: Merge.rc:699 -#: Merge.rc:789 -#: Merge.rc:975 -#: Merge.rc:1053 -#: Merge.rc:1082 -#: Merge.rc:1092 -#: Merge.rc:1258 -#: Merge.rc:1322 -#: Merge.rc:1335 -#: Merge.rc:1427 -#: Merge.rc:1442 -#: Merge.rc:1664 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "" -#: Merge.rc:668 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "" -#: Merge.rc:675 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "" -#: Merge.rc:678 -#: Merge.rc:1593 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "" -#: Merge.rc:682 -#: Merge.rc:743 -#: Merge.rc:996 -#: Merge.rc:1018 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "" -#: Merge.rc:683 -#: Merge.rc:1597 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "" -#: Merge.rc:687 -#: Merge.rc:1029 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "" -#: Merge.rc:688 -#: Merge.rc:1601 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "" -#: Merge.rc:691 -#: Merge.rc:1603 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "" -#: Merge.rc:692 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "" -#: Merge.rc:695 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "" -#: Merge.rc:696 -#: Merge.rc:1604 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "" -#: Merge.rc:698 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "" -#: Merge.rc:700 -#: Merge.rc:730 -#: Merge.rc:790 -#: Merge.rc:820 -#: Merge.rc:852 -#: Merge.rc:862 -#: Merge.rc:1054 -#: Merge.rc:1083 -#: Merge.rc:1093 -#: Merge.rc:1144 -#: Merge.rc:1259 -#: Merge.rc:1336 -#: Merge.rc:1428 -#: Merge.rc:1443 -#: Merge.rc:1665 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:701 -#: Merge.rc:1337 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:702 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "" -#: Merge.rc:709 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "" -#: Merge.rc:714 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "" -#: Merge.rc:717 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "" -#: Merge.rc:720 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "" -#: Merge.rc:722 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "" -#: Merge.rc:724 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "" -#: Merge.rc:726 -#: Merge.rc:867 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "" -#: Merge.rc:728 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "" -#: Merge.rc:729 -#: Merge.rc:863 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "" -#: Merge.rc:735 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "" -#: Merge.rc:738 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "" -#: Merge.rc:741 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "" -#: Merge.rc:748 -#: Merge.rc:1919 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "" -#: Merge.rc:751 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "" -#: Merge.rc:754 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "" -#: Merge.rc:756 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr "" -#: Merge.rc:758 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "" -#: Merge.rc:761 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "" -#: Merge.rc:763 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "" -#: Merge.rc:765 +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "" -#: Merge.rc:768 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "" -#: Merge.rc:771 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "" -#: Merge.rc:773 -#: Merge.rc:1616 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "" -#: Merge.rc:775 -#: Merge.rc:1618 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "" -#: Merge.rc:777 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "" -#: Merge.rc:779 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "" -#: Merge.rc:786 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "" -#: Merge.rc:793 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "" -#: Merge.rc:799 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "" -#: Merge.rc:802 -#: Merge.rc:829 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "" -#: Merge.rc:805 -#: Merge.rc:835 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "" -#: Merge.rc:807 -#: Merge.rc:837 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "" -#: Merge.rc:809 -#: Merge.rc:839 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "" -#: Merge.rc:811 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "" -#: Merge.rc:814 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "" -#: Merge.rc:815 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "" -#: Merge.rc:817 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "" -#: Merge.rc:819 -#: Merge.rc:849 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "" -#: Merge.rc:826 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "" -#: Merge.rc:832 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "" -#: Merge.rc:841 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "" -#: Merge.rc:844 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:845 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "" -#: Merge.rc:847 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "" -#: Merge.rc:850 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "" -#: Merge.rc:851 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "" -#: Merge.rc:858 -#: Merge.rc:2160 +#: Merge.rc:860 +#: Merge.rc:2162 #, c-format msgid "Rational ClearCase" msgstr "" -#: Merge.rc:861 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "" -#: Merge.rc:866 -#: Merge.rc:1178 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "" -#: Merge.rc:869 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "" -#: Merge.rc:875 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "" -#: Merge.rc:878 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "" -#: Merge.rc:881 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr "" -#: Merge.rc:888 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "" -#: Merge.rc:889 +#: Merge.rc:891 #, c-format msgid "New" msgstr "" -#: Merge.rc:890 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "" -#: Merge.rc:891 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:896 -#: Merge.rc:1922 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "" -#: Merge.rc:899 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "" -#: Merge.rc:903 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "" -#: Merge.rc:907 -#: Merge.rc:1568 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "" -#: Merge.rc:908 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "" -#: Merge.rc:921 -#: Merge.rc:1363 -#: Merge.rc:1569 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "" -#: Merge.rc:925 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "" -#: Merge.rc:935 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "" -#: Merge.rc:945 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "" -#: Merge.rc:952 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "" -#: Merge.rc:959 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "" -#: Merge.rc:966 -#: Merge.rc:1052 -#: Merge.rc:1081 -#: Merge.rc:1181 -#: Merge.rc:1409 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "" -#: Merge.rc:972 -#: Merge.rc:1351 -#: Merge.rc:1557 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:982 -#: Merge.rc:1925 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "" -#: Merge.rc:985 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "" -#: Merge.rc:987 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "" -#: Merge.rc:988 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "" -#: Merge.rc:990 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "" -#: Merge.rc:992 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "" -#: Merge.rc:994 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "" -#: Merge.rc:997 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "" -#: Merge.rc:999 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "" -#: Merge.rc:1000 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "" -#: Merge.rc:1001 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "" -#: Merge.rc:1003 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "" -#: Merge.rc:1006 -#: Merge.rc:1022 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "" -#: Merge.rc:1012 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "" -#: Merge.rc:1015 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "" -#: Merge.rc:1019 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "" -#: Merge.rc:1023 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "" -#: Merge.rc:1024 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "" -#: Merge.rc:1026 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "" -#: Merge.rc:1030 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "" -#: Merge.rc:1031 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "" -#: Merge.rc:1034 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "" -#: Merge.rc:1037 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "" -#: Merge.rc:1038 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "" -#: Merge.rc:1040 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "" -#: Merge.rc:1042 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "" -#: Merge.rc:1044 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "" -#: Merge.rc:1046 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "" -#: Merge.rc:1048 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "" -#: Merge.rc:1050 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "" -#: Merge.rc:1072 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1078 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "" -#: Merge.rc:1079 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "" -#: Merge.rc:1089 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "" -#: Merge.rc:1094 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "" -#: Merge.rc:1097 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "" -#: Merge.rc:1100 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "" -#: Merge.rc:1101 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "" -#: Merge.rc:1112 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "" -#: Merge.rc:1115 -#: Merge.rc:1872 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1120 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "" -#: Merge.rc:1121 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "" -#: Merge.rc:1122 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "" -#: Merge.rc:1128 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1131 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "" -#: Merge.rc:1133 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "" -#: Merge.rc:1138 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1139 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "" -#: Merge.rc:1141 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "" -#: Merge.rc:1143 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "" -#: Merge.rc:1149 -#: Merge.rc:1920 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1152 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "" -#: Merge.rc:1153 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "" -#: Merge.rc:1155 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "" -#: Merge.rc:1157 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "" -#: Merge.rc:1159 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "" -#: Merge.rc:1161 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "" -#: Merge.rc:1163 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "" -#: Merge.rc:1166 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "" -#: Merge.rc:1168 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "" -#: Merge.rc:1170 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "" -#: Merge.rc:1173 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "" -#: Merge.rc:1176 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "" -#: Merge.rc:1179 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "" -#: Merge.rc:1186 -#: Merge.rc:1921 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "" -#: Merge.rc:1189 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "" -#: Merge.rc:1191 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "" -#: Merge.rc:1193 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "" -#: Merge.rc:1195 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1196 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "" -#: Merge.rc:1199 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "" -#: Merge.rc:1201 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "" -#: Merge.rc:1203 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "" -#: Merge.rc:1205 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "" -#: Merge.rc:1207 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "" -#: Merge.rc:1209 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "" -#: Merge.rc:1224 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "" -#: Merge.rc:1230 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1231 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "" -#: Merge.rc:1232 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "" -#: Merge.rc:1233 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "" -#: Merge.rc:1234 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "" -#: Merge.rc:1240 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "" -#: Merge.rc:1243 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "" -#: Merge.rc:1246 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "" -#: Merge.rc:1248 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "" -#: Merge.rc:1250 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "" -#: Merge.rc:1253 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "" -#: Merge.rc:1255 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "" -#: Merge.rc:1257 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1264 -#: Merge.rc:1512 -#: Merge.rc:1927 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "" -#: Merge.rc:1267 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "" -#: Merge.rc:1268 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "" -#: Merge.rc:1270 +#: Merge.rc:1272 #, c-format msgid "Detect codepage info for these files : .html, .rc, .xml \nneed to restart session" msgstr "" -#: Merge.rc:1273 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "" -#: Merge.rc:1275 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "" -#: Merge.rc:1277 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "" -#: Merge.rc:1285 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "" -#: Merge.rc:1288 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "" -#: Merge.rc:1291 +#: Merge.rc:1293 #, c-format msgid "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\nessential components to be copied to the program directory for standalone operation." msgstr "" -#: Merge.rc:1293 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "" -#: Merge.rc:1295 +#: Merge.rc:1297 #, c-format msgid "Please use the version of 7-Zip recommended below until interface plugins for later\nversions become available." msgstr "" -#: Merge.rc:1297 +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "" -#: Merge.rc:1299 +#: Merge.rc:1301 #, c-format msgid "Plugin required\n(dllbuild %04u)" msgstr "" -#: Merge.rc:1301 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "" -#: Merge.rc:1304 -#: Merge.rc:1307 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "" -#: Merge.rc:1305 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "" -#: Merge.rc:1308 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "" -#: Merge.rc:1310 -#: Merge.rc:1315 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "" -#: Merge.rc:1312 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "" -#: Merge.rc:1313 +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "" -#: Merge.rc:1317 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "" -#: Merge.rc:1318 +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "" -#: Merge.rc:1319 +#: Merge.rc:1321 #, c-format msgid "Don't display this &message again.\n(You can always recall this message from the Help menu.)" msgstr "" -#: Merge.rc:1323 +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "" -#: Merge.rc:1332 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "" -#: Merge.rc:1343 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1345 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "" -#: Merge.rc:1346 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "" -#: Merge.rc:1354 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "" -#: Merge.rc:1355 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "" -#: Merge.rc:1356 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "" -#: Merge.rc:1357 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "" -#: Merge.rc:1358 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "" -#: Merge.rc:1359 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "" -#: Merge.rc:1360 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "" -#: Merge.rc:1361 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "" -#: Merge.rc:1362 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "" -#: Merge.rc:1367 -#: Merge.rc:1372 -#: Merge.rc:1377 -#: Merge.rc:1382 -#: Merge.rc:1387 -#: Merge.rc:1392 -#: Merge.rc:1397 -#: Merge.rc:1402 -#: Merge.rc:1407 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1415 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "" -#: Merge.rc:1418 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "" -#: Merge.rc:1421 -#: Merge.rc:1595 -#: Merge.rc:1599 -#: Merge.rc:1626 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "" -#: Merge.rc:1422 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "" -#: Merge.rc:1425 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "" -#: Merge.rc:1433 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "" -#: Merge.rc:1436 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "" -#: Merge.rc:1438 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "" -#: Merge.rc:1440 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "" -#: Merge.rc:1448 -#: Merge.rc:1928 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "" -#: Merge.rc:1451 +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" msgstr "" -#: Merge.rc:1453 +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "" -#: Merge.rc:1454 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "" -#: Merge.rc:1456 +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "" -#: Merge.rc:1459 +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "" -#: Merge.rc:1461 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "" -#: Merge.rc:1469 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "" -#: Merge.rc:1472 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "" -#: Merge.rc:1473 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "" -#: Merge.rc:1474 -#: Merge.rc:2302 +#: Merge.rc:1476 +#: Merge.rc:2304 #, c-format msgid "Different" msgstr "" -#: Merge.rc:1475 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "" -#: Merge.rc:1478 -#: Merge.rc:1497 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "" -#: Merge.rc:1481 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "" -#: Merge.rc:1482 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "" -#: Merge.rc:1487 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "" -#: Merge.rc:1492 -#: Merge.rc:2297 +#: Merge.rc:1494 +#: Merge.rc:2299 #, c-format msgid "Identical" msgstr "" -#: Merge.rc:1501 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "" -#: Merge.rc:1506 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1515 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "" -#: Merge.rc:1518 -#: Merge.rc:1521 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "" -#: Merge.rc:1522 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "" -#: Merge.rc:1523 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "" -#: Merge.rc:1525 -#: Merge.rc:1528 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "" -#: Merge.rc:1526 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "" -#: Merge.rc:1529 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "" -#: Merge.rc:1532 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "" -#: Merge.rc:1533 -#: Merge.rc:1894 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "" -#: Merge.rc:1538 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "" -#: Merge.rc:1541 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "" -#: Merge.rc:1543 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "" -#: Merge.rc:1545 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "" -#: Merge.rc:1547 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "" -#: Merge.rc:1551 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "" -#: Merge.rc:1552 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "" -#: Merge.rc:1560 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "" -#: Merge.rc:1563 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "" -#: Merge.rc:1565 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "" -#: Merge.rc:1566 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "" -#: Merge.rc:1567 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "" -#: Merge.rc:1590 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "" -#: Merge.rc:1596 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "" -#: Merge.rc:1600 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "" -#: Merge.rc:1606 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "" -#: Merge.rc:1607 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "" -#: Merge.rc:1612 -#: Merge.rc:1929 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "" -#: Merge.rc:1615 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "" -#: Merge.rc:1620 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "" -#: Merge.rc:1621 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "" -#: Merge.rc:1623 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "" -#: Merge.rc:1627 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "" -#: Merge.rc:1628 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "" -#: Merge.rc:1630 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "" -#: Merge.rc:1637 +#: Merge.rc:1639 #, c-format msgid "Confirm Copy" msgstr "" -#: Merge.rc:1641 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "" -#: Merge.rc:1643 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "" -#: Merge.rc:1646 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "" -#: Merge.rc:1649 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "" -#: Merge.rc:1650 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "" -#: Merge.rc:1656 +#: Merge.rc:1658 #, c-format msgid "Plugins" msgstr "" -#: Merge.rc:1659 +#: Merge.rc:1661 #, c-format msgid "&Enable plugins" msgstr "" #. StringFileInfo.Block -#: Merge.rc:1689 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "" #. VarFileInfo.Translation -#: Merge.rc:1705 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "" -#: Merge.rc:1720 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "" -#: Merge.rc:1726 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "" -#: Merge.rc:1727 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "" -#: Merge.rc:1728 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "" -#: Merge.rc:1729 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "" -#: Merge.rc:1730 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "" -#: Merge.rc:1731 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "" -#: Merge.rc:1737 +#: Merge.rc:1739 #, c-format msgid "Create empty documents\nNew Documents (Ctrl+N)" msgstr "" -#: Merge.rc:1738 +#: Merge.rc:1740 #, c-format msgid "Open an existing document\nOpen (Ctrl+O)" msgstr "" -#: Merge.rc:1739 +#: Merge.rc:1741 #, c-format msgid "Close the active document\nClose" msgstr "" -#: Merge.rc:1740 +#: Merge.rc:1742 #, c-format msgid "Save the active document\nSave (Ctrl+S)" msgstr "" -#: Merge.rc:1741 +#: Merge.rc:1743 #, c-format msgid "Save the active document with a new name\nSave As" msgstr "" -#: Merge.rc:1742 +#: Merge.rc:1744 #, c-format msgid "Change the printing options\nPage Setup" msgstr "" -#: Merge.rc:1743 +#: Merge.rc:1745 #, c-format msgid "Change the printer and printing options\nPrint Setup" msgstr "" -#: Merge.rc:1744 +#: Merge.rc:1746 #, c-format msgid "Print the active document\nPrint" msgstr "" -#: Merge.rc:1745 +#: Merge.rc:1747 #, c-format msgid "Display full pages\nPrint Preview" msgstr "" -#: Merge.rc:1750 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "" -#: Merge.rc:1756 +#: Merge.rc:1758 #, c-format msgid "Open project file\nProject file (Ctrl+J)" msgstr "" -#: Merge.rc:1757 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "" -#: Merge.rc:1758 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "" -#: Merge.rc:1759 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "" -#: Merge.rc:1760 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "" -#: Merge.rc:1761 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "" -#: Merge.rc:1762 +#: Merge.rc:1764 #, c-format msgid "Save current paths and options to project file\nSave Project File" msgstr "" -#: Merge.rc:1767 +#: Merge.rc:1769 #, c-format msgid "Display program information, version number and copyright\nAbout" msgstr "" -#: Merge.rc:1768 +#: Merge.rc:1770 #, c-format msgid "Quit the application; prompts to save documents\nExit" msgstr "" -#: Merge.rc:1774 -#: Merge.rc:1775 #: Merge.rc:1776 #: Merge.rc:1777 #: Merge.rc:1778 @@ -2723,2795 +2723,2797 @@ msgstr "" #: Merge.rc:1787 #: Merge.rc:1788 #: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "" -#: Merge.rc:1794 +#: Merge.rc:1796 #, c-format msgid "Switch to the next window pane\nNext Pane" msgstr "" -#: Merge.rc:1795 +#: Merge.rc:1797 #, c-format msgid "Switch back to the previous window pane\nPrevious Pane" msgstr "" -#: Merge.rc:1801 +#: Merge.rc:1803 #, c-format msgid "Arrange windows so they overlap\nCascade Windows" msgstr "" -#: Merge.rc:1802 +#: Merge.rc:1804 #, c-format msgid "Arrange windows as non-overlapping tiles horizontally\nTile Windows Horizontally" msgstr "" -#: Merge.rc:1803 +#: Merge.rc:1805 #, c-format msgid "Arrange windows as non-overlapping tiles vertically\nTile Windows Vertically" msgstr "" -#: Merge.rc:1809 +#: Merge.rc:1811 #, c-format msgid "Copy the selection and put it on the Clipboard\nCopy" msgstr "" -#: Merge.rc:1810 +#: Merge.rc:1812 #, c-format msgid "Cut the selection and put it on the Clipboard\nCut" msgstr "" -#: Merge.rc:1811 +#: Merge.rc:1813 #, c-format msgid "Find the specified text\nFind" msgstr "" -#: Merge.rc:1812 +#: Merge.rc:1814 #, c-format msgid "Insert Clipboard contents\nPaste" msgstr "" -#: Merge.rc:1813 +#: Merge.rc:1815 #, c-format msgid "Repeat the last action\nRepeat" msgstr "" -#: Merge.rc:1814 +#: Merge.rc:1816 #, c-format msgid "Replace specific text with different text\nReplace" msgstr "" -#: Merge.rc:1815 +#: Merge.rc:1817 #, c-format msgid "Select the entire document\nSelect All" msgstr "" -#: Merge.rc:1816 +#: Merge.rc:1818 #, c-format msgid "Undo the last action\nUndo (Ctrl+Z)" msgstr "" -#: Merge.rc:1817 +#: Merge.rc:1819 #, c-format msgid "Redo the previously undone action\nRedo (Ctrl+Y)" msgstr "" -#: Merge.rc:1823 +#: Merge.rc:1825 #, c-format msgid "Show or hide the toolbar\nToggle ToolBar" msgstr "" -#: Merge.rc:1824 +#: Merge.rc:1826 #, c-format msgid "Show or hide the status bar\nToggle StatusBar" msgstr "" -#: Merge.rc:1825 +#: Merge.rc:1827 #, c-format msgid "Show or hide the tab bar\nToggle TabBar" msgstr "" -#: Merge.rc:1826 +#: Merge.rc:1828 #, c-format msgid "Automatically resize panes\nLock Panes" msgstr "" -#: Merge.rc:1832 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "" -#: Merge.rc:1833 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "" -#: Merge.rc:1834 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "" -#: Merge.rc:1835 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "" -#: Merge.rc:1836 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "" -#: Merge.rc:1837 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "" -#: Merge.rc:1838 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "" -#: Merge.rc:1843 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "" -#: Merge.rc:1844 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "" -#: Merge.rc:1845 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "" -#: Merge.rc:1851 +#: Merge.rc:1853 #, c-format msgid "Close print preview mode\nCancel Preview" msgstr "" -#: Merge.rc:1858 +#: Merge.rc:1860 #, c-format msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare" msgstr "" -#: Merge.rc:1859 +#: Merge.rc:1861 #, c-format msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare" msgstr "" -#: Merge.rc:1866 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "" -#: Merge.rc:1873 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "" -#: Merge.rc:1879 -#: Merge.rc:1880 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "" -#: Merge.rc:1886 +#: Merge.rc:1888 #, c-format msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -#: Merge.rc:1887 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "" -#: Merge.rc:1893 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "" -#: Merge.rc:1895 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "" -#: Merge.rc:1896 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "" -#: Merge.rc:1897 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "" -#: Merge.rc:1898 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "" -#: Merge.rc:1899 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "" -#: Merge.rc:1905 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "" -#: Merge.rc:1906 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "" -#: Merge.rc:1907 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "" -#: Merge.rc:1908 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "" -#: Merge.rc:1909 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "" -#: Merge.rc:1910 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "" -#: Merge.rc:1912 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "" -#: Merge.rc:1913 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "" -#: Merge.rc:1923 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "" -#: Merge.rc:1924 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "" -#: Merge.rc:1926 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1936 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "" -#: Merge.rc:1937 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "" -#: Merge.rc:1938 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "" -#: Merge.rc:1939 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "" -#: Merge.rc:1940 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "" -#: Merge.rc:1946 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr "" -#: Merge.rc:1947 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "" -#: Merge.rc:1953 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "" -#: Merge.rc:1954 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "" -#: Merge.rc:1955 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "" -#: Merge.rc:1956 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "" -#: Merge.rc:1958 +#: Merge.rc:1960 #, c-format msgid "Value in Tab size -field is not in range WinMerge accepts.\n\nPlease use values 1 - %1." msgstr "" -#: Merge.rc:1960 +#: Merge.rc:1962 #, c-format msgid "Are you sure you want to reset all WinMerge options to default values?\n\nPlease re-start WinMerge after the reset." msgstr "" -#: Merge.rc:1966 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "" -#: Merge.rc:1967 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1968 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1969 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "" -#: Merge.rc:1971 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1977 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1978 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1979 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:1985 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "" -#: Merge.rc:1986 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "" -#: Merge.rc:1987 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "" -#: Merge.rc:1988 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "" -#: Merge.rc:1994 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "" -#: Merge.rc:1995 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "" -#: Merge.rc:1996 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "" -#: Merge.rc:1997 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "" -#: Merge.rc:1998 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "" -#: Merge.rc:2004 -#: Merge.rc:2608 +#: Merge.rc:2006 +#: Merge.rc:2610 #, c-format msgid "Name" msgstr "" -#: Merge.rc:2005 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "" -#: Merge.rc:2006 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "" -#: Merge.rc:2007 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "" -#: Merge.rc:2008 -#: Merge.rc:2610 +#: Merge.rc:2010 +#: Merge.rc:2612 #, c-format msgid "Description" msgstr "" -#: Merge.rc:2009 +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "" -#: Merge.rc:2010 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "" -#: Merge.rc:2012 +#: Merge.rc:2014 #, c-format msgid "Cannot find file filter template file!\n\nPlease copy file %1 to WinMerge/Filters -folder:\n%2." msgstr "" -#: Merge.rc:2014 +#: Merge.rc:2016 #, c-format msgid "Cannot copy filter template file to filter folder:\n%1\n\nPlease make sure the folder exists and is writable." msgstr "" -#: Merge.rc:2016 +#: Merge.rc:2018 #, c-format msgid "User's filter file folder is not defined!\n\nPlease select filter folder in Options/System." msgstr "" -#: Merge.rc:2018 +#: Merge.rc:2020 #, c-format msgid "Failed to delete the filter file:\n%1\n\nMaybe the file is read-only?" msgstr "" -#: Merge.rc:2019 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "" -#: Merge.rc:2021 +#: Merge.rc:2023 #, c-format msgid "Installing filter file failed.\n\nCould not copy new filter file to filter folder." msgstr "" -#: Merge.rc:2023 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "" -#: Merge.rc:2029 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2035 +#: Merge.rc:2037 #, c-format msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later." msgstr "" -#: Merge.rc:2041 +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "" -#: Merge.rc:2042 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "" -#: Merge.rc:2048 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "" -#: Merge.rc:2049 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "" -#: Merge.rc:2050 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "" -#: Merge.rc:2051 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "" -#: Merge.rc:2052 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "" -#: Merge.rc:2053 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "" -#: Merge.rc:2059 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "" -#: Merge.rc:2060 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "" -#: Merge.rc:2061 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "" -#: Merge.rc:2062 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "" -#: Merge.rc:2063 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "" -#: Merge.rc:2064 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "" -#: Merge.rc:2065 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "" -#: Merge.rc:2066 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "" -#: Merge.rc:2067 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "" -#: Merge.rc:2068 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "" -#: Merge.rc:2074 +#: Merge.rc:2076 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2075 +#: Merge.rc:2077 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2076 +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2079 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2078 +#: Merge.rc:2080 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2079 +#: Merge.rc:2081 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2080 +#: Merge.rc:2082 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2081 +#: Merge.rc:2083 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2087 +#: Merge.rc:2089 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2088 +#: Merge.rc:2090 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2094 +#: Merge.rc:2096 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2095 +#: Merge.rc:2097 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2096 +#: Merge.rc:2098 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2099 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2100 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2099 +#: Merge.rc:2101 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2100 +#: Merge.rc:2102 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2103 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2107 +#: Merge.rc:2109 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2108 +#: Merge.rc:2110 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2111 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2110 +#: Merge.rc:2112 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2113 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2117 +#: Merge.rc:2119 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2118 +#: Merge.rc:2120 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2121 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2122 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2123 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2125 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2124 +#: Merge.rc:2126 #, 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:2125 +#: Merge.rc:2127 #, 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:2126 +#: Merge.rc:2128 #, 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:2127 +#: Merge.rc:2129 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2128 +#: Merge.rc:2130 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2129 +#: Merge.rc:2131 #, 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:2130 +#: Merge.rc:2132 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2131 +#: Merge.rc:2133 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2137 +#: Merge.rc:2139 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2143 +#: Merge.rc:2145 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2144 +#: Merge.rc:2146 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2147 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2148 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2147 +#: Merge.rc:2149 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2148 +#: Merge.rc:2150 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2149 +#: Merge.rc:2151 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2152 #, 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:2151 +#: Merge.rc:2153 #, 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:2157 -#: Merge.rc:2592 -#: Merge.rc:2780 +#: Merge.rc:2159 +#: Merge.rc:2594 +#: Merge.rc:2782 #, c-format msgid "None" msgstr "" -#: Merge.rc:2158 +#: Merge.rc:2160 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2159 +#: Merge.rc:2161 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2161 +#: Merge.rc:2163 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2162 +#: Merge.rc:2164 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2168 #: Merge.rc:2170 +#: Merge.rc:2172 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2169 #: Merge.rc:2171 +#: Merge.rc:2173 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2174 +#: Merge.rc:2176 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2175 +#: Merge.rc:2177 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2178 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2179 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2180 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2180 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2181 -#: Merge.rc:2197 +#: Merge.rc:2183 +#: Merge.rc:2199 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2182 -#: Merge.rc:2198 +#: Merge.rc:2184 +#: Merge.rc:2200 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2183 -#: Merge.rc:2199 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2184 -#: Merge.rc:2200 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2190 +#: Merge.rc:2192 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2191 +#: Merge.rc:2193 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2194 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2195 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2196 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2197 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2198 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2201 +#: Merge.rc:2203 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2202 +#: Merge.rc:2204 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2205 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2206 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2210 +#: Merge.rc:2212 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2211 +#: Merge.rc:2213 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2214 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2213 +#: Merge.rc:2215 #, 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:2219 +#: Merge.rc:2221 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2220 +#: Merge.rc:2222 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2221 +#: Merge.rc:2223 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2222 +#: Merge.rc:2224 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2223 +#: Merge.rc:2225 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2224 +#: Merge.rc:2226 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2227 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2228 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2229 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2230 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2231 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2232 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2238 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2237 +#: Merge.rc:2239 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2238 +#: Merge.rc:2240 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2239 +#: Merge.rc:2241 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2240 +#: Merge.rc:2242 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2244 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2246 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:2252 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2251 +#: Merge.rc:2253 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2252 +#: Merge.rc:2254 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2253 +#: Merge.rc:2255 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2254 +#: Merge.rc:2256 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2255 +#: Merge.rc:2257 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2258 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2259 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2260 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2261 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2267 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2266 +#: Merge.rc:2268 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2267 +#: Merge.rc:2269 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2268 +#: Merge.rc:2270 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2269 +#: Merge.rc:2271 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2270 +#: Merge.rc:2272 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2271 +#: Merge.rc:2273 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2274 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2273 +#: Merge.rc:2275 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2276 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2282 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2281 +#: Merge.rc:2283 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2282 +#: Merge.rc:2284 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2283 +#: Merge.rc:2285 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2284 -#: Merge.rc:2588 +#: Merge.rc:2286 +#: Merge.rc:2590 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2290 +#: Merge.rc:2292 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2291 +#: Merge.rc:2293 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2292 +#: Merge.rc:2294 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2293 +#: Merge.rc:2295 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2294 +#: Merge.rc:2296 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2295 +#: Merge.rc:2297 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2298 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2300 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2301 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2302 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2303 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2303 +#: Merge.rc:2305 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2311 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2310 +#: Merge.rc:2312 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2311 +#: Merge.rc:2313 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2319 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2318 +#: Merge.rc:2320 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2319 +#: Merge.rc:2321 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2320 +#: Merge.rc:2322 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2321 +#: Merge.rc:2323 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2322 +#: Merge.rc:2324 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2325 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2326 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2327 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2328 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2334 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2333 +#: Merge.rc:2335 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2334 +#: Merge.rc:2336 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2335 +#: Merge.rc:2337 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2336 +#: Merge.rc:2338 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2337 +#: Merge.rc:2339 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2340 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2341 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2342 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2341 +#: Merge.rc:2343 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2349 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2348 +#: Merge.rc:2350 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2349 +#: Merge.rc:2351 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2350 +#: Merge.rc:2352 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2351 +#: Merge.rc:2353 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2359 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2358 +#: Merge.rc:2360 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2359 +#: Merge.rc:2361 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2360 +#: Merge.rc:2362 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2361 +#: Merge.rc:2363 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2365 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2366 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2367 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2373 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2372 +#: Merge.rc:2374 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2373 +#: Merge.rc:2375 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2374 +#: Merge.rc:2376 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2375 +#: Merge.rc:2377 #, 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:2376 +#: Merge.rc:2378 #, 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:2377 +#: Merge.rc:2379 #, 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:2378 +#: Merge.rc:2380 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2381 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2382 #, 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:2386 +#: Merge.rc:2388 #, 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:2387 +#: Merge.rc:2389 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2388 +#: Merge.rc:2390 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2389 +#: Merge.rc:2391 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2390 +#: Merge.rc:2392 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2398 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2397 +#: Merge.rc:2399 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2405 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2404 +#: Merge.rc:2406 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2412 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2411 +#: Merge.rc:2413 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2419 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2418 +#: Merge.rc:2420 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2426 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2425 +#: Merge.rc:2427 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2426 +#: Merge.rc:2428 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2427 +#: Merge.rc:2429 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2428 +#: Merge.rc:2430 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2429 +#: Merge.rc:2431 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2432 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2433 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2434 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2435 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2436 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2437 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2438 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2439 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2440 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2445 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2446 #, 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:2445 +#: Merge.rc:2447 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2446 +#: Merge.rc:2448 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2447 +#: Merge.rc:2449 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2450 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2451 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2452 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2451 +#: Merge.rc:2453 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2454 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2455 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2461 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2460 +#: Merge.rc:2462 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2461 +#: Merge.rc:2463 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2462 +#: Merge.rc:2464 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2463 +#: Merge.rc:2465 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2464 +#: Merge.rc:2466 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2467 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2468 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2469 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2470 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2471 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2472 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2473 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2474 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2475 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2476 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2481 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2487 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2486 +#: Merge.rc:2488 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2487 +#: Merge.rc:2489 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2488 +#: Merge.rc:2490 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2489 +#: Merge.rc:2491 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2490 -#: Merge.rc:2500 +#: Merge.rc:2492 +#: Merge.rc:2502 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2496 +#: Merge.rc:2498 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2497 +#: Merge.rc:2499 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2498 +#: Merge.rc:2500 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2499 +#: Merge.rc:2501 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2506 +#: Merge.rc:2508 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2507 +#: Merge.rc:2509 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2515 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2514 +#: Merge.rc:2516 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2515 +#: Merge.rc:2517 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2516 +#: Merge.rc:2518 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2517 +#: Merge.rc:2519 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2518 +#: Merge.rc:2520 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2529 +#: Merge.rc:2531 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2530 +#: Merge.rc:2532 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2531 +#: Merge.rc:2533 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2532 +#: Merge.rc:2534 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2533 +#: Merge.rc:2535 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2541 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2540 +#: Merge.rc:2542 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2541 +#: Merge.rc:2543 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2542 +#: Merge.rc:2544 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2543 +#: Merge.rc:2545 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2544 +#: Merge.rc:2546 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2547 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2548 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2549 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2550 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2551 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2552 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2553 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2554 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2560 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2559 +#: Merge.rc:2561 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2560 +#: Merge.rc:2562 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2561 +#: Merge.rc:2563 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2562 +#: Merge.rc:2564 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2563 +#: Merge.rc:2565 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2572 +#: Merge.rc:2574 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2575 +#: Merge.rc:2577 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2576 +#: Merge.rc:2578 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2577 +#: Merge.rc:2579 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2586 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2585 +#: Merge.rc:2587 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2586 +#: Merge.rc:2588 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2587 +#: Merge.rc:2589 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2589 +#: Merge.rc:2591 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2592 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2593 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2598 +#: Merge.rc:2600 #, c-format msgid " B" msgstr "" -#: Merge.rc:2599 +#: Merge.rc:2601 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2600 +#: Merge.rc:2602 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2601 +#: Merge.rc:2603 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2602 +#: Merge.rc:2604 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2603 +#: Merge.rc:2605 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2611 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2611 +#: Merge.rc:2613 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2612 +#: Merge.rc:2614 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2613 +#: Merge.rc:2615 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2620 +#: Merge.rc:2622 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2621 +#: Merge.rc:2623 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2622 +#: Merge.rc:2624 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2623 +#: Merge.rc:2625 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2624 +#: Merge.rc:2626 #, c-format msgid "Change left file/dir read-only status" msgstr "" -#: Merge.rc:2625 +#: Merge.rc:2627 #, c-format msgid "Change right file/dir read-only status" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2628 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2629 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2630 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2631 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2632 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2633 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2639 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2638 +#: Merge.rc:2640 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2639 +#: Merge.rc:2641 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2640 +#: Merge.rc:2642 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2641 +#: Merge.rc:2643 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2642 +#: Merge.rc:2644 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2645 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2646 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2647 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2648 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2654 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2653 +#: Merge.rc:2655 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2654 +#: Merge.rc:2656 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2655 +#: Merge.rc:2657 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2656 +#: Merge.rc:2658 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2657 +#: Merge.rc:2659 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2665 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2664 +#: Merge.rc:2666 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2665 +#: Merge.rc:2667 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2666 +#: Merge.rc:2668 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2667 +#: Merge.rc:2669 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2668 +#: Merge.rc:2670 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2671 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2672 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2673 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2674 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2675 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2676 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2677 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2678 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2679 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2685 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2684 +#: Merge.rc:2686 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2685 +#: Merge.rc:2687 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2686 +#: Merge.rc:2688 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2687 +#: Merge.rc:2689 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2688 +#: Merge.rc:2690 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2691 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2692 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2693 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2694 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2695 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2696 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2697 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2703 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2702 +#: Merge.rc:2704 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2703 +#: Merge.rc:2705 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2704 +#: Merge.rc:2706 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2712 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2711 +#: Merge.rc:2713 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2712 +#: Merge.rc:2714 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2713 +#: Merge.rc:2715 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2714 +#: Merge.rc:2716 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2715 +#: Merge.rc:2717 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2718 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2719 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2723 +#: Merge.rc:2725 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2724 +#: Merge.rc:2726 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2732 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2731 +#: Merge.rc:2733 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2732 +#: Merge.rc:2734 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2733 +#: Merge.rc:2735 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2734 +#: Merge.rc:2736 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2735 +#: Merge.rc:2737 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2741 +#: Merge.rc:2743 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2742 +#: Merge.rc:2744 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2743 +#: Merge.rc:2745 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2745 +#: Merge.rc:2747 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2746 +#: Merge.rc:2748 #, c-format msgid "<None>" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2749 #, c-format msgid "<Automatic>" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2755 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2754 +#: Merge.rc:2756 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2755 +#: Merge.rc:2757 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2763 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2762 +#: Merge.rc:2764 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2763 +#: Merge.rc:2765 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2764 +#: Merge.rc:2766 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2765 +#: Merge.rc:2767 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2766 +#: Merge.rc:2768 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2774 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2773 +#: Merge.rc:2775 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2774 +#: Merge.rc:2776 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2781 +#: Merge.rc:2783 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2782 +#: Merge.rc:2784 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2783 +#: Merge.rc:2785 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2784 +#: Merge.rc:2786 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2785 +#: Merge.rc:2787 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2786 +#: Merge.rc:2788 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2789 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2788 +#: Merge.rc:2790 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2789 +#: Merge.rc:2791 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2792 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2793 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2794 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2795 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2796 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2797 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2798 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2799 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2800 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2801 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2802 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2803 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2804 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2805 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2806 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2807 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2808 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2807 +#: Merge.rc:2809 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2810 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2811 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2812 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2813 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2816 +#: Merge.rc:2818 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2817 +#: Merge.rc:2819 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2818 +#: Merge.rc:2820 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Merge.rc b/Src/Merge.rc index c2256f15f13..11ed5188d2e 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -192,6 +192,7 @@ BEGIN BEGIN MENUITEM "&New\tCtrl+N", ID_FILE_NEW MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Op&en Conflict File...", ID_FILE_OPENCONFLICT MENUITEM SEPARATOR MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT @@ -308,6 +309,7 @@ BEGIN BEGIN MENUITEM "&New\tCtrl+N", ID_FILE_NEW MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN + MENUITEM "Op&en Conflict File...", ID_FILE_OPENCONFLICT MENUITEM SEPARATOR MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT From 3fc5f57ccbae3288cdd8daabe5ded15a62b42db7 Mon Sep 17 00:00:00 2001 From: Tim Gerundt <tim@gerundt.de> Date: Fri, 25 Jul 2008 22:16:28 +0000 Subject: [PATCH 037/168] PATCH: [ 2028112 ] Manual: Remove old DSSSL build script --HG-- branch : R2_10 --- Docs/Developers/readme-manual.html | 62 -------- Docs/Users/Manual/Manual-html.dsl | 242 ----------------------------- Docs/Users/Manual/build/build.sh | 69 -------- 3 files changed, 373 deletions(-) delete mode 100644 Docs/Users/Manual/Manual-html.dsl delete mode 100644 Docs/Users/Manual/build/build.sh diff --git a/Docs/Developers/readme-manual.html b/Docs/Developers/readme-manual.html index f12a442cb3b..b548d4c0eb1 100644 --- a/Docs/Developers/readme-manual.html +++ b/Docs/Developers/readme-manual.html @@ -114,67 +114,5 @@ <h3><a name="ownbuildsystem">Our preferred build system is based on Java and Sax <dt><code>build.bat</code></dt> <dd>Is the same like <code>build.bat html</code>.</dd> </dl> - -<h3>Docbook support in SourceForge</h3> -<p>SourceForge has Docbook tools installed, and they can be used from -shell server. Tools we are interested in:</p> -<ul> - <li><code>docbook2html</code></li> - <li><code>docbook2pdf</code></li> - <li><code>docbook2txt</code></li> - <li>(<code>docbook2rtf</code>)</li> -</ul> - -<h4>Generating HTML documentation</h4> -<p><code>Manual-html.dsl</code> file is a stylesheet file that defines rules for -generating HTML. It forces index creation, adding navigation links, CSS stylesheet -etc. File contains comments for settings so they are not repeated here.</p> - -<p>To generate HTML documentation in SF.net shell, copy all XML files, stylesheet -file and subdirectories to shell server. Then in directory which contains XML -files, type:</p> - -<pre>docbook2html -d Manual-html.dsl WinMerge_help.xml</pre> - -<p><b>Note:</b> -Seems that Sourceforge.net has blocked access to outside world from shell, so to generate -docs one needs to replace <code>docbook.dtd</code> location in <code>WinMerge_help.xml</code> with -local path. Replace url in second line <code>"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" -</code> with valid path. At the moment it is:</p> - -<pre>"/usr/share/sgml/docbook/sgml-dtd-4.2-1.0-24/docbook.dtd"</pre> - -<h4>Own build script</h4> -<p>We have an own build script, which replaces the <code>docbook.dtd</code> url automatically making it -easier to build manual.</p> - -<p>The <code>build.sh</code> script file is located at the <code>build</code> subdirectory at -the <code>Manual</code> directory. But before you can use it at the shell server, you must give -execute rights for it:</p> -<pre>chmod +x build.sh</pre> - -<p>Now you can call the script file (from the <code>build</code> directory):</p> -<dl> - <dt><code>./build.sh html</code></dt> - <dd>Creates the HTML files under the <code>html</code> subdirectory at the <code>build</code> directory.</dd> - <dt><code>./build.sh pdf</code></dt> - <dd>Creates the PDF file under the <code>pdf</code> subdirectory at the <code>build</code> directory.</dd> - <dt><code>./build.sh txt</code></dt> - <dd>Creates the TXT file under the <code>txt</code> subdirectory at the <code>build</code> directory.</dd> - <dt><code>./build.sh</code></dt> - <dd>Is the same like <code>./build.sh html</code>.</dd> -</dl> - -<h3>Postprocessing HTML</h3> -<p>Unfortunately some DocBook tools generate quite a messy HTML. This is especially true for DSSSL-stylesheet -based tools. When using such tools it is strongly recommended to run some tidying tool before -releasing/uploading HTML manual.</p> - -<p>One good and free tool for tidying HTML is <a href="http://tidy.sourceforge.net/">HTML tidy</a>.</p> - -<p>To use HTML Tidy, open command prompt, go to folder where generated HTML files are and give a command:<br> -<code>tidy -m file.html</code>.<br> -Repeat for all HTML files. Or create a batch file to tidy them all. This of course assumes that HTML tidy is -added to $PATH so it can be found when running from commandline.</p> </body> </html> \ No newline at end of file diff --git a/Docs/Users/Manual/Manual-html.dsl b/Docs/Users/Manual/Manual-html.dsl deleted file mode 100644 index 2690216812a..00000000000 --- a/Docs/Users/Manual/Manual-html.dsl +++ /dev/null @@ -1,242 +0,0 @@ -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA dsssl> -]> - -<style-sheet> -<style-specification use="docbook"> -<style-specification-body> - -;; Based on stylesheet of Newbiedoc project at -;; http://sourceforge.net/projects/newbiedoc - -(define %generate-article-toc% - ;; Should a Table of Contents be produced for Articles? - #t) - -(define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - ;; - ;; Docbook default is 1 level deep - ;; I don't understand "normalize book" but - ;; it doesn't seem to affect if we use - ;; articles. I changed it to 2 deep. - ;; - 3 - 2)) - -(define %admon-graphics% - ;; Use graphics in admonitions? - #t) - -(define %admon-graphics-path% - ;; Path to admonition graphics - ;; Sets the path, probably relative to the directory - ;; where the HTML files are created, to the admonition - ;; graphics. - "./images/") - -(define %callout-graphics% - ;; If true, callouts are presented with graphics (e.g., reverse-video - ;; circled numbers instead of "(1)", "(2)", etc.). - ;; Default graphics are provided in the distribution. - #t) - -(define %callout-graphics-path% - ;; Sets the path, probably relative to the directory where the HTML - ;; files are created, to the callout graphics. - "./images/callouts/") - -(define %callout-graphics-number-limit% - ;; If '%callout-graphics%' is true, graphics are used to represent - ;; callout numbers. The value of '%callout-graphics-number-limit%' is - ;; the largest number for which a graphic exists. If the callout number - ;; exceeds this limit, the default presentation "(nnn)" will always - ;; be used. - 10) - -(define ($admon-graphic$ #!optional (nd (current-node))) - ;; Admonition graphic file - ;; Given an admonition node, returns the name of the - ;; graphic that should be used for that admonition. - (cond ((equal? (gi nd) (normalize "tip")) - (string-append %admon-graphics-path% "tip.gif")) - ((equal? (gi nd) (normalize "note")) - (string-append %admon-graphics-path% "note.gif")) - ((equal? (gi nd) (normalize "important")) - (string-append %admon-graphics-path% "important.gif")) - ((equal? (gi nd) (normalize "caution")) - (string-append %admon-graphics-path% "caution.gif")) - ((equal? (gi nd) (normalize "warning")) - (string-append %admon-graphics-path% "warning.gif")) - (else (error (string-append (gi nd) " is not an admonition."))))) - - -(define ($admon-graphic-width$ #!optional (nd (current-node))) - "25") - -(define %header-navigation% - ;; Should navigation links be added to the top of each page? - #t) - -(define %footer-navigation% - ;; Should navigation links be added to the bottom of each page? - #t) - -(define %gentext-nav-tblwidth% - ;; If using tables for navigation, how wide should the tables be? - "100%") - -(define %gentext-nav-use-tables% - ;; Use tables to build the navigation headers and footers? - #t) - -;;Add arrows to navigation (comment these -;;out if you want admon graphics here) -;;(define (gentext-en-nav-prev prev) -;; (make sequence (literal "<< Previous"))) - -;;Add arrows to navigation (comment these -;;out if you want admon graphics here) -;;(define (gentext-en-nav-next next) -;; (make sequence (literal "Next >>"))) - -;; For the life of me I still haven't figured out how to -;; configure these two monsters. -;; -;;(define ($user-header-navigation$ #!optional -;; (prev (empty-node-list)) -;; (next (empty-node-list)) -;; (prevm (empty-node-list)) -;; (nextm (empty-node-list))) -;; (empty-sosofo)) - -;;(define ($user-footer-navigation$ #!optional -;; (prev (empty-node-list)) -;; (next (empty-node-list)) -;; (prevm (empty-node-list)) -;; (nextm (empty-node-list))) -;; (empty-sosofo)) - -(define %number-programlisting-lines% - ;; Enumerate lines in a 'ProgramListing'? - #t) - -(define %linenumber-length% - ;; Width of line numbers in enumerated environments - ;; Line numbers will be padded to %linenumber-length% characters. - 0) - -(define %linenumber-mod% - ;; Controls line-number frequency in enumerated environments. - ;; Every %linenumber-mod% line will be enumerated. - 1) - -(define %linenumber-padchar% - ;; Pad character in line numbers - ;; Line numbers will be padded (on the left) with %linenumber-padchar% - " ") - - -(define %shade-verbatim% - ;; Should verbatim environments be shaded? - #t) - -(define ($shade-verbatim-attr$) - ;; Attributes used to create a shaded verbatim environment. - (list - (list "BORDER" "0") - (list "BGCOLOR" "#BBDDFF") - (list "WIDTH" ($table-width$)) - (list "CELLPADDING" "0") - (list "CELLSPACING" "0") - )) - -(define %body-attr% - ;; What attributes should be hung off of BODY? - (list - (list "BGCOLOR" "#FFFFFF") - (list "TEXT" "#000000") - (list "LINK" "#0000FF") - (list "VLINK" "#800080") - (list "ALINK" "#FF0000"))) - - -(define %stylesheet% - ;; Name of the stylesheet to use - #f) ;; uncomment this to make false and comment out line below - ;; "../../nd-style.css") - -(define %stylesheet-type% - ;; The type of the stylesheet to use - "text/css") - -(define %html40% - ;; Generate HTML 4.0 - #t) - -(define %use-id-as-filename% - ;; Use ID attributes as name for component HTML files? - #t) - -;;Default extension for filenames? -(define %html-ext% - ".html") - -;; I like that: -(define (chunk-skip-first-element-list) - ;; forces the Table of Contents on separate page - '()) - -;; I didn't see any bug ?! -(define (list-element-list) - ;; fixes bug in Table of Contents generation - '()) - -;; What section levels get put into separate HTML files -;; (chunks) in the chunked version -(define (chunk-section-depth) - 1) - -;; Indent lines in a programlisting? by how many spaces? -(define %indent-programlisting-lines% - "") - - ;; Enumerate lines in a 'Screen'? -(define %number-screen-lines% - #f) - -;; Indent lines in a 'Screen'? -;; This is a string of characters used to indent every line of -;; a screen. -;; (define %indent-screen-lines% -;; " ") - -;; This puts figure titles below the figure. -(define ($object-titles-after$) - (list (normalize "figure"))) - -;; Are sections enumerated? -;; The number appears in their title, both in the table -;; of contents, and in the text. -(define %section-autolabel% - #t) - -;; Name for the root HTML document -;; If we want to change "book1" to "index" as the -;; root filename, we can use this: -;; (define %root-filename% -;; "index") - -;; Make GUI-related names appear in bold font. -;; (element guibutton ($bold-seq$)) -;; (element guiicon ($bold-seq$)) -;; (element guilabel ($bold-seq$)) -;; (element guimenu ($bold-seq$)) -;; (element guimenuitem ($bold-seq$)) -;; (element guisubmenu ($bold-seq$)) - - -</style-specification-body> -</style-specification> -<external-specification id="docbook" document="docbook.dsl"> -</style-sheet> \ No newline at end of file diff --git a/Docs/Users/Manual/build/build.sh b/Docs/Users/Manual/build/build.sh deleted file mode 100644 index a52370ae869..00000000000 --- a/Docs/Users/Manual/build/build.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -html_stylesheet=../Manual-html.dsl -html_inputfile=../WinMerge_help.xml -html_outputdir=html - -pdf_stylesheet=../Manual-html.dsl -pdf_inputfile=../WinMerge_help.xml -pdf_outputdir=pdf - -txt_stylesheet=../Manual-html.dsl -txt_inputfile=../WinMerge_help.xml -txt_outputdir=txt - -function patch_inputfile { - sed -e 's/http:\/\/www\.oasis-open\.org\/docbook\/xml\/4\.2\/docbookx\.dtd/\/usr\/share\/sgml\/docbook\/sgml-dtd-4\.2-1\.0-24\/docbook\.dtd/g' "$1" > "$1.tmp" - mv "$1.tmp" "$1" -} - -function create_dir { - if ! [ -d "$1" ]; then - mkdir "$1" - fi -} - -if [ "$1" = "html" ] || [ "$1" = "" ]; then #HTML files... - create_dir $html_outputdir - - echo "Patch inputfile..." - patch_inputfile $html_inputfile - - echo "Copy images..." - create_dir $html_outputdir/images - cp ../images/*.gif $html_outputdir/images/. - - echo "Copy screenshots..." - create_dir $html_outputdir/screenshots - cp ../screenshots/*.* $html_outputdir/screenshots/. - - echo "Create HTML files..." - docbook2html -d "$html_stylesheet" -o "$html_outputdir" "$html_inputfile" - - echo "Finished!" - -elif [ "$1" = "pdf" ]; then #PDF file... - create_dir $pdf_outputdir - - echo "Patch inputfile..." - patch_inputfile $pdf_inputfile - - echo "Create PDF file..." - docbook2pdf -d "$pdf_stylesheet" -o "$pdf_outputdir" "$pdf_inputfile" - - echo "Finished!" - -elif [ "$1" = "txt" ]; then #TXT file... - create_dir $txt_outputdir - - echo "Patch inputfile..." - patch_inputfile $txt_inputfile - - echo "Create TXT file..." - docbook2txt -d "$txt_stylesheet" -o "$txt_outputdir" "$txt_inputfile" - - echo "Finished!" - -else - echo "Syntax: build [html|pdf|txt]" -fi \ No newline at end of file From 3d61f1876f7d53632c759994fe3bf38ea8ab27ce Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Mon, 28 Jul 2008 14:33:16 +0000 Subject: [PATCH 038/168] PATCH: [ 2029275 ] Allow giving -u cmdline param instead of -ub --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/WinMergeCmdLineParser.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 58179e5eac6..ccaa72263b1 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -12,6 +12,7 @@ WinMerge 2.9.1.6 Add dialog listing available plugins (#2021722) Refresh compare after changing filter (#2017426) Add "Open Conflict" for file/folder compare menus (#2025472) + Add -u commandline parameter as alternative to -ub (#2029275) 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) diff --git a/Src/WinMergeCmdLineParser.cpp b/Src/WinMergeCmdLineParser.cpp index e4a1aee13f1..ef881c986c1 100644 --- a/Src/WinMergeCmdLineParser.cpp +++ b/Src/WinMergeCmdLineParser.cpp @@ -143,9 +143,9 @@ void WinMergeCmdLineParser::ParseParam(const TCHAR* pszParam, BOOL bFlag, // -ur to not add right path to MRU m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU; } - else if (!lstrcmpi(pszParam, _T("ub"))) + else if (!lstrcmpi(pszParam, _T("u")) || !lstrcmpi(pszParam, _T("ub"))) { - // -ub to add neither right nor left path to MRU + // -u or -ub (deprecated) to add neither right nor left path to MRU m_cmdLineInfo.m_dwLeftFlags |= FFILEOPEN_NOMRU; m_cmdLineInfo.m_dwRightFlags |= FFILEOPEN_NOMRU; } From 03c10204005f68420fc4169a97608579ce23ecde Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Mon, 28 Jul 2008 14:56:09 +0000 Subject: [PATCH 039/168] PATCH: [ 2029457 ] Remove RCLocalizationHelper plugin dll --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Plugins/dlls/RCLocalizationHelper.dll | Bin 81920 -> 0 bytes Plugins/dlls/RCLocalizationHelper.ini | 22 ---------------------- Plugins/dlls/RCLocalizationHelperU.dll | Bin 86016 -> 0 bytes Plugins/dlls/RCLocalizationHelperU.ini | 22 ---------------------- 5 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 Plugins/dlls/RCLocalizationHelper.dll delete mode 100644 Plugins/dlls/RCLocalizationHelper.ini delete mode 100644 Plugins/dlls/RCLocalizationHelperU.dll delete mode 100644 Plugins/dlls/RCLocalizationHelperU.ini diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index ccaa72263b1..e9c547f4842 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -13,6 +13,7 @@ WinMerge 2.9.1.6 Refresh compare after changing filter (#2017426) Add "Open Conflict" for file/folder compare menus (#2025472) Add -u commandline parameter as alternative to -ub (#2029275) + Remove RCLocalizationHelper plugin (#2029457) 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) diff --git a/Plugins/dlls/RCLocalizationHelper.dll b/Plugins/dlls/RCLocalizationHelper.dll deleted file mode 100644 index 0a1357f56c6fc90113f7352efbe1c116bd1ba3d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 81920 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%0Den(%TwNYAA0kP?It6x+seeMDcq7-l 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 diff --git a/Plugins/dlls/RCLocalizationHelper.ini b/Plugins/dlls/RCLocalizationHelper.ini deleted file mode 100644 index 63b3a5c9d94..00000000000 --- a/Plugins/dlls/RCLocalizationHelper.ini +++ /dev/null @@ -1,22 +0,0 @@ -[MetaData] -Version=1.2 -Date=2006-02-05 - -[IgnoreLines] -count=7 -line.1=\$Id.*\$ -line.2=^// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.3=^#endif[ ]+// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.4=^#if !defined\(AFX_RESOURCE_DLL\) \|\| defined\(AFX_TARG_...\) -line.5=^LANGUAGE LANG_ -line.6=VALUE "Translation", -line.7=^#pragma code_page\([0-9]+\) - -[Substitutions] -count=1 -source.1=[0-9]+ -dest.1=, - -[Options] -IgnoreQuotes=1 -PluginName=RCLocalizationHelperU diff --git a/Plugins/dlls/RCLocalizationHelperU.dll b/Plugins/dlls/RCLocalizationHelperU.dll deleted file mode 100644 index c336c8b2d820cbc660edc539eab30419251064eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86016 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�KAY(#a?u-jd6DgZW$}7O%Vi2Yy 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 I{}2cM57FEob^rhX diff --git a/Plugins/dlls/RCLocalizationHelperU.ini b/Plugins/dlls/RCLocalizationHelperU.ini deleted file mode 100644 index 63b3a5c9d94..00000000000 --- a/Plugins/dlls/RCLocalizationHelperU.ini +++ /dev/null @@ -1,22 +0,0 @@ -[MetaData] -Version=1.2 -Date=2006-02-05 - -[IgnoreLines] -count=7 -line.1=\$Id.*\$ -line.2=^// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.3=^#endif[ ]+// [a-zA-Z]+ \([a-z.A-Z]+\) resources -line.4=^#if !defined\(AFX_RESOURCE_DLL\) \|\| defined\(AFX_TARG_...\) -line.5=^LANGUAGE LANG_ -line.6=VALUE "Translation", -line.7=^#pragma code_page\([0-9]+\) - -[Substitutions] -count=1 -source.1=[0-9]+ -dest.1=, - -[Options] -IgnoreQuotes=1 -PluginName=RCLocalizationHelperU From df044ca5700b30b6a2efe736e4eb3f8351535c7f Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Tue, 29 Jul 2008 05:39:21 +0000 Subject: [PATCH 040/168] PATCH: [ 2030040 ] Clarify Supercopier hang item in release notes --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Docs/Users/ReleaseNotes.html | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e9c547f4842..5b4ef13c873 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -14,6 +14,7 @@ WinMerge 2.9.1.6 Add "Open Conflict" for file/folder compare menus (#2025472) Add -u commandline parameter as alternative to -ub (#2029275) Remove RCLocalizationHelper plugin (#2029457) + Clarify Supercopier caused hang in release notes (#2030040) 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) diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html index af662d611cf..b4a386fdb7f 100644 --- a/Docs/Users/ReleaseNotes.html +++ b/Docs/Users/ReleaseNotes.html @@ -124,6 +124,15 @@ <h3><a name="issues">Known Issues</a></h3> </li> <li> <p><strong>Supercopier application causes WinMerge to hang.</strong></p> + <p><a href="http://supercopier.sfxteam.org/modules/mydownloads/">Supercopier</a> + application causes WinMerge to not exit properly and leaves WinMerge process + hang. See the bug reports: + <ul> + <li><a href="http://winmerge.org/bug/1976241">#1976241</a> the winmerge.exe + process doesn't stop itself</li> + <li><a href="http://winmerge.org/bug/1602313">#1602313</a> WinMerge stays + in tasklist after closing</li> + </ul></p> <p><i>Workaround</i>: Disable the Supercopier when using WinMerge.</p> </li> <li> From cc61053d68b71801e0cf19d0005ace5b085aef29 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Tue, 29 Jul 2008 05:50:45 +0000 Subject: [PATCH 041/168] PATCH: [ 2030109 ] Read-only menu description mentions dir --HG-- branch : R2_10 --- Src/Languages/English.pot | 6 +++--- Src/Merge.rc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index cd254c26869..57ad5849073 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" 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-25 14:47+0000\n" +"POT-Creation-Date: 2008-07-29 08:45+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n" @@ -4900,12 +4900,12 @@ msgstr "" #: Merge.rc:2626 #, c-format -msgid "Change left file/dir read-only status" +msgid "Change left side file/folder read-only status" msgstr "" #: Merge.rc:2627 #, c-format -msgid "Change right file/dir read-only status" +msgid "Change right side file/folder read-only status" msgstr "" #: Merge.rc:2628 diff --git a/Src/Merge.rc b/Src/Merge.rc index 11ed5188d2e..60dbae24833 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -2623,8 +2623,8 @@ BEGIN ID_FILE_SAVE_RIGHT "Save the right file" ID_FILE_SAVEAS_LEFT "Save the left file with name..." ID_FILE_SAVEAS_RIGHT "Save the right file with name..." - ID_FILE_LEFT_READONLY "Change left file/dir read-only status" - ID_FILE_RIGHT_READONLY "Change right file/dir read-only status" + ID_FILE_LEFT_READONLY "Change left side file/folder read-only status" + ID_FILE_RIGHT_READONLY "Change right side file/folder read-only status" ID_EOL_TO_DOS "Convert EOL to Windows mode" ID_EOL_TO_UNIX "Convert EOL to Unix mode" ID_EOL_TO_MAC "Convert EOL to Mac mode" From 3e24e4e2043e24d4743aaa26e2843282f8b8ba56 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Tue, 29 Jul 2008 13:15:29 +0000 Subject: [PATCH 042/168] PATCH: [ 2030359 ] Manual: document -u command line parameter --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 +- Docs/Users/Manual/Command_line.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 5b4ef13c873..d7136644b28 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -12,7 +12,7 @@ WinMerge 2.9.1.6 Add dialog listing available plugins (#2021722) Refresh compare after changing filter (#2017426) Add "Open Conflict" for file/folder compare menus (#2025472) - Add -u commandline parameter as alternative to -ub (#2029275) + Add -u commandline parameter as alternative to -ub (#2029275, #2030359) Remove RCLocalizationHelper plugin (#2029457) Clarify Supercopier caused hang in release notes (#2030040) BugFix: Use system codepage for paths (#1979429, #2008581) diff --git a/Docs/Users/Manual/Command_line.xml b/Docs/Users/Manual/Command_line.xml index 3e17413957f..42738e3bc60 100644 --- a/Docs/Users/Manual/Command_line.xml +++ b/Docs/Users/Manual/Command_line.xml @@ -115,9 +115,9 @@ </listitem> <listitem> - <simpara><option>/ub</option> tells WinMerge to not add both paths to MRU. - External applications should not add paths to Open-dialog's MRU - lists.</simpara> + <simpara><option>/u</option> (or <option>/ub</option>) tells WinMerge to + not add both paths to MRU. External applications should not add paths to + Open-dialog's MRU lists.</simpara> </listitem> <listitem> From 988b40fc2c62bc5fbc5fe84d6fe4f42f9a99ac53 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Thu, 31 Jul 2008 11:25:54 +0000 Subject: [PATCH 043/168] Optimize line replace. Don't bother clearing the string before setting new data to it. Trunk r5707. --HG-- branch : R2_10 --- Src/MergeDoc.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 4bef3991fc1..21e348b1f46 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -901,8 +901,7 @@ bool CMergeDoc::ListCopy(int srcPane, int dstPane, int nDiff /* = -1*/, // copy the selected text over for (int i=cd_dbegin; i <= limit; i++) { - // text exists on left side, so just replace - strLine = _T(""); + // text exists on other side, so just replace sbuf.GetFullLine(i, strLine); dbuf.ReplaceFullLine(dstView, i, strLine, CE_ACTION_MERGE); dbuf.FlushUndoGroup(dstView); From b3d1a5fbfd4fdc250ea3825318fe02617b7e227c Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Thu, 31 Jul 2008 19:35:03 +0000 Subject: [PATCH 044/168] PATCH: [ 2026508 ] Add confirmation dialog for move operation --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/ConfirmFolderCopyDlg.cpp | 3 + Src/ConfirmFolderCopyDlg.h | 6 + Src/DirActions.cpp | 108 ++++- Src/Languages/English.pot | 748 ++++++++++++++++++----------------- Src/Merge.rc | 4 + Src/resource.h | 4 + 7 files changed, 498 insertions(+), 376 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index d7136644b28..10243f217b6 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -15,6 +15,7 @@ WinMerge 2.9.1.6 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) diff --git a/Src/ConfirmFolderCopyDlg.cpp b/Src/ConfirmFolderCopyDlg.cpp index ba884fbe55a..f062461d4f8 100644 --- a/Src/ConfirmFolderCopyDlg.cpp +++ b/Src/ConfirmFolderCopyDlg.cpp @@ -81,6 +81,9 @@ BOOL ConfirmFolderCopyDlg::OnInitDialog() 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 diff --git a/Src/ConfirmFolderCopyDlg.h b/Src/ConfirmFolderCopyDlg.h index 5a18e2171e4..b5d67891754 100644 --- a/Src/ConfirmFolderCopyDlg.h +++ b/Src/ConfirmFolderCopyDlg.h @@ -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 @@ class ConfirmFolderCopyDlg : public CDialog 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_ diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index 9d80700f958..c39b57b6793 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -53,6 +53,11 @@ static char THIS_FILE[] = __FILE__; 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,18 +74,68 @@ static BOOL CheckPathsExist(LPCTSTR orig, LPCTSTR dest, int allowOrig, * @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) { - ConfirmFolderCopyDlg dlg; CString strQuestion; - String sOrig; - String sDest; - + 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; + String sOrig; + String sDest; + + dlg.m_caption = caption.c_str(); if (origin == FileActionItem::UI_LEFT) sOrig = theApp.LoadString(IDS_FROM_LEFT); @@ -114,7 +169,7 @@ static BOOL ConfirmCopy(int origin, int destination, int count, 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 @@ void CDirView::DoMoveLeftTo() FileActionItem act; CString sFullDest(destPath); sFullDest += _T("\\"); + actionScript.m_destBase = sFullDest; if (GetDocument()->GetRecursive()) { if (!di.left.path.empty()) @@ -744,6 +800,7 @@ void CDirView::DoMoveRightTo() FileActionItem act; CString sFullDest(destPath); sFullDest += _T("\\"); + actionScript.m_destBase = sFullDest; if (GetDocument()->GetRecursive()) { if (!di.right.path.empty()) @@ -809,7 +866,7 @@ BOOL CDirView::ConfirmActionList(const FileActionScript & actionList, int selCou 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 @@ BOOL CDirView::ConfirmActionList(const FileActionScript & actionList, int selCou 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 @@ BOOL CDirView::ConfirmActionList(const FileActionScript & actionList, int selCou // 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 diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index 57ad5849073..1db7087f9f6 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" 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 <winmerge-translate@lists.sourceforge.net>\n" @@ -701,7 +701,7 @@ msgid "&Scripts" msgstr "" #: Merge.rc:366 -#: Merge.rc:2746 +#: Merge.rc:2750 #, c-format msgid "< Empty >" msgstr "" @@ -2306,7 +2306,7 @@ msgid "Files:" msgstr "" #: Merge.rc:1476 -#: Merge.rc:2304 +#: Merge.rc:2308 #, c-format msgid "Different" msgstr "" @@ -2338,7 +2338,7 @@ msgid "Right:" msgstr "" #: Merge.rc:1494 -#: Merge.rc:2299 +#: Merge.rc:2303 #, c-format msgid "Identical" msgstr "" @@ -2528,6 +2528,7 @@ msgid "A&ppend timestamp" msgstr "" #: Merge.rc:1639 +#: Merge.rc:2218 #, c-format msgid "Confirm Copy" msgstr "" @@ -3146,7 +3147,7 @@ msgid "Size" msgstr "" #: Merge.rc:2006 -#: Merge.rc:2610 +#: Merge.rc:2614 #, c-format msgid "Name" msgstr "" @@ -3167,7 +3168,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2010 -#: Merge.rc:2612 +#: Merge.rc:2616 #, c-format msgid "Description" msgstr "" @@ -3554,8 +3555,8 @@ msgid "Versioning System returned an error while attempting to undo checkout the 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 @@ msgstr "" 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 "" diff --git a/Src/Merge.rc b/Src/Merge.rc index 60dbae24833..9ed4d8a2a09 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -2213,6 +2213,10 @@ BEGIN 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 diff --git a/Src/resource.h b/Src/resource.h index 528717bec17..3a193e34f01 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -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 From 2c7bd033dee2ed5ff1d8c9e5880827bee84d8f56 Mon Sep 17 00:00:00 2001 From: Kimmo Varis <kimmov@gmail.com> Date: Fri, 1 Aug 2008 18:36:51 +0000 Subject: [PATCH 045/168] PATCH: [ 2032801 ] Update doc using GUI default window config Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Compare_dirs.xml | 86 ++++++++++++++++-- Docs/Users/Manual/Intro_diffs.xml | 49 +++++----- Docs/Users/Manual/Quick_start.xml | 45 ++++----- Docs/Users/Manual/screenshots/filecomp1.png | Bin 43923 -> 38303 bytes .../Manual/screenshots/filecomp_diffpane1.png | Bin 5990 -> 4492 bytes Docs/Users/Manual/screenshots/filemerged1.png | Bin 35429 -> 38537 bytes Docs/Users/Manual/screenshots/foldercomp1.png | Bin 36512 -> 37764 bytes .../Manual/screenshots/missing_lines.png | Bin 29841 -> 33492 bytes .../Manual/screenshots/multifoldercomp1.png | Bin 0 -> 35145 bytes .../Manual/screenshots/multifoldercomp2.png | Bin 0 -> 20642 bytes .../Manual/screenshots/multifoldercomp3.png | Bin 0 -> 22848 bytes Docs/Users/Manual/screenshots/restore_btn.png | Bin 0 -> 433 bytes 12 files changed, 131 insertions(+), 49 deletions(-) create mode 100644 Docs/Users/Manual/screenshots/multifoldercomp1.png create mode 100644 Docs/Users/Manual/screenshots/multifoldercomp2.png create mode 100644 Docs/Users/Manual/screenshots/multifoldercomp3.png create mode 100644 Docs/Users/Manual/screenshots/restore_btn.png diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index 40d15fbc39a..d581844ca92 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -37,9 +37,9 @@ <listitem> <para>Run <command>WinMergeU.exe</command>, which is in your WinMerge install directory. In your command arguments, include the left and - right folders to compare. By default, the compare is includes all - files in the folders, and is nonrecursive. To change any of these - options and for information about other command options, see <xref + right folders to compare. By default, the compare includes all files + in the folders, and is nonrecursive. To change any of these options + and for information about other command options, see <xref linkend="CommandLine" />.</para> </listitem> </varlistentry> @@ -134,7 +134,7 @@ I get the partial list, but no Abort indicator.--></para> <mediaobject> <imageobject> - <imagedata contentwidth="637" fileref="screenshots/foldercomp1.png" + <imagedata contentwidth="600" fileref="screenshots/foldercomp1.png" format="PNG" /> </imageobject> </mediaobject> @@ -304,6 +304,80 @@ I get the partial list, but no Abort indicator.--></para> </section> </section> + <section> + <title>Working with multiple Folder Compare windows + + By default, the WinMerge window displays a single Folder Compare + window. That is, if you start another file comparison while a Folder Compare + window is currently open, the new Compare window replaces the current one. + If you prefer to work with multiple compare operations simultaneously, + consider setting (checking) the Enable multiple compare windows + for Folder compare option. + +
      + Using the Tab bar with maximized compare windows + + If you open multiple Compare windows, they are displayed by default + as individually resizeable child windows within the WinMerge window, like + this: + + + + + + + Multiple Folder Compare windows: default + display + + + Often, it's convenient to maximize your Compare window (by clicking + its Maximixe button). The window then fills all the available space in the + WinMerge window. The screen shot below shows a maximized Compare + window. + + + + + + + Multiple Comparison windows: maximized + + + When you maximize one Compare window, any other Compare windows are + hidden, as shown in the preceding screen shot. To access those windows, + you could return to the default view by clicking the + + + + + + Restore button + + Restore button. A better solution is to enable tabs + by setting (checking) + View + + Tab Bar + . + + When you display the Tab bar, each Compare window has a tab that + shows the filenames of the two compared files. Now, you can easily + identify and display any available Compare window, and the selected + Compare window remains maximized: + + + + + + + Multiple Comparison windows: tabbed + +
      +
      +
      File operations in Folder Compare<indexterm> <primary>file operations</primary> @@ -760,8 +834,8 @@ added/deleted/copied. User can create a new archive file using above menuitems i <listitem> <para>If you browse to a subfolder that exists only the left or right side, WinMerge can create a new, matching folder on the other - side. See <xref linkend="CompareDirs_browse_unique" /> for details. - </para> + side. See <xref linkend="CompareDirs_browse_unique" /> for + details.</para> </listitem> </varlistentry> </variablelist> diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 2d91a9abb19..7b4481e4557 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -19,21 +19,22 @@ difference/merging tools like WinMerge are designed make this work more systematic and efficient.</para> - <para>For example, a spell checker is a difference utility that most people - have used: it can systematically step you through a document, highlight - words that are different from those in its dictionary, and help you resolve - each spelling problem. However, looking only at characters and words is not - an effective way to do more complicated comparisons: many text utilities use - lines as the basic unit of comparison instead.</para> + <para>A simple difference utility that most people have used is a spell + checker: it systematically steps you through a document, highlights words + that are different from those in its dictionary, and helps you resolve each + spelling problem. However, looking only at characters and words is not an + effective way to understand differences between multiple files. For this + reason, many difference utilities use lines as the basic unit of comparison + instead.</para> <para>WinMerge also uses lines as its basic unit of difference. Words and - spaces are not treated individually in comparing and merging operations. To - illustrate, consider two files that are identical except for one line that - is different. If the two versions of the line have four words that are + characters are not treated individually in comparing and merging operations. + To illustrate, consider two files that are identical except for one line + that is different. If the two versions of the line have four words that are different and one version has an extra space, then we say that the file has one difference, not five.</para> - <para>If it's quicker to compare lines than characters, sometimes it's also + <para>If it's quicker to compare lines than words, sometimes it's also useful to treat an entire block of lines as a single difference, instead of comparing one line at a time. As we will see later, detecting multiple-line differences makes merging more efficient too.</para> @@ -53,8 +54,8 @@ <formalpara> <title>Fle1: - It's hard to compare words -and merge them. So instead + It's slow comparing words +and characters. Instead, WinMerge compares lines. Believe it or else. @@ -62,7 +63,7 @@ Believe it or else. File2: - It's hard to compare words. + It's slow comparing words. WinMerge compares lines. Believe it or not. @@ -85,11 +86,11 @@ Believe it or not. File1 as the Left file and File2 as the Right file, then click OK. The File Compare window displays - the two files in the left and right pane, like this: + the two files in the left and right document pane, like this: - @@ -118,7 +119,7 @@ Believe it or not. WinMerge marks differences with various background colors (which you can configure in WinMerge options). The basic - difference color is gold, by default. Within each line + difference color is dark yellow, by default. Within each line difference, WinMerge marks words and characters that are different with a lighter background color. Identical lines (like the third line in the example) are unmarked: they have white @@ -200,7 +201,7 @@ Believe it or not. - @@ -360,7 +361,7 @@ Believe it or not. - @@ -381,15 +382,19 @@ Believe it or not. to save your changes. + + While very simple, this example demonstrates a basic methodology + that you can use to step through a comparison of any length, merging each + difference one by one until you have the result that you want.
      Choosing a merge result file - You control where your merge result is preserved. The WinMerge - Compare window does not have a separate result pane, unlike some merge - tools. So the simplest strategy is to save your changes in one or both - source files. Press + You control where your merge result is preserved. The WinMerge File + Compare window does not have a separate result pane, as some merge tools + do. So the simplest strategy is to save your changes to one or both source + files. Press Ctrl S diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index 7376cbc576f..dcfd1859448 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -304,9 +304,16 @@ basic usage Comparing folders + If you selected two folders in the Open dialog, the Folder Compare + window is opened. The Folder Compare window is a tabular list of items found + in the compared folders. Each row displays information about a found file, + with the file name in the left column and additional information in the + other columns: + - + @@ -314,20 +321,14 @@ - If you selected two folders in the Open dialog, the Folder Compare - window is opened. The Folder Compare window is a tabular list of items found - in the compared folders. Each row displays information about a found file, - with the file name in the left column and additional information in the - other columns. - WinMerge does not have a concept of original and changed sides. Instead, it simply shows what is different between two selected folders. For example, a file or folder that is found only on one side is simply shown as a unique item on that side. It - is not shown as added or removed. In the preceding figure, notice that the - Comparison result column lists - Merge.aps and Merge.rc.bak as - found only in the left comparison folder. + is not shown as added or removed. For example, in the Comparison + result column of the preceding figure, + Merge.aps and Merge.rc.bak are + each found in only one of the compared folders. You can manage files and folders in many ways using the Merge menu, toolbar buttons, or context (right-click) @@ -372,10 +373,10 @@ up arrow at the top of the Filename column. - If you compare a file, WinMerge opens File Compare window with a new - tab, as shown in the figure in the next section. Then, if you make changes - in the File Compare window, the file's data is updated in the Folder Compare - window. + If you compare a file, WinMerge opens the File Compare window, + described in the next section. If you change a file in the File Compare + window, and then return to the Folder Compare window, you will see the + file's data is updated there.
      @@ -391,7 +392,8 @@ - + @@ -399,11 +401,12 @@ - The File Compare window shows the two versions of the selected files - side by side. Different lines are highlighted with a background color. One - or more consecutive different lines form one difference (or - diff). WinMerge mainly works with these differences, - not separate lines. + The File Compare window shows the two selected files side by side, in + separate document panes. Different lines are highlighted with a background + color. One or more consecutive different lines form one difference (or + diff). In the preceding example, a single difference + is selected in the document panes, which displays it in the Diff Pane. + WinMerge mainly works with these differences, not separate lines. Notice how WinMerge fills missing lines, so that similar lines are diff --git a/Docs/Users/Manual/screenshots/filecomp1.png b/Docs/Users/Manual/screenshots/filecomp1.png index a1ae3f519f43ba0520394cf8860782b33868ac6e..5a16c0eff11ed870ac390a20703f76b7f57c97f8 100644 GIT binary patch literal 38303 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 z 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%0DG#by5H+b9N<~A-@iB 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 literal 43923 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 z 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 IMLu}`599z;dH?_b diff --git a/Docs/Users/Manual/screenshots/filecomp_diffpane1.png b/Docs/Users/Manual/screenshots/filecomp_diffpane1.png index 9c7abe9c0dde7f285befd58575651d4c86931986..ba9399c1a21ff284f2c5efb81e0f512b5c34160a 100644 GIT binary patch literal 4492 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 literal 5990 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 diff --git a/Docs/Users/Manual/screenshots/filemerged1.png b/Docs/Users/Manual/screenshots/filemerged1.png index 65e0e80da63152a15cdcc37419be24f87a4542ad..b717b5ccdd1934355a36e1d4fe645eeb9bb984b0 100644 GIT binary patch literal 38537 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

      *hidw8I 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 literal 36512 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 Uv+;8WfLkPKaRq3Z*ayG=1^D`%TL1t6 diff --git a/Docs/Users/Manual/screenshots/multifoldercomp1.png b/Docs/Users/Manual/screenshots/multifoldercomp1.png new file mode 100644 index 0000000000000000000000000000000000000000..0c3743a0877e0b2fcc3108f30f940f5a472fef91 GIT binary patch literal 35145 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 literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/multifoldercomp2.png b/Docs/Users/Manual/screenshots/multifoldercomp2.png new file mode 100644 index 0000000000000000000000000000000000000000..854ca110a4e6456fbbdda38687e8d6603aef7432 GIT binary patch literal 20642 zcmXtA19)RixK3^F)^@kv+O~FU+jeSgx7ga&R$Du@ZQHi(oB!VD&XZ)$Nlr3nzWKiQ zd*_{b68=L`3I!1#5dZ+7$ViJT0|1ab;NySrkl@!S2FrVJ1>vGBB?_pVAUp=2AUH~E zxc~r2SpPjC0O^^y;5Xr1WfUafmf#_fkRj~i!vp{TQh4$}+wc)JmztR9jxl$9BlyDP#_GcQp5?}U)6a8$NqJB zy*Hutlz`l36mRX|=WQBGt9@Y1M6B9M8oi}(#ZPs6De-~=1BpZc_s%zLsDOVEy%d7^ zk~hDs%953T{P@8wY*c(kD<#ZraPIM~x{sNHonYo_NiSTUjUlPJK>6?2T&27nxeHO5K~P|U@GB$e!g6t@+#T0}&I zi`O%&HSU41R+W%RA7fq6!b${Hm59am7wDjiYQxqA6jG2I{vziEm_x`8v+DFrb-}Le z4*#b41t8rB)Ej4!d){ZIgRtPpvn6e8C@Rd$t4UO@YY4MLumrF}1)v-SB>Xb5Tn?bN ztG%y(`Xb7a7t{m6ZbXMoSS>9q=B)Sa*ed}WAf0U3hX+7H7zRvD0G6P+spd1$f*@k6 zwE)#wRZ|EENEJ@DPhW7wxZkMekfF{cWjalFH2c140Hhan<&d=d@?{HsqbR9#ytGBX z5jOp>{u9&_Xs!--;4_SloGkbgI$)M9c#!7^o@NymkU^%R<0c<6j|#|GzynM*!6X%m zpA*s}F(MTH>8bV!WT0fNF%%XpLS#%56BZE>$!o-zehS+CyXeBw>^l?I0|g^cpw{CpzS95D83yAN9_W1N_(W#hdf$1>EJ*LYo+<(TRKl z)Srx?@XHR;kPJ|b2L~W4z-!zks(24w^O}X~%Ju$Sh%Hyv{bf#GllQ`Lc?S-R`{^lvvRwjEE?!PIngN{`5Lj_7VS&Ks+RR-EM6y zBp7Dan9fKJ9>H8Q=yw2JEK9RMpuoBDT-Yk#&mCl-rBGG>oC86d>22HiHpmYRFRzVX~@qrFvd#^L0b11g^jj670u$iw=S zyW#3cy&H8ys>TnV(ZW9Ht+dgYS&r|nGYGtKl{J;yG?Qnr>ZW031=ocOTJxEOxw+NA z>arxM#n{S(JPPCLSVI}?TsAQ%wp4_%^x(?4JSTA}@xkN}^{TqcR&m1HGP4v`ANFHj z*I$wF1%|`bjOJMYmb!sH!ML=NrMP(z7@v9c&dHhZDf)K5ILd3U}nj)WR$b>8jT<;*o|2hqq2+V1Sp2|ACX&0lSv zFs19kZv9<0>zD+eb5DadxLi+t#atHsdvnTgGWE9o^c>y$LxeOg%{~`4Pu4mwrk>A$ z^Gp_A5FKZK)R16)v)kS;a(w_sC3OfZoG9fr)o&)*jaFC~DQ#0RodSac=!TLhMMy_1 z2j$7LxH@8_wbixOHU@|)GNls-h%Fh0{}{|< zkK^whWECIL75jKt99VxC>2B=sakRo~u>J7asIt#!J7N~Y&URIMP5fM9e@J~i31P0V z_MKaLudcZz8`Pw5R355uzyz2lSFqXMUj3rzm?T)_NUHQ>JZ3|8KYjr^&-w2e?nVyJ zu<&J88SuB6?iuEr-b#7&L6TcL$UV++FQ`J

      i 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 literal 0 HcmV?d00001 From 40e4a4a86cdf136d358b3dcc84ea243f028116d9 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 3 Aug 2008 19:28:15 +0000 Subject: [PATCH 046/168] PATCH: [ 2033754 ] Unlimited undo --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/DiffTextBuffer.cpp | 1 - Src/GhostTextBuffer.cpp | 46 +----------------------------- Src/editlib/ccrystaltextbuffer.cpp | 43 ---------------------------- Src/editlib/ccrystaltextbuffer.h | 1 - 5 files changed, 2 insertions(+), 90 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 10243f217b6..55d3ccda2fa 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -16,6 +16,7 @@ WinMerge 2.9.1.6 Remove RCLocalizationHelper plugin (#2029457) Clarify Supercopier caused hang in release notes (#2030040) Confirmation dialog for move operations (#2026508) + Unlimited undo (#2033754) 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) diff --git a/Src/DiffTextBuffer.cpp b/Src/DiffTextBuffer.cpp index 5fa5ddc46d9..2ce7b10d288 100644 --- a/Src/DiffTextBuffer.cpp +++ b/Src/DiffTextBuffer.cpp @@ -482,7 +482,6 @@ int CDiffTextBuffer::LoadFromFile(LPCTSTR pszFileNameInit, m_bInit = TRUE; m_bModified = FALSE; m_bUndoGroup = m_bUndoBeginGroup = FALSE; - m_nUndoBufSize = 1024; // crystaltextbuffer.cpp - UNDO_BUF_SIZE; m_nSyncPosition = m_nUndoPosition = 0; ASSERT(m_aUndoBuf.GetSize() == 0); m_ptLastChange.x = m_ptLastChange.y = -1; diff --git a/Src/GhostTextBuffer.cpp b/Src/GhostTextBuffer.cpp index 399caa9a4e4..839070c098c 100644 --- a/Src/GhostTextBuffer.cpp +++ b/Src/GhostTextBuffer.cpp @@ -561,45 +561,6 @@ AddUndoRecord (BOOL bInsert, const CPoint & ptStartPos, const CPoint & ptEndPos, m_aUndoBuf.SetSize (m_nUndoPosition); } - // If undo buffer size is close to critical, remove the oldest records - ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize); - nBufSize = (int) m_aUndoBuf.GetSize (); - if (nBufSize >= m_nUndoBufSize) - { - int nIndex = 0; - for (;;) - { - nIndex++; - if (nIndex == nBufSize || (m_aUndoBuf[nIndex].m_dwFlags & UNDO_BEGINGROUP) != 0) - break; - } - m_aUndoBuf.RemoveAt (0, nIndex); - -// -//- Keep m_nSyncPosition in sync. -//- Ensure first undo record is flagged UNDO_BEGINGROUP since part of the code -//..relies on this condition. - if (m_nSyncPosition >= 0) - { - m_nSyncPosition -= nIndex; // c'est bien...mais non, test inutile ? Ou Apres ! - } - if (nIndex < nBufSize) - { - // Not really necessary as long as groups are discarded as a whole. - // Just in case some day the loop above should be changed to limit - // the number of discarded undo records to some reasonable value... - m_aUndoBuf[0].m_dwFlags |= UNDO_BEGINGROUP; // c'est sale - } - else - { - // No undo records left - begin a new group: - m_bUndoBeginGroup = TRUE; - } -// - - } - ASSERT (m_aUndoBuf.GetSize () < m_nUndoBufSize); - // Add new record SUndoRecord ur; ur.m_dwFlags = bInsert ? UNDO_INSERT : 0; @@ -623,7 +584,6 @@ AddUndoRecord (BOOL bInsert, const CPoint & ptStartPos, const CPoint & ptEndPos, m_aUndoBuf.Add (ur); m_nUndoPosition = (int) m_aUndoBuf.GetSize (); - ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize); } @@ -728,8 +688,6 @@ InsertText (CCrystalTextView * pSource, int nLine, int nPos, LPCTSTR pszText, in } RecomputeEOL (pSource, nLine, nEndLine); - - if (bHistory == false) { delete paSavedRevisonNumbers; @@ -821,9 +779,7 @@ DeleteText (CCrystalTextView * pSource, int nStartLine, int nStartChar, } RecomputeEOL (pSource, nStartLine, nStartLine); - - - if (bHistory == false) + if (bHistory == FALSE) { delete paSavedRevisonNumbers; return TRUE; diff --git a/Src/editlib/ccrystaltextbuffer.cpp b/Src/editlib/ccrystaltextbuffer.cpp index 1c97ebd06e6..b34a9a5d33f 100644 --- a/Src/editlib/ccrystaltextbuffer.cpp +++ b/Src/editlib/ccrystaltextbuffer.cpp @@ -79,8 +79,6 @@ static char THIS_FILE[] = __FILE__; #define CHAR_ALIGN 16 #define ALIGN_BUF_SIZE(size) ((size) / CHAR_ALIGN) * CHAR_ALIGN + CHAR_ALIGN; -#define UNDO_BUF_SIZE 1024 - const TCHAR crlf[] = _T ("\r\n"); #ifdef _DEBUG @@ -401,7 +399,6 @@ InitNew (CRLFSTYLE nCrlfStyle /*= CRLF_STYLE_DOS*/ ) m_nTabSize = 4; m_nSyncPosition = m_nUndoPosition = 0; m_bUndoGroup = m_bUndoBeginGroup = FALSE; - m_nUndoBufSize = UNDO_BUF_SIZE; ASSERT (m_aUndoBuf.GetSize () == 0); UpdateViews (NULL, NULL, UPDATE_RESET); //BEGIN SW @@ -1576,45 +1573,6 @@ AddUndoRecord (BOOL bInsert, const CPoint & ptStartPos, const CPoint & ptEndPos, m_aUndoBuf.SetSize (m_nUndoPosition); } - // If undo buffer size is close to critical, remove the oldest records - ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize); - nBufSize = (int) m_aUndoBuf.GetSize (); - if (nBufSize >= m_nUndoBufSize) - { - int nIndex = 0; - for (;;) - { - nIndex++; - if (nIndex == nBufSize || (m_aUndoBuf[nIndex].m_dwFlags & UNDO_BEGINGROUP) != 0) - break; - } - m_aUndoBuf.RemoveAt (0, nIndex); - -// -//- Keep m_nSyncPosition in sync. -//- Ensure first undo record is flagged UNDO_BEGINGROUP since part of the code -// relies on this condition. - if (m_nSyncPosition >= 0) - { - m_nSyncPosition -= nIndex; // c'est bien...mais non, test inutile ? Ou Apres ! - } - if (nIndex < nBufSize) - { - // Not really necessary as long as groups are discarded as a whole. - // Just in case some day the loop above should be changed to limit - // the number of discarded undo records to some reasonable value... - m_aUndoBuf[0].m_dwFlags |= UNDO_BEGINGROUP; // c'est sale - } - else - { - // No undo records left - begin a new group: - m_bUndoBeginGroup = TRUE; - } -// - - } - ASSERT (m_aUndoBuf.GetSize () < m_nUndoBufSize); - // Add new record SUndoRecord ur; ur.m_dwFlags = bInsert ? UNDO_INSERT : 0; @@ -1632,7 +1590,6 @@ AddUndoRecord (BOOL bInsert, const CPoint & ptStartPos, const CPoint & ptEndPos, m_aUndoBuf.Add (ur); m_nUndoPosition = (int) m_aUndoBuf.GetSize (); - ASSERT (m_aUndoBuf.GetSize () <= m_nUndoBufSize); } LPCTSTR CCrystalTextBuffer::GetStringEol(CRLFSTYLE nCRLFMode) diff --git a/Src/editlib/ccrystaltextbuffer.h b/Src/editlib/ccrystaltextbuffer.h index 080ff81d3f8..19dce60bc62 100644 --- a/Src/editlib/ccrystaltextbuffer.h +++ b/Src/editlib/ccrystaltextbuffer.h @@ -118,7 +118,6 @@ protected : CRLFSTYLE m_nCRLFMode; BOOL m_IgnoreEol; BOOL m_bCreateBackupFile; - int m_nUndoBufSize; BOOL m_bInsertTabs; int m_nTabSize; int FindLineWithFlag (DWORD dwFlag); From 795d5a2913ccc43fbbfe8a577927d8a562b10b90 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 5 Aug 2008 19:09:56 +0000 Subject: [PATCH 047/168] PATCH: [ 2037677 ] Do not register ShellExtension for release builds --HG-- branch : R2_10 --- ShellExtension/ShellExtension.vcproj | 40 +++---------------------- ShellExtension/ShellExtensionX64.vcproj | 13 +------- 2 files changed, 5 insertions(+), 48 deletions(-) diff --git a/ShellExtension/ShellExtension.vcproj b/ShellExtension/ShellExtension.vcproj index c1120b89467..bb50118578a 100644 --- a/ShellExtension/ShellExtension.vcproj +++ b/ShellExtension/ShellExtension.vcproj @@ -112,18 +112,7 @@ echo Warning : Cannot register Unicode DLL on Windows 95 SuppressStartupBanner="TRUE" CompileAs="0"/> + Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool"/> + Name="VCCustomBuildTool"/> Date: Tue, 5 Aug 2008 19:15:34 +0000 Subject: [PATCH 048/168] BUG: [ 1153696 ] Backspace doesn't work if Shift pressed down --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/editlib/editres.rc | 1 + 2 files changed, 2 insertions(+) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 55d3ccda2fa..2777403edcc 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -25,6 +25,7 @@ WinMerge 2.9.1.6 window is open (#2010463) BugFix: Moving was allowed for protected items (#2023734) BugFix: Could change EOL style for protected file (#2025781) + BugFix: Shift+Backspace didn't work in editor (#1153696) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/editlib/editres.rc b/Src/editlib/editres.rc index e1bea28c7d2..de3a92410cc 100644 --- a/Src/editlib/editres.rc +++ b/Src/editlib/editres.rc @@ -58,6 +58,7 @@ BEGIN VK_BACK, ID_EDIT_DELETE_BACK, VIRTKEY, NOINVERT VK_BACK, ID_EDIT_DELETE_WORD_BACK, VIRTKEY, CONTROL, NOINVERT VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT + VK_BACK, ID_EDIT_DELETE_BACK, VIRTKEY, SHIFT, NOINVERT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT VK_DELETE, ID_EDIT_DELETE_WORD, VIRTKEY, CONTROL, NOINVERT VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT From 79fb2bb7eb7e84f1113cd78ec259e104ca3c2188 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Wed, 6 Aug 2008 15:35:39 +0000 Subject: [PATCH 049/168] BUG: [ 2025833 ] Deleting/Moving file crashes WinMerge in debugger --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/DirActions.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 2777403edcc..e05ed2da48e 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -26,6 +26,7 @@ WinMerge 2.9.1.6 BugFix: Moving was allowed for protected items (#2023734) BugFix: Could change EOL style for protected file (#2025781) BugFix: Shift+Backspace didn't work in editor (#1153696) + BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index c39b57b6793..dbfce6d1a45 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -994,7 +994,7 @@ void CDirView::UpdateAfterFileScript(FileActionScript & actionList) // doesn't invalidate our item indexes. FileActionItem act = actionList.RemoveTailActionItem(); POSITION diffpos = GetItemKey(act.context); - const DIFFITEM & di = pDoc->GetDiffByKey(diffpos); + DIFFCODE diffcode = pDoc->GetDiffByKey(diffpos).diffcode; BOOL bUpdateLeft = FALSE; BOOL bUpdateRight = FALSE; @@ -1021,7 +1021,7 @@ void CDirView::UpdateAfterFileScript(FileActionScript & actionList) break; case FileActionItem::UI_DEL_LEFT: - if (di.diffcode.isSideLeftOnly()) + if (diffcode.isSideLeftOnly()) { m_pList->DeleteItem(act.context); bItemsRemoved = TRUE; @@ -1033,7 +1033,7 @@ void CDirView::UpdateAfterFileScript(FileActionScript & actionList) break; case FileActionItem::UI_DEL_RIGHT: - if (di.diffcode.isSideRightOnly()) + if (diffcode.isSideRightOnly()) { m_pList->DeleteItem(act.context); bItemsRemoved = TRUE; From 6c1b6b076a9fd16f0cad5376820ba274b46b65a1 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 6 Aug 2008 16:42:11 +0000 Subject: [PATCH 050/168] PATCH: [ 2039228 ] Add wait-cursor and statusbar message for undo and redo --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/English.pot | 924 +++++++++++++++++++------------------- Src/Merge.rc | 2 + Src/MergeEditView.cpp | 2 + Src/resource.h | 2 + 5 files changed, 474 insertions(+), 457 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index e05ed2da48e..1d26df7f221 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -17,6 +17,7 @@ WinMerge 2.9.1.6 Clarify Supercopier caused hang in release notes (#2030040) Confirmation dialog for move operations (#2026508) Unlimited undo (#2033754) + Add wait cursor for undo and redo (#2039228) 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) diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index 1db7087f9f6..7e44b8c7e82 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" 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-31 22:33+0000\n" +"POT-Creation-Date: 2008-08-06 19:36+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -701,7 +701,7 @@ msgid "&Scripts" msgstr "" #: Merge.rc:366 -#: Merge.rc:2750 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "" @@ -1413,7 +1413,7 @@ msgid "Replace &All" msgstr "" #: Merge.rc:860 -#: Merge.rc:2162 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "" @@ -2306,7 +2306,7 @@ msgid "Files:" msgstr "" #: Merge.rc:1476 -#: Merge.rc:2308 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "" @@ -2338,7 +2338,7 @@ msgid "Right:" msgstr "" #: Merge.rc:1494 -#: Merge.rc:2303 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "" @@ -2528,7 +2528,7 @@ msgid "A&ppend timestamp" msgstr "" #: Merge.rc:1639 -#: Merge.rc:2218 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "" @@ -3147,7 +3147,7 @@ msgid "Size" msgstr "" #: Merge.rc:2006 -#: Merge.rc:2614 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "" @@ -3168,7 +3168,7 @@ msgid "[F] " msgstr "" #: Merge.rc:2010 -#: Merge.rc:2616 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "" @@ -3318,2218 +3318,2228 @@ msgstr "" msgid "Creating the report..." msgstr "" -#: Merge.rc:2076 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "" -#: Merge.rc:2077 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "" -#: Merge.rc:2078 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "" -#: Merge.rc:2079 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "" -#: Merge.rc:2080 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "" -#: Merge.rc:2081 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr "" -#: Merge.rc:2082 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr "" #. Abbreviation from "Read Only" -#: Merge.rc:2083 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "" -#: Merge.rc:2089 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "" -#: Merge.rc:2090 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "" -#: Merge.rc:2096 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "" -#: Merge.rc:2097 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "" -#: Merge.rc:2098 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "" -#: Merge.rc:2099 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "" -#: Merge.rc:2100 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "" -#: Merge.rc:2101 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "" -#: Merge.rc:2102 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "" -#: Merge.rc:2103 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "" -#: Merge.rc:2109 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "" -#: Merge.rc:2110 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "" -#: Merge.rc:2111 +#: Merge.rc:2113 #, c-format msgid "Cannot open file\n%1\n\n%2" msgstr "" -#: Merge.rc:2112 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "" -#: Merge.rc:2113 +#: Merge.rc:2115 #, c-format msgid "The file\n%1\nis not a conflict file." msgstr "" -#: Merge.rc:2119 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "" -#: Merge.rc:2120 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "" -#: Merge.rc:2121 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "" -#: Merge.rc:2122 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "" -#: Merge.rc:2123 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "" -#: Merge.rc:2125 +#: Merge.rc:2127 #, c-format msgid "Unable to backup original file:\n%1\n\nContinue anyway?" msgstr "" -#: Merge.rc:2126 +#: Merge.rc:2128 #, 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:2127 +#: Merge.rc:2129 #, 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:2128 +#: Merge.rc:2130 #, 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:2129 +#: Merge.rc:2131 #, c-format msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?" msgstr "" -#: Merge.rc:2130 +#: Merge.rc:2132 #, c-format msgid "%1\nis marked read-only. Would you like to override the read-only item?" msgstr "" -#: Merge.rc:2131 +#: Merge.rc:2133 #, 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:2132 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "" -#: Merge.rc:2133 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "" -#: Merge.rc:2139 +#: Merge.rc:2141 #, c-format msgid "Cannot merge differences when documents are not in synch.\n\nRefresh documents before continuing." msgstr "" -#: Merge.rc:2145 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "" -#: Merge.rc:2146 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr "" -#: Merge.rc:2147 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "" -#: Merge.rc:2148 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "" -#: Merge.rc:2149 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "" -#: Merge.rc:2150 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "" -#: Merge.rc:2151 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "" -#: Merge.rc:2152 +#: Merge.rc:2154 #, 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:2153 +#: Merge.rc:2155 #, 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:2159 -#: Merge.rc:2598 -#: Merge.rc:2786 +#: Merge.rc:2161 +#: Merge.rc:2600 +#: Merge.rc:2788 #, c-format msgid "None" msgstr "" -#: Merge.rc:2160 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "" -#: Merge.rc:2161 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "" -#: Merge.rc:2163 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "" -#: Merge.rc:2164 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "" -#: Merge.rc:2170 #: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "" -#: Merge.rc:2171 #: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "" -#: Merge.rc:2174 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "" -#: Merge.rc:2175 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "" -#: Merge.rc:2176 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "" -#: Merge.rc:2177 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "" -#: Merge.rc:2178 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "" -#: Merge.rc:2179 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "" -#: Merge.rc:2180 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "" -#: Merge.rc:2181 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "" -#: Merge.rc:2182 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "" -#: Merge.rc:2183 -#: Merge.rc:2199 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "" -#: Merge.rc:2184 -#: Merge.rc:2200 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "" -#: Merge.rc:2185 -#: Merge.rc:2201 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "" -#: Merge.rc:2186 -#: Merge.rc:2202 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "" -#: Merge.rc:2192 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr "" -#: Merge.rc:2193 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "" -#: Merge.rc:2194 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr "" -#: Merge.rc:2195 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr "" -#: Merge.rc:2196 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "" -#: Merge.rc:2197 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr "" -#: Merge.rc:2198 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "" -#: Merge.rc:2203 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr "" -#: Merge.rc:2204 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "" -#: Merge.rc:2205 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "" -#: Merge.rc:2206 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "" -#: Merge.rc:2212 +#: Merge.rc:2214 #, c-format msgid "Are you sure you want to delete\n\n%1 ?" msgstr "" -#: Merge.rc:2213 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "" -#: Merge.rc:2214 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "" -#: Merge.rc:2215 +#: Merge.rc:2217 #, 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:2216 +#: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" msgstr "" -#: Merge.rc:2217 +#: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" msgstr "" -#: Merge.rc:2219 +#: Merge.rc:2221 #, c-format msgid "Confirm Move" msgstr "" -#: Merge.rc:2225 +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "" -#: Merge.rc:2226 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "" -#: Merge.rc:2227 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "" -#: Merge.rc:2229 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "" -#: Merge.rc:2230 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "" -#: Merge.rc:2231 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "" -#: Merge.rc:2232 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "" -#: Merge.rc:2233 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "" -#: Merge.rc:2234 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "" -#: Merge.rc:2235 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "" -#: Merge.rc:2236 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "" -#: Merge.rc:2242 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "" -#: Merge.rc:2243 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "" -#: Merge.rc:2244 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "" -#: Merge.rc:2245 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "" -#: Merge.rc:2246 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "" -#: Merge.rc:2248 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "" -#: Merge.rc:2250 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "" -#: Merge.rc:2256 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "" -#: Merge.rc:2257 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "" -#: Merge.rc:2258 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "" -#: Merge.rc:2259 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2260 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "" -#: Merge.rc:2261 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "" -#: Merge.rc:2262 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "" -#: Merge.rc:2263 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "" -#: Merge.rc:2264 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "" -#: Merge.rc:2265 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "" -#: Merge.rc:2271 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "" -#: Merge.rc:2272 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "" -#: Merge.rc:2273 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "" -#: Merge.rc:2274 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "" -#: Merge.rc:2275 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "" -#: Merge.rc:2276 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "" -#: Merge.rc:2277 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "" -#: Merge.rc:2278 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "" -#: Merge.rc:2279 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr "" -#: Merge.rc:2280 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "" -#: Merge.rc:2286 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "" -#: Merge.rc:2287 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "" -#: Merge.rc:2288 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "" -#: Merge.rc:2289 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "" -#: Merge.rc:2290 -#: Merge.rc:2594 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "" -#: Merge.rc:2296 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "" -#: Merge.rc:2297 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "" -#: Merge.rc:2298 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "" -#: Merge.rc:2299 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "" -#: Merge.rc:2300 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "" -#: Merge.rc:2301 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "" -#: Merge.rc:2302 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "" -#: Merge.rc:2304 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "" -#: Merge.rc:2305 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "" -#: Merge.rc:2306 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "" -#: Merge.rc:2307 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "" -#: Merge.rc:2309 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "" -#: Merge.rc:2315 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "" -#: Merge.rc:2316 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "" -#: Merge.rc:2317 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "" -#: Merge.rc:2323 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "" -#: Merge.rc:2324 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "" -#: Merge.rc:2325 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "" -#: Merge.rc:2326 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "" -#: Merge.rc:2327 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "" -#: Merge.rc:2328 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "" -#: Merge.rc:2329 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "" -#: Merge.rc:2330 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "" -#: Merge.rc:2331 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "" -#: Merge.rc:2332 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "" -#: Merge.rc:2338 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "" -#: Merge.rc:2339 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "" -#: Merge.rc:2340 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "" -#: Merge.rc:2341 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "" -#: Merge.rc:2342 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "" -#: Merge.rc:2343 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "" -#: Merge.rc:2344 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "" -#: Merge.rc:2345 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "" -#: Merge.rc:2346 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "" -#: Merge.rc:2347 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "" -#: Merge.rc:2353 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "" -#: Merge.rc:2354 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "" -#: Merge.rc:2355 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "" -#: Merge.rc:2356 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "" -#: Merge.rc:2357 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "" -#: Merge.rc:2363 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr "" -#: Merge.rc:2364 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "" -#: Merge.rc:2365 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "" -#: Merge.rc:2366 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr "" -#: Merge.rc:2367 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr "" -#: Merge.rc:2369 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "" -#: Merge.rc:2370 +#: Merge.rc:2372 #, c-format msgid "Error creating the report:\n%1" msgstr "" -#: Merge.rc:2371 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "" -#: Merge.rc:2377 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "" -#: Merge.rc:2378 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "" -#: Merge.rc:2379 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "" -#: Merge.rc:2380 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "" -#: Merge.rc:2381 +#: Merge.rc:2383 #, 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:2382 +#: Merge.rc:2384 #, 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:2383 +#: Merge.rc:2385 #, 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:2384 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "" -#: Merge.rc:2385 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "" -#: Merge.rc:2386 +#: Merge.rc:2388 #, 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:2392 +#: Merge.rc:2394 #, 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:2393 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "" -#: Merge.rc:2394 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "" -#: Merge.rc:2395 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "" -#: Merge.rc:2396 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "" -#: Merge.rc:2402 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "" -#: Merge.rc:2403 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "" -#: Merge.rc:2409 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "" -#: Merge.rc:2410 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "" -#: Merge.rc:2416 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "" -#: Merge.rc:2417 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "" -#: Merge.rc:2423 +#: Merge.rc:2425 #, c-format msgid "Location Pane" msgstr "" -#: Merge.rc:2424 +#: Merge.rc:2426 #, c-format msgid "Diff Pane" msgstr "" -#: Merge.rc:2430 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "" -#: Merge.rc:2431 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "" -#: Merge.rc:2432 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "" -#: Merge.rc:2433 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "" -#: Merge.rc:2434 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "" -#: Merge.rc:2435 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "" -#: Merge.rc:2436 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "" -#: Merge.rc:2437 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "" -#: Merge.rc:2438 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "" -#: Merge.rc:2439 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "" -#: Merge.rc:2440 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "" -#: Merge.rc:2441 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "" -#: Merge.rc:2442 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "" -#: Merge.rc:2443 +#: Merge.rc:2445 #, c-format msgid "Please save all files first.\n\nCreating a patch requires that there are no unsaved changes in files." msgstr "" -#: Merge.rc:2444 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "" -#: Merge.rc:2449 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "" -#: Merge.rc:2450 +#: Merge.rc:2452 #, 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:2451 +#: Merge.rc:2453 #, c-format msgid "\nNote: 7-Zip integration is disabled in WinMerge settings." msgstr "" -#: Merge.rc:2452 +#: Merge.rc:2454 #, c-format msgid "\nNote: 7-Zip integration is restricted to standalone operation in WinMerge settings." msgstr "" -#: Merge.rc:2453 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "" -#: Merge.rc:2454 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "" -#: Merge.rc:2455 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "" -#: Merge.rc:2456 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "" -#: Merge.rc:2457 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "" -#: Merge.rc:2458 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "" -#: Merge.rc:2459 +#: Merge.rc:2461 #, c-format msgid "You are about to close several compare windows.\n\nDo you want to continue?" msgstr "" -#: Merge.rc:2465 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "" -#: Merge.rc:2466 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "" -#: Merge.rc:2467 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "" -#: Merge.rc:2468 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "" -#: Merge.rc:2469 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "" -#: Merge.rc:2470 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "" -#: Merge.rc:2471 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "" -#: Merge.rc:2472 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "" -#: Merge.rc:2473 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "" -#: Merge.rc:2474 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "" -#: Merge.rc:2475 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "" -#: Merge.rc:2476 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "" -#: Merge.rc:2477 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "" -#: Merge.rc:2478 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "" -#: Merge.rc:2479 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2480 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "" -#: Merge.rc:2485 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr "" -#: Merge.rc:2491 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "" -#: Merge.rc:2492 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "" -#: Merge.rc:2493 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "" -#: Merge.rc:2494 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "" -#: Merge.rc:2495 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "" -#: Merge.rc:2496 -#: Merge.rc:2506 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "" -#: Merge.rc:2502 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "" -#: Merge.rc:2503 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "" -#: Merge.rc:2504 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "" -#: Merge.rc:2505 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "" -#: Merge.rc:2512 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "" -#: Merge.rc:2513 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "" -#: Merge.rc:2519 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "" -#: Merge.rc:2520 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "" -#: Merge.rc:2521 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "" -#: Merge.rc:2522 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "" -#: Merge.rc:2523 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "" -#: Merge.rc:2524 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "" -#: Merge.rc:2525 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "" -#: Merge.rc:2526 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "" -#: Merge.rc:2527 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "" -#: Merge.rc:2528 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "" -#: Merge.rc:2534 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "" -#: Merge.rc:2535 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "" -#: Merge.rc:2536 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "" -#: Merge.rc:2537 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "" -#: Merge.rc:2538 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "" -#: Merge.rc:2539 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "" -#: Merge.rc:2545 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "" -#: Merge.rc:2546 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "" -#: Merge.rc:2547 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "" -#: Merge.rc:2548 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "" -#: Merge.rc:2549 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "" -#: Merge.rc:2550 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "" -#: Merge.rc:2551 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "" -#: Merge.rc:2552 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "" -#: Merge.rc:2553 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "" -#: Merge.rc:2554 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "" -#: Merge.rc:2555 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "" -#: Merge.rc:2556 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "" -#: Merge.rc:2557 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "" -#: Merge.rc:2558 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "" -#: Merge.rc:2564 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "" -#: Merge.rc:2565 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "" -#: Merge.rc:2566 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "" -#: Merge.rc:2567 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "" -#: Merge.rc:2568 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "" -#: Merge.rc:2569 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "" -#: Merge.rc:2578 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr "" -#: Merge.rc:2581 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr "" -#: Merge.rc:2582 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr "" -#: Merge.rc:2583 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr "" -#: Merge.rc:2584 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr "" -#: Merge.rc:2590 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "" -#: Merge.rc:2591 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "" -#: Merge.rc:2592 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "" -#: Merge.rc:2593 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "" -#: Merge.rc:2595 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "" -#: Merge.rc:2596 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "" -#: Merge.rc:2597 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "" -#: Merge.rc:2604 +#: Merge.rc:2606 #, c-format msgid " B" msgstr "" -#: Merge.rc:2605 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr "" -#: Merge.rc:2606 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr "" -#: Merge.rc:2608 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr "" -#: Merge.rc:2609 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr "" -#: Merge.rc:2615 +#: Merge.rc:2617 #, c-format msgid "Type" msgstr "" -#: Merge.rc:2617 +#: Merge.rc:2619 #, c-format msgid "Unpacker" msgstr "" -#: Merge.rc:2618 +#: Merge.rc:2620 #, c-format msgid "Prediffer" msgstr "" -#: Merge.rc:2619 +#: Merge.rc:2621 #, c-format msgid "Editor script" msgstr "" -#: Merge.rc:2626 +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "" -#: Merge.rc:2627 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "" -#: Merge.rc:2628 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "" -#: Merge.rc:2629 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "" -#: Merge.rc:2630 +#: Merge.rc:2632 #, c-format msgid "Change left side file/folder read-only status" msgstr "" -#: Merge.rc:2631 +#: Merge.rc:2633 #, c-format msgid "Change right side file/folder read-only status" msgstr "" -#: Merge.rc:2632 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "" -#: Merge.rc:2633 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "" -#: Merge.rc:2634 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "" -#: Merge.rc:2635 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "" -#: Merge.rc:2636 +#: Merge.rc:2638 #, c-format msgid "View and adjust file encoding properties\nFile encoding properties" msgstr "" -#: Merge.rc:2637 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "" -#: Merge.rc:2643 +#: Merge.rc:2645 #, c-format msgid "Select difference area in the current line\nDifference in the Current Line" msgstr "" -#: Merge.rc:2644 +#: Merge.rc:2646 #, c-format msgid "Go to line or difference\nGo to (Ctrl+G)" msgstr "" -#: Merge.rc:2645 +#: Merge.rc:2647 #, c-format msgid "Set program options\nOptions" msgstr "" -#: Merge.rc:2646 +#: Merge.rc:2648 #, c-format msgid "Refresh display\nRefresh (F5)" msgstr "" -#: Merge.rc:2647 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "" -#: Merge.rc:2648 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2649 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "" -#: Merge.rc:2650 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "" -#: Merge.rc:2651 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "" -#: Merge.rc:2652 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "" -#: Merge.rc:2658 +#: Merge.rc:2660 #, c-format msgid "Displays items that are exactly the same\nShow Identical Items" msgstr "" -#: Merge.rc:2659 +#: Merge.rc:2661 #, c-format msgid "Displays items that have differences\nShow Different Items" msgstr "" -#: Merge.rc:2660 +#: Merge.rc:2662 #, c-format msgid "Displays items that exist in only on the left side\nShow Left Unique Items" msgstr "" -#: Merge.rc:2661 +#: Merge.rc:2663 #, c-format msgid "Displays items that exist in only on the right side\nShow Right Unique Items" msgstr "" -#: Merge.rc:2662 +#: Merge.rc:2664 #, c-format msgid "Displays binary files\nShow Binary Files" msgstr "" -#: Merge.rc:2663 +#: Merge.rc:2665 #, c-format msgid "Displays skipped items\nShow Skipped Items" msgstr "" -#: Merge.rc:2669 +#: Merge.rc:2671 #, c-format msgid "Select the font for the view\nSelect View Font" msgstr "" -#: Merge.rc:2670 +#: Merge.rc:2672 #, c-format msgid "Revert to using the default system font for view\nDefault Font" msgstr "" -#: Merge.rc:2671 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "" -#: Merge.rc:2672 +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" msgstr "" -#: Merge.rc:2673 +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" msgstr "" -#: Merge.rc:2674 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "" -#: Merge.rc:2675 +#: Merge.rc:2677 #, c-format msgid "Select the current user interface language\nLanguage" msgstr "" -#: Merge.rc:2676 +#: Merge.rc:2678 #, c-format msgid "Shows differences inside lines with different colors\nShow Line Difference" msgstr "" -#: Merge.rc:2677 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "" -#: Merge.rc:2678 +#: Merge.rc:2680 #, c-format msgid "Shows line numbers\nShow Line Numbers" msgstr "" -#: Merge.rc:2679 +#: Merge.rc:2681 #, c-format msgid "Enable word wrap\nWrap Lines" msgstr "" -#: Merge.rc:2680 +#: Merge.rc:2682 #, c-format msgid "Shows selection margins for both panes\nShow Selection Margins" msgstr "" -#: Merge.rc:2681 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "" -#: Merge.rc:2682 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "" -#: Merge.rc:2683 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "" -#: Merge.rc:2689 +#: Merge.rc:2691 #, c-format msgid "Scroll to the previous difference\nPrevious Difference (Alt+Up)" msgstr "" -#: Merge.rc:2690 +#: Merge.rc:2692 #, c-format msgid "Scroll to the next difference\nNext Difference (Alt+Down)" msgstr "" -#: Merge.rc:2691 +#: Merge.rc:2693 #, c-format msgid "Scroll to the first difference\nFirst Difference (Alt+Home)" msgstr "" -#: Merge.rc:2692 +#: Merge.rc:2694 #, c-format msgid "Scroll to the current difference\nCurrent Difference (Alt+Enter)" msgstr "" -#: Merge.rc:2693 +#: Merge.rc:2695 #, c-format msgid "Scroll to the last difference\nLast Difference (Alt+End)" msgstr "" -#: Merge.rc:2694 +#: Merge.rc:2696 #, c-format msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)" msgstr "" -#: Merge.rc:2695 +#: Merge.rc:2697 #, c-format msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)" msgstr "" -#: Merge.rc:2696 +#: Merge.rc:2698 #, c-format msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)" msgstr "" -#: Merge.rc:2697 +#: Merge.rc:2699 #, c-format msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)" msgstr "" -#: Merge.rc:2698 +#: Merge.rc:2700 #, c-format msgid "Copy all differences to the right file\nAll Right" msgstr "" -#: Merge.rc:2699 +#: Merge.rc:2701 #, c-format msgid "Copy all differences to the left file\nAll Left" msgstr "" -#: Merge.rc:2700 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "" -#: Merge.rc:2701 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "" -#: Merge.rc:2707 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "" -#: Merge.rc:2708 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "" -#: Merge.rc:2709 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "" -#: Merge.rc:2716 +#: Merge.rc:2718 #, c-format msgid "Shows a list of available plugins" msgstr "" -#: Merge.rc:2717 +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "" -#: Merge.rc:2718 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "" -#: Merge.rc:2719 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "" -#: Merge.rc:2720 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "" -#: Merge.rc:2721 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "" -#: Merge.rc:2722 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "" -#: Merge.rc:2723 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "" -#: Merge.rc:2729 +#: Merge.rc:2731 #, c-format msgid "Activates next visible file\nActivate next File" msgstr "" -#: Merge.rc:2730 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2738 #, c-format msgid "Opens the WinMerge Help\nWinMerge Help" msgstr "" -#: Merge.rc:2737 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "" -#: Merge.rc:2738 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr "" -#: Merge.rc:2739 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "" -#: Merge.rc:2740 +#: Merge.rc:2742 #, c-format msgid "Opens the release notes document\nRelease Notes" msgstr "" -#: Merge.rc:2741 +#: Merge.rc:2743 #, c-format msgid "Opens the translations website\nTranslations" msgstr "" -#: Merge.rc:2747 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "" -#: Merge.rc:2748 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "" -#: Merge.rc:2749 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "" -#: Merge.rc:2751 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "" -#: Merge.rc:2752 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2753 +#: Merge.rc:2755 #, c-format msgid "" msgstr "" -#: Merge.rc:2759 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "" -#: Merge.rc:2760 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "" -#: Merge.rc:2761 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "" -#: Merge.rc:2767 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "" -#: Merge.rc:2768 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "" -#: Merge.rc:2769 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "" -#: Merge.rc:2770 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "" -#: Merge.rc:2771 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr "" -#: Merge.rc:2772 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "" -#: Merge.rc:2778 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2779 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "" -#: Merge.rc:2780 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "" -#: Merge.rc:2787 +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "" -#: Merge.rc:2788 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "" -#: Merge.rc:2789 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "" -#: Merge.rc:2790 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "" -#: Merge.rc:2791 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "" -#: Merge.rc:2792 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "" -#: Merge.rc:2793 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "" -#: Merge.rc:2794 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "" -#: Merge.rc:2795 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "" -#: Merge.rc:2796 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "" -#: Merge.rc:2797 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "" -#: Merge.rc:2798 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "" -#: Merge.rc:2799 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "" -#: Merge.rc:2800 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "" -#: Merge.rc:2801 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "" -#: Merge.rc:2802 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "" -#: Merge.rc:2803 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "" -#: Merge.rc:2804 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "" -#: Merge.rc:2805 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "" -#: Merge.rc:2806 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "" -#: Merge.rc:2807 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "" -#: Merge.rc:2808 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "" -#: Merge.rc:2809 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "" -#: Merge.rc:2810 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "" -#: Merge.rc:2811 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "" -#: Merge.rc:2812 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "" -#: Merge.rc:2813 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "" -#: Merge.rc:2814 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "" -#: Merge.rc:2815 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "" -#: Merge.rc:2816 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "" -#: Merge.rc:2817 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "" -#: Merge.rc:2822 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "" -#: Merge.rc:2823 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "" -#: Merge.rc:2824 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "" diff --git a/Src/Merge.rc b/Src/Merge.rc index 9ed4d8a2a09..7b69ee9c876 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -2068,6 +2068,8 @@ BEGIN IDS_STATUS_DELETEFILES "Deleting files..." IDS_STATUS_MOVEFILES "Moving files..." IDS_STATUS_CREATEREPORT "Creating the report..." + IDS_STATUS_UNDO "Undoing the last operation..." + IDS_STATUS_REDO "Redoing the previous operation..." END // STATUS BAR : OTHER PANES (MOSTLY FOR EDITOR) diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index c61c32cece7..e726131b92f 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -796,6 +796,7 @@ void CMergeEditView::OnUpdateEditPaste(CCmdUI* pCmdUI) */ void CMergeEditView::OnEditUndo() { + WaitStatusCursor waitstatus(IDS_STATUS_UNDO); CMergeDoc* pDoc = GetDocument(); CMergeEditView *tgt = *(pDoc->curUndo-1); if(tgt==this) @@ -1417,6 +1418,7 @@ void CMergeEditView::OnEditOperation(int nAction, LPCTSTR pszText) */ void CMergeEditView::OnEditRedo() { + WaitStatusCursor waitstatus(IDS_STATUS_REDO); CMergeDoc* pDoc = GetDocument(); CMergeEditView *tgt = *(pDoc->curUndo); if(tgt==this) diff --git a/Src/resource.h b/Src/resource.h index 3a193e34f01..db6c9f9a388 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -538,6 +538,8 @@ #define IDS_STATUS_DELETEFILES 16823 #define IDS_STATUS_MOVEFILES 16824 #define IDS_STATUS_CREATEREPORT 16825 +#define IDS_STATUS_UNDO 16826 +#define IDS_STATUS_REDO 16827 #define IDS_LINE_STATUS_INFO_EOL 16832 #define IDS_EMPTY_LINE_STATUS_INFO 16833 #define IDS_LINE_STATUS_INFO 16834 From c633507d1af8f1c53ca1bd9adc0f3daa7120d405 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 6 Aug 2008 17:08:58 +0000 Subject: [PATCH 051/168] BUG: [ 2037862 ] Not possible to use command line options for external editor --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Common/coretools.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 1d26df7f221..f64d963b3c2 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -28,6 +28,7 @@ WinMerge 2.9.1.6 BugFix: Could change EOL style for protected file (#2025781) BugFix: Shift+Backspace didn't work in editor (#1153696) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) + BugFix: External editor command line switches did not work (#2037862) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/Common/coretools.cpp b/Src/Common/coretools.cpp index 00e584f9e79..fae47a6c3d2 100644 --- a/Src/Common/coretools.cpp +++ b/Src/Common/coretools.cpp @@ -1170,7 +1170,7 @@ void GetDecoratedCmdLine(String sCmdLine, String &sDecoratedCmdLine, sCmdLine.erase(clpos, clpos - sCmdLine.length()); std::string::size_type pos = sCmdLine.find(_T(" ")); - if (pos > -1) + if (pos != std::string.npos) { // First space was before switch, we don't need "s // (executable path didn't contain spaces) @@ -1190,7 +1190,7 @@ void GetDecoratedCmdLine(String sCmdLine, String &sDecoratedCmdLine, prevPos = pos; pos = sCmdLine.find(_T(" "), prevPos + 1); - if (pos > -1) + if (pos != std::string.npos) { if (sCmdLine[pos + 1] == '/' || sCmdLine[pos + 1] == '-') { @@ -1205,7 +1205,7 @@ void GetDecoratedCmdLine(String sCmdLine, String &sDecoratedCmdLine, if (addQuote) { - if (pos > -1) + if (pos != std::string.npos) { sExecutable = sCmdLine.substr(0, pos); sDecoratedCmdLine += sExecutable; From 3194552cf352994f2017bf834566b454901f3be7 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 6 Aug 2008 17:48:26 +0000 Subject: [PATCH 052/168] BUG: [ 2025130 ] Line Filters behave wonky --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/LineFiltersDlg.cpp | 20 ++++++-------------- Src/LineFiltersDlg.h | 1 + 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index f64d963b3c2..1893cfa5314 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -29,6 +29,7 @@ WinMerge 2.9.1.6 BugFix: Shift+Backspace didn't work in editor (#1153696) BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) BugFix: External editor command line switches did not work (#2037862) + BugFix: Editing line filters updated wrong filter (#2025130) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/LineFiltersDlg.cpp b/Src/LineFiltersDlg.cpp index 41ed21a96e4..ee74bad7ddd 100644 --- a/Src/LineFiltersDlg.cpp +++ b/Src/LineFiltersDlg.cpp @@ -34,6 +34,7 @@ LineFiltersDlg::LineFiltersDlg() : CPropertyPage(LineFiltersDlg::IDD) , m_pList(NULL) , m_bEditing(FALSE) +, m_editedIndex(-1) { //{{AFX_DATA_INIT(LineFiltersDlg) m_bIgnoreRegExp = FALSE; @@ -168,12 +169,6 @@ void LineFiltersDlg::EditSelectedFilter() sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED); if (sel > -1) { -/* CEdit * pEdit = m_filtersList.EditLabel(sel); - if (pEdit) - { - pEdit->SetFocus(); - } -*/ CString text = m_filtersList.GetItemText(sel, 0); m_editRegexp.SetWindowText(text); m_editRegexp.SetReadOnly(FALSE); @@ -181,6 +176,7 @@ void LineFiltersDlg::EditSelectedFilter() m_editRegexp.SetFocus(); m_editRegexp.SetSel(0, -1); m_bEditing = TRUE; + m_editedIndex = sel; } } @@ -308,17 +304,13 @@ void LineFiltersDlg::SaveItem() { if (m_bEditing) { - int sel =- 1; - sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED); - if (sel != -1) - { - CString text; - m_editRegexp.GetWindowText(text); - m_filtersList.SetItemText(sel, 0, text); - } + CString text; + m_editRegexp.GetWindowText(text); + m_filtersList.SetItemText(m_editedIndex, 0, text); m_bEditing = FALSE; m_editRegexp.SetReadOnly(TRUE); m_saveRegexp.EnableWindow(FALSE); + m_editedIndex = -1; } } diff --git a/Src/LineFiltersDlg.h b/Src/LineFiltersDlg.h index 41cde37d40e..0865218d6ac 100644 --- a/Src/LineFiltersDlg.h +++ b/Src/LineFiltersDlg.h @@ -71,6 +71,7 @@ class LineFiltersDlg : public CPropertyPage LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */ BOOL m_bEditing; /**< Are we editing a filter string? */ + int m_editedIndex; /**< Index of the item being edited. */ }; //{{AFX_INSERT_LOCATION}} From cc7dc92fcc73d6c61ff9a5b0a4623c5eff643fae Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Fri, 8 Aug 2008 15:19:00 +0000 Subject: [PATCH 053/168] PATCH: [ 2039929 ] update ChineseTraditional.po from revision 5739 Submitted by wck3 --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 2 + Src/Languages/ChineseTraditional.po | 2603 ++++++++++++++------------- 2 files changed, 1361 insertions(+), 1244 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 1893cfa5314..17219ab14e7 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -30,6 +30,8 @@ WinMerge 2.9.1.6 BugFix: Deleting/Moving file crashed WinMerge in debugger (#2025833) BugFix: External editor command line switches did not work (#2037862) BugFix: Editing line filters updated wrong filter (#2025130) + Translation updates: + - Chinese Traditional (#2039929) WinMerge 2.10.x (R2_10) branch created (r5561) diff --git a/Src/Languages/ChineseTraditional.po b/Src/Languages/ChineseTraditional.po index d1dbf97856f..26746ba548f 100644 --- a/Src/Languages/ChineseTraditional.po +++ b/Src/Languages/ChineseTraditional.po @@ -72,7 +72,7 @@ msgstr " #: Merge.rc:81 #: Merge.rc:103 -#: Merge.rc:496 +#: Merge.rc:504 #, c-format msgid "&Copy" msgstr "ƻs(&C)" @@ -84,7 +84,7 @@ msgid "&Paste" msgstr "KW(&P)" #: Merge.rc:84 -#: Merge.rc:577 +#: Merge.rc:585 #, c-format msgid "&Goto..." msgstr "(&G)..." @@ -95,62 +95,64 @@ msgid "Op&en" msgstr "}(&E)" #: Merge.rc:88 -#: Merge.rc:519 -#: Merge.rc:525 +#: Merge.rc:527 +#: Merge.rc:533 #, c-format msgid "with &Registered Application" msgstr "εnε{(&R)" #: Merge.rc:89 -#: Merge.rc:520 -#: Merge.rc:526 +#: Merge.rc:528 +#: Merge.rc:534 #, c-format msgid "with &External Editor" msgstr "Υ~bs边(&E)" #: Merge.rc:90 -#: Merge.rc:521 -#: Merge.rc:527 +#: Merge.rc:529 +#: Merge.rc:535 #, c-format msgid "&with..." msgstr "(&W)..." #: Merge.rc:110 -#: Merge.rc:189 -#: Merge.rc:303 +#: Merge.rc:191 +#: Merge.rc:308 #, c-format msgid "&File" msgstr "ɮ(&F)" #: Merge.rc:112 -#: Merge.rc:191 -#: Merge.rc:305 +#: Merge.rc:193 +#: Merge.rc:310 #, c-format msgid "&New\tCtrl+N" msgstr "sW(&N)\tCtrl+N" #: Merge.rc:113 -#: Merge.rc:192 -#: Merge.rc:306 +#: Merge.rc:194 +#: Merge.rc:311 #, c-format msgid "&Open...\tCtrl+O" msgstr "}(&O)...\tCtrl+O" #: Merge.rc:114 +#: Merge.rc:195 +#: Merge.rc:312 #, c-format msgid "Op&en Conflict File..." msgstr "}ҽĬ(&E)..." #: Merge.rc:116 -#: Merge.rc:194 -#: Merge.rc:308 +#: Merge.rc:197 +#: Merge.rc:314 #, c-format msgid "Open Pro&ject...\tCtrl+J" msgstr "}ұM(&J)...\tCtrl+J" #: Merge.rc:117 -#: Merge.rc:195 -#: Merge.rc:309 +#: Merge.rc:198 +#: Merge.rc:315 #, c-format msgid "Sa&ve Project..." msgstr "xsM(&V)..." @@ -161,1859 +163,1873 @@ msgid "Recent Projects" msgstr "̪}ҪM" #: Merge.rc:121 -#: Merge.rc:202 -#: Merge.rc:341 +#: Merge.rc:205 +#: Merge.rc:347 #, c-format msgid "E&xit" msgstr "(&X)" #: Merge.rc:123 -#: Merge.rc:204 -#: Merge.rc:343 +#: Merge.rc:207 +#: Merge.rc:349 #, c-format msgid "&Edit" msgstr "s(&E)" #: Merge.rc:125 -#: Merge.rc:208 -#: Merge.rc:377 +#: Merge.rc:211 +#: Merge.rc:383 #, c-format msgid "&Options..." msgstr "ﶵ(&O)..." #: Merge.rc:127 -#: Merge.rc:210 -#: Merge.rc:379 +#: Merge.rc:213 +#: Merge.rc:385 #, c-format msgid "&View" msgstr "˵(&V)" #: Merge.rc:129 -#: Merge.rc:221 -#: Merge.rc:381 +#: Merge.rc:224 +#: Merge.rc:387 #, c-format msgid "Select &Font..." msgstr "r(&F)..." #: Merge.rc:130 -#: Merge.rc:222 -#: Merge.rc:382 +#: Merge.rc:225 +#: Merge.rc:388 #, c-format msgid "Use Default F&ont" msgstr "ϥιw]r(&O)" #: Merge.rc:132 -#: Merge.rc:224 -#: Merge.rc:403 +#: Merge.rc:227 +#: Merge.rc:409 #, c-format msgid "&Toolbar" msgstr "uC(&T)" #: Merge.rc:134 -#: Merge.rc:226 -#: Merge.rc:405 +#: Merge.rc:229 +#: Merge.rc:411 #, c-format msgid "&None" msgstr "(&N)" #: Merge.rc:135 -#: Merge.rc:227 -#: Merge.rc:406 +#: Merge.rc:230 +#: Merge.rc:412 #, c-format msgid "&Small" msgstr "pϥ(&S)" #: Merge.rc:136 -#: Merge.rc:228 -#: Merge.rc:407 +#: Merge.rc:231 +#: Merge.rc:413 #, c-format msgid "&Big" msgstr "jϥ(&B)" #: Merge.rc:138 -#: Merge.rc:230 -#: Merge.rc:409 +#: Merge.rc:233 +#: Merge.rc:415 #, c-format msgid "&Status Bar" msgstr "AC(&S)" #: Merge.rc:139 -#: Merge.rc:231 -#: Merge.rc:410 +#: Merge.rc:234 +#: Merge.rc:416 #, c-format msgid "Ta&b Bar" msgstr "ҦC(&B)" #: Merge.rc:141 -#: Merge.rc:234 -#: Merge.rc:414 +#: Merge.rc:237 +#: Merge.rc:420 #, c-format msgid "&Language..." msgstr "y(&L)..." #: Merge.rc:143 -#: Merge.rc:255 -#: Merge.rc:436 +#: Merge.rc:258 +#: Merge.rc:442 #, c-format msgid "&Tools" msgstr "u(&T)" #: Merge.rc:145 -#: Merge.rc:258 -#: Merge.rc:438 +#: Merge.rc:261 +#: Merge.rc:444 #, c-format msgid "&Filters..." msgstr "zﾹ(&F)..." #: Merge.rc:146 -#: Merge.rc:259 -#: Merge.rc:439 +#: Merge.rc:262 +#: Merge.rc:445 #, c-format msgid "&Generate Patch..." msgstr "͸ɺ(&G)..." #: Merge.rc:148 -#: Merge.rc:262 -#: Merge.rc:442 +#: Merge.rc:265 +#: Merge.rc:448 #, c-format msgid "&Plugins" msgstr "~(&P)" -# "ʸY(&M)" #: Merge.rc:150 -#: Merge.rc:264 -#: Merge.rc:444 +#: Merge.rc:267 +#: Merge.rc:450 +#, c-format +msgid "&List..." +msgstr "" + +# "ʸY(&M)" +#: Merge.rc:152 +#: Merge.rc:269 +#: Merge.rc:452 #, c-format msgid "&Manual Unpacking" msgstr "ʸѶ}D¤r(&M)" # "۰ʸY(&A)" -#: Merge.rc:151 -#: Merge.rc:265 -#: Merge.rc:445 +#: Merge.rc:153 +#: Merge.rc:270 +#: Merge.rc:453 #, c-format msgid "&Automatic Unpacking" msgstr "۰ʸѶ}D¤r(&A)" -# Is this message correct? Because the unpacker here is not a editor. -#: Merge.rc:153 -#: Merge.rc:267 -#: Merge.rc:447 +# Is this message correct? Because the unpacker here is not a editor. Perhaps "Edit After Unpacking"? +#: Merge.rc:155 +#: Merge.rc:272 +#: Merge.rc:455 #, c-format msgid "&Edit with Unpacker" msgstr "Hѥ]s(&E)" -#: Merge.rc:155 -#: Merge.rc:269 -#: Merge.rc:454 +#: Merge.rc:157 +#: Merge.rc:274 +#: Merge.rc:462 #, c-format msgid "&Reload plugins" msgstr "sJ~(&R)" -#: Merge.rc:157 -#: Merge.rc:271 -#: Merge.rc:456 +#: Merge.rc:159 +#: Merge.rc:276 +#: Merge.rc:464 #, c-format msgid "&Debug" msgstr "(&D)" -#: Merge.rc:159 -#: Merge.rc:273 -#: Merge.rc:458 +#: Merge.rc:161 +#: Merge.rc:278 +#: Merge.rc:466 #, c-format msgid "&Load Config..." msgstr "JպA(&L)..." -#: Merge.rc:160 -#: Merge.rc:274 -#: Merge.rc:459 +#: Merge.rc:162 +#: Merge.rc:279 +#: Merge.rc:467 #, c-format msgid "&Reset Options" msgstr "_l]w(&R)" -#: Merge.rc:162 -#: Merge.rc:276 -#: Merge.rc:461 +#: Merge.rc:164 +#: Merge.rc:281 +#: Merge.rc:469 #, c-format msgid "&Window" msgstr "(&W)" -#: Merge.rc:164 -#: Merge.rc:278 -#: Merge.rc:463 +#: Merge.rc:166 +#: Merge.rc:283 +#: Merge.rc:471 #, c-format msgid "Cl&ose" msgstr "(&O)" -#: Merge.rc:165 -#: Merge.rc:279 -#: Merge.rc:464 +#: Merge.rc:167 +#: Merge.rc:284 +#: Merge.rc:472 #, c-format msgid "Clo&se All" msgstr "(&S)" -#: Merge.rc:167 -#: Merge.rc:281 -#: Merge.rc:466 +#: Merge.rc:169 +#: Merge.rc:286 +#: Merge.rc:474 #, c-format msgid "Change &Pane\tF6" msgstr "(&P)\tF6" -#: Merge.rc:169 -#: Merge.rc:283 -#: Merge.rc:468 +#: Merge.rc:171 +#: Merge.rc:288 +#: Merge.rc:476 #, c-format msgid "Tile &Horizontally" msgstr "ñ(&H)" -#: Merge.rc:170 -#: Merge.rc:284 -#: Merge.rc:469 +#: Merge.rc:172 +#: Merge.rc:289 +#: Merge.rc:477 #, c-format msgid "Tile &Vertically" msgstr "ñ(&V)" -#: Merge.rc:171 -#: Merge.rc:285 -#: Merge.rc:470 +#: Merge.rc:173 +#: Merge.rc:290 +#: Merge.rc:478 #, c-format msgid "&Cascade" msgstr "|m(&C)" -#: Merge.rc:173 -#: Merge.rc:287 -#: Merge.rc:472 -#: Merge.rc:1891 +#: Merge.rc:175 +#: Merge.rc:292 +#: Merge.rc:480 +#: Merge.rc:1913 #, c-format msgid "&Help" msgstr "(&H)" -#: Merge.rc:175 -#: Merge.rc:289 -#: Merge.rc:474 +#: Merge.rc:177 +#: Merge.rc:294 +#: Merge.rc:482 #, c-format msgid "&WinMerge Help\tF1" msgstr "WinMerge (&W)\tF1" -#: Merge.rc:177 -#: Merge.rc:291 -#: Merge.rc:476 +#: Merge.rc:179 +#: Merge.rc:296 +#: Merge.rc:484 #, c-format msgid "R&elease Notes" msgstr "o满(&E)" -#: Merge.rc:178 -#: Merge.rc:292 -#: Merge.rc:477 +#: Merge.rc:180 +#: Merge.rc:297 +#: Merge.rc:485 #, c-format msgid "&Translations" msgstr "½Ķ(&T)" -#: Merge.rc:179 -#: Merge.rc:293 -#: Merge.rc:478 +#: Merge.rc:181 +#: Merge.rc:298 +#: Merge.rc:486 #, c-format msgid "C&onfiguration" msgstr "պA(&O)" -#: Merge.rc:180 -#: Merge.rc:294 -#: Merge.rc:479 +#: Merge.rc:182 +#: Merge.rc:299 +#: Merge.rc:487 #, c-format msgid "A&rchive Support disabled..." msgstr "Y䴩(&R)..." -#: Merge.rc:182 -#: Merge.rc:296 -#: Merge.rc:481 +#: Merge.rc:184 +#: Merge.rc:301 +#: Merge.rc:489 #, c-format msgid "&GNU General Public License" msgstr "GNU @v(&G)" -#: Merge.rc:183 -#: Merge.rc:297 -#: Merge.rc:482 +#: Merge.rc:185 +#: Merge.rc:302 +#: Merge.rc:490 #, c-format msgid "&About WinMerge..." msgstr " WinMerge(&A)..." -#: Merge.rc:197 -#: Merge.rc:327 +#: Merge.rc:200 +#: Merge.rc:333 #, c-format msgid "L&eft Read-only" msgstr "Ū(&E)" -#: Merge.rc:198 -#: Merge.rc:328 +#: Merge.rc:201 +#: Merge.rc:334 #, c-format msgid "Ri&ght Read-only" msgstr "kŪ(&G)" -#: Merge.rc:200 +#: Merge.rc:203 #, c-format msgid "File En&coding" msgstr "ɮ׽sX(&C)" -#: Merge.rc:206 -#: Merge.rc:353 +#: Merge.rc:209 +#: Merge.rc:359 #, c-format msgid "Select &All\tCtrl+A" msgstr "(&A)\tCtrl+A" -#: Merge.rc:212 +#: Merge.rc:215 #, c-format msgid "Show &Identical Items" msgstr "ܬۦP(&I)" -#: Merge.rc:213 +#: Merge.rc:216 #, c-format msgid "Show &Different Items" msgstr "ܬ۲(&D)" -#: Merge.rc:214 +#: Merge.rc:217 #, c-format msgid "Show L&eft Unique Items" msgstr "ܥW(&E)" -#: Merge.rc:215 +#: Merge.rc:218 #, c-format msgid "Show Ri&ght Unique Items" msgstr "ܥkW(&G)" -#: Merge.rc:216 +#: Merge.rc:219 #, c-format msgid "Show S&kipped Items" msgstr "ܲL(&K)" -#: Merge.rc:217 +#: Merge.rc:220 #, c-format msgid "S&how Binary Files" msgstr "ܤGiɮ(&H)" -#: Merge.rc:219 +#: Merge.rc:222 #, c-format msgid "Show Hidd&en Items" msgstr "ö(&E)" -#: Merge.rc:232 +#: Merge.rc:235 #, c-format msgid "Compa&re Statistics" msgstr "έpG(&R)" -#: Merge.rc:236 -#: Merge.rc:416 +#: Merge.rc:239 +#: Merge.rc:422 #, c-format msgid "Refre&sh\tF5" msgstr "(&S)\tF5" -#: Merge.rc:237 +#: Merge.rc:240 #, c-format msgid "&Refresh Selected\tCtrl+F5" msgstr "Хܰ(&R)\tCtrl+F5" -#: Merge.rc:239 -#: Merge.rc:418 +#: Merge.rc:242 +#: Merge.rc:424 #, c-format msgid "&Merge" msgstr "X(&M)" -#: Merge.rc:241 +#: Merge.rc:244 #, c-format msgid "Co&mpare\tEnter" msgstr "(&M)\tEnter" -#: Merge.rc:243 -#: Merge.rc:420 +#: Merge.rc:246 +#: Merge.rc:426 #, c-format msgid "&Next Difference\tAlt+Down" msgstr "U@۲(&N)\tAlt+Down" -#: Merge.rc:244 -#: Merge.rc:421 +#: Merge.rc:247 +#: Merge.rc:427 #, c-format msgid "&Previous Difference\tAlt+Up" msgstr "W@۲(&P)\tAlt+Up" -#: Merge.rc:246 -#: Merge.rc:423 +#: Merge.rc:249 +#: Merge.rc:429 #, c-format msgid "&First Difference\tAlt+Home" msgstr "̪۲(&F)\tAlt+Home" -#: Merge.rc:247 -#: Merge.rc:424 +#: Merge.rc:250 +#: Merge.rc:430 #, c-format msgid "&Current Difference\tAlt+Enter" msgstr "ثe۲(&C)\tAlt+Enter" -#: Merge.rc:248 -#: Merge.rc:425 +#: Merge.rc:251 +#: Merge.rc:431 #, c-format msgid "&Last Difference\tAlt+End" msgstr "̥۲(&L)\tAlt+End" -#: Merge.rc:250 -#: Merge.rc:427 +#: Merge.rc:253 +#: Merge.rc:433 #, c-format msgid "Copy to &Right\tAlt+Right" msgstr "ƻsk(&R)\tAlt+Right" -#: Merge.rc:251 -#: Merge.rc:428 +#: Merge.rc:254 +#: Merge.rc:434 #, c-format msgid "Copy to L&eft\tAlt+Left" msgstr "ƻs쥪(&E)\tAlt+Left" -#: Merge.rc:253 +#: Merge.rc:256 #, c-format msgid "&Delete\tDel" msgstr "R(&D)\tDel" -#: Merge.rc:257 -#: Merge.rc:550 +#: Merge.rc:260 +#: Merge.rc:558 #, c-format msgid "&Customize Columns..." msgstr "ۭq(&C)..." -#: Merge.rc:260 -#: Merge.rc:440 +#: Merge.rc:263 +#: Merge.rc:446 #, c-format msgid "Generate &Report..." msgstr "ͳi(&R)..." -#: Merge.rc:311 +#: Merge.rc:317 #, c-format msgid "&Save\tCtrl+S" msgstr "xs(&S)\tCtrl+S" -#: Merge.rc:312 +#: Merge.rc:318 #, c-format msgid "Save &Left" msgstr "xs(&L)" -#: Merge.rc:314 -#: Merge.rc:319 +#: Merge.rc:320 +#: Merge.rc:325 #, c-format msgid "&Save" msgstr "xs(&S)" -#: Merge.rc:315 -#: Merge.rc:320 +#: Merge.rc:321 +#: Merge.rc:326 #, c-format msgid "Save &As..." msgstr "tss(&A)..." -#: Merge.rc:317 +#: Merge.rc:323 #, c-format msgid "Save &Right" msgstr "xsk(&R)" -#: Merge.rc:323 +#: Merge.rc:329 #, c-format msgid "&Print..." msgstr "CL(&P)..." -#: Merge.rc:324 +#: Merge.rc:330 #, c-format msgid "Page Se&tup" msgstr "]wCL榡(&T)" -#: Merge.rc:325 +#: Merge.rc:331 #, c-format msgid "Print Previe&w" msgstr "wCL(&R)" -#: Merge.rc:330 +#: Merge.rc:336 #, c-format msgid "&Convert Line Endings to" msgstr "ഫr(&C)" -#: Merge.rc:332 +#: Merge.rc:338 #, c-format msgid "&Windows (CRLF)" msgstr "&Windows (CRLF)" -#: Merge.rc:333 +#: Merge.rc:339 #, c-format msgid "&Unix (LF)" msgstr "&Unix (LF)" -#: Merge.rc:334 +#: Merge.rc:340 #, c-format msgid "&Mac (CR)" msgstr "&Mac (CR)" -#: Merge.rc:337 +#: Merge.rc:343 #, c-format msgid "&Merge Mode\tF9" msgstr "}/XּҦ(&M)\tF9" -#: Merge.rc:339 +#: Merge.rc:345 #, c-format msgid "&File Encoding..." msgstr "ɮ׽sX(&F)..." -#: Merge.rc:345 +#: Merge.rc:351 #, c-format msgid "&Undo\tCtrl+Z" msgstr "_(&U)\tCtrl+Z" -#: Merge.rc:346 +#: Merge.rc:352 #, c-format msgid "&Redo\tCtrl+Y" msgstr "A(&R)\tCtrl+Y" -#: Merge.rc:348 +#: Merge.rc:354 #, c-format msgid "Cu&t\tCtrl+X" msgstr "ŤU(&U)\tCtrl+X" -#: Merge.rc:349 +#: Merge.rc:355 #, c-format msgid "&Copy\tCtrl+C" msgstr "ƻs(&C)\tCtrl+C" -#: Merge.rc:350 +#: Merge.rc:356 #, c-format msgid "&Paste\tCtrl+V" msgstr "KW(&P)\tCtrl+V" -#: Merge.rc:352 +#: Merge.rc:358 #, c-format msgid "Select Line &Difference\tF4" msgstr "椺t(&D)\tF4" -#: Merge.rc:355 +#: Merge.rc:361 #, c-format msgid "F&ind...\tCtrl+F" msgstr "M(&I)...\tCtrl+F" -#: Merge.rc:356 +#: Merge.rc:362 #, c-format msgid "Repla&ce...\tCtrl+H" msgstr "N(&C)...\tCtrl+H" -#: Merge.rc:358 +#: Merge.rc:364 #, c-format msgid "&Scripts" msgstr "HĶYX(&S)" -#: Merge.rc:360 -#: Merge.rc:2707 +#: Merge.rc:366 +#: Merge.rc:2752 #, c-format msgid "< Empty >" msgstr "< L >" -#: Merge.rc:363 +#: Merge.rc:369 #, c-format msgid "Advanced" msgstr "i" -#: Merge.rc:365 +#: Merge.rc:371 #, c-format msgid "&Copy With Line Numbers\tCtrl+Shift+C" msgstr "sP渹ƻs(&C)\tCtrl+Shift+C" -#: Merge.rc:368 +#: Merge.rc:374 #, c-format msgid "&Bookmarks" msgstr "(&B)" -#: Merge.rc:370 +#: Merge.rc:376 #, c-format msgid "&Toggle Bookmark\tCtrl+F2" msgstr "m/M(&T)\tCtrl+F2" -#: Merge.rc:371 +#: Merge.rc:377 #, c-format msgid "&Next Bookmark\tF2" msgstr "U@(&N)\tF2" -#: Merge.rc:372 +#: Merge.rc:378 #, c-format msgid "&Previous bookmark\tShift+F2" msgstr "W@(&P)\tShift+F2" -#: Merge.rc:373 +#: Merge.rc:379 #, c-format msgid "&Clear All Bookmarks" msgstr "M(&C)" -#: Merge.rc:375 +#: Merge.rc:381 #, c-format msgid "&Go To...\tCtrl+G" msgstr "(&G)...\tCtrl+G" -#: Merge.rc:383 +#: Merge.rc:389 #, c-format msgid "&Zoom" msgstr "ԪԻ(&Z)" -#: Merge.rc:385 +#: Merge.rc:391 #, c-format msgid "Zoom &In\tCtrl++" msgstr "Ԫ(&I)\tCtrl++" -#: Merge.rc:386 +#: Merge.rc:392 #, c-format msgid "Zoom &Out\tCtrl+-" msgstr "(&O)\tCtrl+-" #. Zoom to normal -#: Merge.rc:387 +#: Merge.rc:393 #, c-format msgid "&Normal\tCtrl+*" msgstr "_l(&N)\tCtrl+*" -#: Merge.rc:389 +#: Merge.rc:395 #, c-format msgid "Syntax Highlight" msgstr "ykG" -#: Merge.rc:394 +#: Merge.rc:400 #, c-format msgid "&Lock Panes" msgstr "(&L)" -#: Merge.rc:395 +#: Merge.rc:401 #, c-format msgid "&View Whitespace" msgstr "˵ťթM(&V)" -#: Merge.rc:396 +#: Merge.rc:402 #, c-format msgid "Vie&w Line Differences" msgstr "˵椺t(&W)" -#: Merge.rc:397 +#: Merge.rc:403 #, c-format msgid "View Line &Numbers" msgstr "˵渹(&N)" -#: Merge.rc:398 +#: Merge.rc:404 #, c-format msgid "View &Margins" msgstr "˵(&M)" -#: Merge.rc:399 +#: Merge.rc:405 #, c-format msgid "W&rap Lines" msgstr "۰ʴ(&R)" -#: Merge.rc:401 +#: Merge.rc:407 #, c-format msgid "Sw&ap Panes" msgstr "洫(&A)" -#: Merge.rc:411 +# I would suggest "Microview Pane" +# t(&P) +#: Merge.rc:417 #, c-format msgid "Diff &Pane" msgstr "t(&P)" -#: Merge.rc:412 +# I would suggest "Macroview Pane". +# m +#: Merge.rc:418 #, c-format msgid "Lo&cation Pane" -msgstr "m(&P)" +msgstr "浡(&P)" -#: Merge.rc:430 +#: Merge.rc:436 #, c-format msgid "C&opy to Right and Advance\tAlt+Ctrl+Right" msgstr "ƻskU@(&O)\tAlt+Ctrl+Right" -#: Merge.rc:431 +#: Merge.rc:437 #, c-format msgid "Copy &to Left and Advance\tAlt+Ctrl+Left" msgstr "ƻs쥪U@(&T)\tAlt+Ctrl+Left" -#: Merge.rc:433 +#: Merge.rc:439 #, c-format msgid "Copy &All to Right" msgstr "ƻsk(&A)" -#: Merge.rc:434 +#: Merge.rc:440 #, c-format msgid "Cop&y All to Left" msgstr "ƻs쥪(&Y)" -#: Merge.rc:449 +#: Merge.rc:457 #, c-format msgid "&Prediffer" msgstr "Bz(&P)" -#: Merge.rc:490 +#: Merge.rc:498 #, c-format msgid "Comp&are" msgstr "(&A)" -#: Merge.rc:491 +#: Merge.rc:499 #, c-format msgid "Co&mpare Special" msgstr "Sw榡(&M)" -#: Merge.rc:493 +#: Merge.rc:501 #, c-format msgid "&XML" msgstr "&XML" -#: Merge.rc:498 +#: Merge.rc:506 #, c-format msgid "&Left to Right" msgstr "k(&L)" -#: Merge.rc:499 +#: Merge.rc:507 #, c-format msgid "L&eft to..." msgstr "(&E)..." -#: Merge.rc:500 +#: Merge.rc:508 #, c-format msgid "&Right to Left" msgstr "k쥪(&R)" -#: Merge.rc:501 +#: Merge.rc:509 #, c-format msgid "R&ight to..." msgstr "k(&I)..." -#: Merge.rc:503 +#: Merge.rc:511 #, c-format msgid "&Move" msgstr "(&M)" -#: Merge.rc:505 +#: Merge.rc:513 #, c-format msgid "&Left to..." msgstr "(&L)..." -#: Merge.rc:506 +#: Merge.rc:514 #, c-format msgid "&Right to..." msgstr "k(&R)..." -#: Merge.rc:508 +#: Merge.rc:516 #, c-format msgid "&Delete" msgstr "R(&D)" -#: Merge.rc:510 -#: Merge.rc:1128 -#: Merge.rc:1510 +#: Merge.rc:518 +#: Merge.rc:1136 +#: Merge.rc:1518 #, c-format msgid "&Left" msgstr "(&L)" -#: Merge.rc:511 -#: Merge.rc:1130 -#: Merge.rc:1513 +#: Merge.rc:519 +#: Merge.rc:1138 +#: Merge.rc:1521 #, c-format msgid "&Right" msgstr "k(&R)" -#: Merge.rc:512 +#: Merge.rc:520 #, c-format msgid "&Both" msgstr "(&B)" -#: Merge.rc:514 +#: Merge.rc:522 #, c-format msgid "Re&name" msgstr "sRW(&N)" -#: Merge.rc:515 +#: Merge.rc:523 #, c-format msgid "&Hide Items" msgstr "ɮ(&H)" -#: Merge.rc:517 +#: Merge.rc:525 #, c-format msgid "&Open Left" msgstr "}ҥ(&O)" -#: Merge.rc:523 +#: Merge.rc:531 #, c-format msgid "O&pen Right" msgstr "}ҥk(&P)" -#: Merge.rc:530 +#: Merge.rc:538 #, c-format msgid "Cop&y Pathnames" msgstr "ƻs|W(&Y)" -#: Merge.rc:532 +#: Merge.rc:540 #, c-format msgid "&Left (%1 of %2)" msgstr "(&L) (%2 %1)" -#: Merge.rc:533 +#: Merge.rc:541 #, c-format msgid "&Right (%1 of %2)" msgstr "k(&R) (%2 %1)" -#: Merge.rc:534 +#: Merge.rc:542 #, c-format msgid "&Both (%1 of %2)" msgstr "(&B) (%2 %1)" -#: Merge.rc:536 +#: Merge.rc:544 #, c-format msgid "Copy &Filenames" msgstr "ƻsɦW(&F)" -#: Merge.rc:538 +#: Merge.rc:546 #, c-format msgid "&Zip" msgstr "Zip(&Z)" -#: Merge.rc:540 +#: Merge.rc:548 #, c-format msgid "&Left... (%1 of %2)" msgstr "(&L)... (%2 %1)" -#: Merge.rc:541 +#: Merge.rc:549 #, c-format msgid "&Right... (%1 of %2)" msgstr "k(&R)... (%2 %1)" -#: Merge.rc:542 +#: Merge.rc:550 #, c-format msgid "&Both... (%1 of %2)" msgstr "(&B)... (%2 %1)" -#: Merge.rc:543 +#: Merge.rc:551 #, c-format msgid "&Differences... (%1 of %2)" msgstr "۲(&D)... (%2 %1)" -#: Merge.rc:546 +#: Merge.rc:554 #, c-format msgid "&Refresh" msgstr "(&R)" -#: Merge.rc:558 +#: Merge.rc:566 #, c-format msgid "&Copy Full Path" msgstr "ƻs|(&C)" -#: Merge.rc:559 +#: Merge.rc:567 #, c-format msgid "Copy &Filename" msgstr "ƻsɦW(&F)" -#: Merge.rc:565 +#: Merge.rc:573 #, c-format msgid "Prediffer Settings" msgstr "Bz]w" -#: Merge.rc:567 +#: Merge.rc:575 #, c-format msgid "&No prediffer" msgstr "nBz(&N)" -#: Merge.rc:568 +#: Merge.rc:576 #, c-format msgid "Auto prediffer" msgstr "۰ʥBz" -#: Merge.rc:576 +#: Merge.rc:584 #, c-format msgid "G&oto Diff" msgstr "ܬ۲϶(&O)" -#: Merge.rc:579 +#: Merge.rc:587 #, c-format msgid "&No Moved Blocks" msgstr "ܲ϶(&N)" -#: Merge.rc:580 +#: Merge.rc:588 #, c-format msgid "&All Moved Blocks" msgstr "ܲ϶(&A)" -#: Merge.rc:581 +#: Merge.rc:589 #, c-format msgid "Moved Block for &Current Diff" msgstr "Nثe۲Bܨ䲾϶(&C)" -#: Merge.rc:650 +#: Merge.rc:658 #, c-format msgid "About WinMerge" msgstr " WinMerge" -#: Merge.rc:656 +#: Merge.rc:664 #, c-format msgid "(Private Build)" msgstr "(pHsĶ)" -#: Merge.rc:657 +#: Merge.rc:665 #, c-format msgid "All rights reserved." msgstr "vҦ" -#: Merge.rc:658 +#: Merge.rc:666 #, c-format msgid "Visit the WinMerge HomePage!" msgstr "X WinMerge I" -#: Merge.rc:661 -#: Merge.rc:693 -#: Merge.rc:783 -#: Merge.rc:969 -#: Merge.rc:1047 -#: Merge.rc:1076 -#: Merge.rc:1086 -#: Merge.rc:1252 -#: Merge.rc:1316 -#: Merge.rc:1329 -#: Merge.rc:1421 -#: Merge.rc:1436 +#: Merge.rc:669 +#: Merge.rc:701 +#: Merge.rc:791 +#: Merge.rc:977 +#: Merge.rc:1055 +#: Merge.rc:1084 +#: Merge.rc:1094 +#: Merge.rc:1260 +#: Merge.rc:1324 +#: Merge.rc:1337 +#: Merge.rc:1429 +#: Merge.rc:1444 +#: Merge.rc:1666 #, c-format msgid "OK" msgstr "Tw" -#: Merge.rc:662 +#: Merge.rc:670 #, c-format msgid "Contributors" msgstr "^m" -#: Merge.rc:669 +#: Merge.rc:677 #, c-format msgid "Select Files or Folders" msgstr "ɮשθƧ" -#: Merge.rc:672 -#: Merge.rc:1587 +#: Merge.rc:680 +#: Merge.rc:1595 #, c-format msgid "&Left:" msgstr "(&L)G" -#: Merge.rc:676 -#: Merge.rc:737 -#: Merge.rc:990 -#: Merge.rc:1012 +#: Merge.rc:684 +#: Merge.rc:745 +#: Merge.rc:998 +#: Merge.rc:1020 #, c-format msgid "&Browse..." msgstr "s(&B)..." -#: Merge.rc:677 -#: Merge.rc:1591 +#: Merge.rc:685 +#: Merge.rc:1599 #, c-format msgid "&Right:" msgstr "k(&R)G" -#: Merge.rc:681 -#: Merge.rc:1023 +#: Merge.rc:689 +#: Merge.rc:1031 #, c-format msgid "Bro&wse..." msgstr "s(&W)..." -#: Merge.rc:682 -#: Merge.rc:1595 +#: Merge.rc:690 +#: Merge.rc:1603 #, c-format msgid "&Filter:" msgstr "zﾹ(&F)G" -#: Merge.rc:685 -#: Merge.rc:1597 +#: Merge.rc:693 +#: Merge.rc:1605 #, c-format msgid "Select..." msgstr "..." -#: Merge.rc:686 +#: Merge.rc:694 #, c-format msgid "&Unpacker:" msgstr "ѥ](&U)G" -#: Merge.rc:689 +#: Merge.rc:697 #, c-format msgid "&Select..." msgstr "(&S)..." -#: Merge.rc:690 -#: Merge.rc:1598 +#: Merge.rc:698 +#: Merge.rc:1606 #, c-format msgid "&Include Subfolders" msgstr "]AlƧ(&I)" -#: Merge.rc:692 +#: Merge.rc:700 #, c-format msgid "Status:" msgstr "AG" -#: Merge.rc:694 -#: Merge.rc:724 -#: Merge.rc:784 -#: Merge.rc:814 -#: Merge.rc:846 -#: Merge.rc:856 -#: Merge.rc:1048 -#: Merge.rc:1077 -#: Merge.rc:1087 -#: Merge.rc:1138 -#: Merge.rc:1253 -#: Merge.rc:1330 -#: Merge.rc:1422 -#: Merge.rc:1437 +#: Merge.rc:702 +#: Merge.rc:732 +#: Merge.rc:792 +#: Merge.rc:822 +#: Merge.rc:854 +#: Merge.rc:864 +#: Merge.rc:1056 +#: Merge.rc:1085 +#: Merge.rc:1095 +#: Merge.rc:1146 +#: Merge.rc:1261 +#: Merge.rc:1338 +#: Merge.rc:1430 +#: Merge.rc:1445 +#: Merge.rc:1667 #, c-format msgid "Cancel" msgstr "" -#: Merge.rc:695 -#: Merge.rc:1331 +#: Merge.rc:703 +#: Merge.rc:1339 #, c-format msgid "Help" msgstr "" -#: Merge.rc:696 +#: Merge.rc:704 #, c-format msgid "Files or Folders to Compare" msgstr "n諸ɮשθƧ" -#: Merge.rc:703 +#: Merge.rc:711 #, c-format msgid "Visual SourceSafe" msgstr "Visual SourceSafe" -#: Merge.rc:708 +#: Merge.rc:716 #, c-format msgid "Database:" msgstr "ƮwG" -#: Merge.rc:711 +#: Merge.rc:719 #, c-format msgid "Project:" msgstr "MסG" -#: Merge.rc:714 +#: Merge.rc:722 #, c-format msgid "User:" msgstr "ΤG" -#: Merge.rc:716 +#: Merge.rc:724 #, c-format msgid "Password:" msgstr "KXG" -#: Merge.rc:718 +#: Merge.rc:726 #, c-format msgid "Link to Destination VSS project" msgstr "sؼ VSS M" -#: Merge.rc:720 -#: Merge.rc:861 +#: Merge.rc:728 +#: Merge.rc:869 #, c-format msgid "Apply to all items" msgstr "MΨҦ" -#: Merge.rc:722 +#: Merge.rc:730 #, c-format msgid "Check Out" msgstr "qL" -#: Merge.rc:723 -#: Merge.rc:857 +#: Merge.rc:731 +#: Merge.rc:865 #, c-format msgid "Save As..." msgstr "tss..." -#: Merge.rc:729 +#: Merge.rc:737 #, c-format msgid "Versioning System" msgstr "޲zt" -#: Merge.rc:732 +#: Merge.rc:740 #, c-format msgid "&Versioning System:" msgstr "޲zt(&V)G" -#: Merge.rc:735 +#: Merge.rc:743 #, c-format msgid "&Path to cleartool.exe:" msgstr "cleartool.exe |(&P)G" -#: Merge.rc:742 -#: Merge.rc:1899 +#: Merge.rc:750 +#: Merge.rc:1921 #, c-format msgid "General" msgstr "@" -#: Merge.rc:745 +#: Merge.rc:753 #, c-format msgid "Automatically &scroll to first difference" msgstr "۰ʱ̪ܳt(&S)" -#: Merge.rc:748 +#: Merge.rc:756 #, c-format msgid "&Disable Splash Screen" msgstr "Ұʮɤn(&D)" -#: Merge.rc:750 +#: Merge.rc:758 #, c-format msgid "Cl&ose windows with ESC" msgstr " ESC (&O)" -#: Merge.rc:752 +#: Merge.rc:760 #, c-format msgid "&Automatically verify paths in Open-dialog" msgstr "u}ҡvܤ۰|(&A)" -#: Merge.rc:755 +#: Merge.rc:763 #, c-format msgid "All&ow only one instance to run" msgstr "Pɰ@ӥHW{(&O)" -#: Merge.rc:757 +#: Merge.rc:765 #, c-format msgid "As&k when closing multiple windows" msgstr "hɥ߰(&K)" -# "ɫOdɮ׮ɶ(&P)" -#: Merge.rc:759 +# "ɭpJɮ׮ɶ(&P)" +# Do you want with it to say "Include file time difference in comparing" or "Do not change file time in comparing"? +#: Merge.rc:767 #, c-format msgid "&Preserve file time in file compare" msgstr "ɮ׮ɫOdɮ׮ɶ(&P)" -#: Merge.rc:762 +#: Merge.rc:770 #, c-format msgid "O&pen-dialog Auto-Completion:" msgstr "u}ҡvܤ۰ʧ(&P)G" -#: Merge.rc:765 +#: Merge.rc:773 #, c-format msgid "Enable multiple compare windows for" msgstr "ҥΦh" -#: Merge.rc:767 -#: Merge.rc:1610 +#: Merge.rc:775 +#: Merge.rc:1618 #, c-format msgid "&Folder compare" msgstr "Ƨ(&F)" -#: Merge.rc:769 -#: Merge.rc:1612 +#: Merge.rc:777 +#: Merge.rc:1620 #, c-format msgid "Fil&e compare" msgstr "ɮ׮(&E)" -#: Merge.rc:771 +#: Merge.rc:779 #, c-format msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again." msgstr "WinMerge \ìYǦ@PTC]HAܩҦTC" -#: Merge.rc:773 +#: Merge.rc:781 #, c-format msgid "Reset" msgstr "]" -#: Merge.rc:780 +#: Merge.rc:788 #, c-format msgid "Language" msgstr "y" -#: Merge.rc:787 +#: Merge.rc:795 #, c-format msgid "Available languages:" msgstr "iΪyG" -#: Merge.rc:793 +#: Merge.rc:801 #, c-format msgid "Find" msgstr "M" -#: Merge.rc:796 -#: Merge.rc:823 +#: Merge.rc:804 +#: Merge.rc:831 #, c-format msgid "Fi&nd what:" msgstr "M(&N)G" -#: Merge.rc:799 -#: Merge.rc:829 +#: Merge.rc:807 +#: Merge.rc:837 #, c-format msgid "Match &whole word only" msgstr "Wߧr(&W)" -#: Merge.rc:801 -#: Merge.rc:831 +#: Merge.rc:809 +#: Merge.rc:839 #, c-format msgid "Match &case" msgstr "Ϥjpg(&C)" -#: Merge.rc:803 -#: Merge.rc:833 +#: Merge.rc:811 +#: Merge.rc:841 #, c-format msgid "Regular &expression" msgstr "(&E)" -#: Merge.rc:805 +#: Merge.rc:813 #, c-format msgid "D&on't wrap end of file" msgstr "ɧ(&O)" -#: Merge.rc:808 +#: Merge.rc:816 #, c-format msgid "Direction" msgstr "V" -#: Merge.rc:809 +#: Merge.rc:817 #, c-format msgid "&Up" msgstr "W(&U)" -#: Merge.rc:811 +#: Merge.rc:819 #, c-format msgid "&Down" msgstr "U(&D)" -#: Merge.rc:813 -#: Merge.rc:843 +#: Merge.rc:821 +#: Merge.rc:851 #, c-format msgid "&Find Next" msgstr "U@(&F)" -#: Merge.rc:820 +#: Merge.rc:828 #, c-format msgid "Replace" msgstr "N" -#: Merge.rc:826 +#: Merge.rc:834 #, c-format msgid "Re&place with:" msgstr "NH(&P)G" -#: Merge.rc:835 +#: Merge.rc:843 #, c-format msgid "&Don't wrap end of file" msgstr "ɧ(&D)" -#: Merge.rc:838 +#: Merge.rc:846 #, c-format msgid "Replace in" msgstr "" -#: Merge.rc:839 +#: Merge.rc:847 #, c-format msgid "&Selection" msgstr "(&S)" -#: Merge.rc:841 +#: Merge.rc:849 #, c-format msgid "Wh&ole file" msgstr "ɮ(&O)" -#: Merge.rc:844 +#: Merge.rc:852 #, c-format msgid "&Replace" msgstr "N(&R)" -#: Merge.rc:845 +#: Merge.rc:853 #, c-format msgid "Replace &All" msgstr "N(&A)" -#: Merge.rc:852 -#: Merge.rc:2134 +#: Merge.rc:860 +#: Merge.rc:2164 #, c-format msgid "Rational ClearCase" msgstr "Rational ClearCase" -#: Merge.rc:855 +#: Merge.rc:863 #, c-format msgid "CheckOut" msgstr "e^L" -#: Merge.rc:860 -#: Merge.rc:1172 +#: Merge.rc:868 +#: Merge.rc:1180 #, c-format msgid "Comments" msgstr "Ƶ" -#: Merge.rc:863 +#: Merge.rc:871 #, c-format msgid "CheckIn after checkout" msgstr "e^LɫNX" -#: Merge.rc:869 +#: Merge.rc:877 #, c-format msgid "Linefilters" msgstr "椧z" -#: Merge.rc:872 +#: Merge.rc:880 #, c-format msgid "Enable Line Filters" msgstr "ҥΦz" -#: Merge.rc:875 +#: Merge.rc:883 #, c-format msgid "Regular Expressions (one per line):" msgstr " (C@)G" -#: Merge.rc:882 +#: Merge.rc:890 #, c-format msgid "Save" msgstr "xs" -#: Merge.rc:883 +#: Merge.rc:891 #, c-format msgid "New" msgstr "sW" -#: Merge.rc:884 +#: Merge.rc:892 #, c-format msgid "Edit" msgstr "s" -#: Merge.rc:885 +#: Merge.rc:893 #, c-format msgid "Remove" msgstr "" -#: Merge.rc:890 -#: Merge.rc:1902 +#: Merge.rc:898 +#: Merge.rc:1924 #, c-format msgid "Colors" msgstr "m" -#: Merge.rc:893 +#: Merge.rc:901 #, c-format msgid "Difference:" msgstr "۲϶G" -#: Merge.rc:897 +#: Merge.rc:905 #, c-format msgid "Selected Difference:" msgstr "w۲϶G" -#: Merge.rc:901 -#: Merge.rc:1562 +#: Merge.rc:909 +#: Merge.rc:1570 #, c-format msgid "Background" msgstr "I" -#: Merge.rc:902 +#: Merge.rc:910 #, c-format msgid "Deleted" msgstr "wR" -#: Merge.rc:915 -#: Merge.rc:1357 -#: Merge.rc:1563 +#: Merge.rc:923 +#: Merge.rc:1365 +#: Merge.rc:1571 #, c-format msgid "Text" msgstr "e" -#: Merge.rc:919 +#: Merge.rc:927 #, c-format msgid "Ignored Difference:" msgstr "۲϶G" -#: Merge.rc:929 +#: Merge.rc:937 #, c-format msgid "Moved:" msgstr "϶G" -#: Merge.rc:939 +#: Merge.rc:947 #, c-format msgid "Selected Moved:" msgstr "w϶G" -#: Merge.rc:946 +#: Merge.rc:954 #, c-format msgid "Word Difference:" msgstr "rh۲G" -#: Merge.rc:953 +#: Merge.rc:961 #, c-format msgid "Selected Word Diff:" msgstr "wr۲G" -#: Merge.rc:960 -#: Merge.rc:1046 -#: Merge.rc:1075 -#: Merge.rc:1175 -#: Merge.rc:1403 +#: Merge.rc:968 +#: Merge.rc:1054 +#: Merge.rc:1083 +#: Merge.rc:1183 +#: Merge.rc:1411 #, c-format msgid "Defaults" msgstr "w]" -#: Merge.rc:966 -#: Merge.rc:1345 -#: Merge.rc:1551 +#: Merge.rc:974 +#: Merge.rc:1353 +#: Merge.rc:1559 #, c-format msgid "Dialog" msgstr "" -#: Merge.rc:976 -#: Merge.rc:1905 +#: Merge.rc:984 +#: Merge.rc:1927 #, c-format msgid "System" msgstr "t" -#: Merge.rc:979 +#: Merge.rc:987 #, c-format msgid "&Send deleted files to Recycle Bin" msgstr "Rɰe귽^(&S)" -#: Merge.rc:981 +#: Merge.rc:989 #, c-format msgid "Integration" msgstr "X" -#: Merge.rc:982 +#: Merge.rc:990 #, c-format msgid "&Add to explorer context menu" msgstr "[ɮ`ޥk(&A)" -#: Merge.rc:984 +#: Merge.rc:992 #, c-format msgid "E&nable advanced menu" msgstr "ҥζi(&N)" -#: Merge.rc:986 +#: Merge.rc:994 #, c-format msgid "In&clude subfolders by default" msgstr "۰ʥ]Alؿ(&C)" -#: Merge.rc:988 +#: Merge.rc:996 #, c-format msgid "&External editor:" msgstr "~s边(&E)G" -#: Merge.rc:991 +#: Merge.rc:999 #, c-format msgid "&Filter folder:" msgstr "Ƨzﾹ(&F)G" -#: Merge.rc:993 +#: Merge.rc:1001 #, c-format msgid "B&rowse..." msgstr "s(&R)..." -#: Merge.rc:994 +#: Merge.rc:1002 #, c-format msgid "Temporary files folder" msgstr "ȦsɸƧ" -#: Merge.rc:995 +#: Merge.rc:1003 #, c-format msgid "S&ystem's temp folder" msgstr "tΪȦsƧ(&Y)" -#: Merge.rc:997 +#: Merge.rc:1005 #, c-format msgid "C&ustom folder:" msgstr "ۭqƧ(&U)G" -#: Merge.rc:1000 -#: Merge.rc:1016 +#: Merge.rc:1008 +#: Merge.rc:1024 #, c-format msgid "Br&owse..." msgstr "s(&O)..." -#: Merge.rc:1006 +#: Merge.rc:1014 #, c-format msgid "Patch Generator" msgstr "ɺ󲣥;" -#: Merge.rc:1009 +#: Merge.rc:1017 #, c-format msgid "File&1:" msgstr "ɮ1(&1)G" -#: Merge.rc:1013 +#: Merge.rc:1021 #, c-format msgid "File&2:" msgstr "ɮ2(&2)G" -#: Merge.rc:1017 +#: Merge.rc:1025 #, c-format msgid "&Swap" msgstr "(&S)" -#: Merge.rc:1018 +#: Merge.rc:1026 #, c-format msgid "&Append to existing file" msgstr "[{ɮ(&A)" -#: Merge.rc:1020 +#: Merge.rc:1028 #, c-format msgid "&Result:" msgstr "G(&R)G" -#: Merge.rc:1024 +#: Merge.rc:1032 #, c-format msgid "&Format" msgstr "榡(&F)" -#: Merge.rc:1025 +#: Merge.rc:1033 #, c-format msgid "St&yle:" msgstr "˦(&Y)G" -#: Merge.rc:1028 +#: Merge.rc:1036 #, c-format msgid "&Context:" msgstr "WU(&C)G" -#: Merge.rc:1031 +#: Merge.rc:1039 #, c-format msgid "W&hitespaces" msgstr "Ů(&H)" -#: Merge.rc:1032 +#: Merge.rc:1040 #, c-format msgid "Com&pare" msgstr "(&P)" -#: Merge.rc:1034 +#: Merge.rc:1042 #, c-format msgid "I&gnore changes" msgstr "ܧ(&G)" -#: Merge.rc:1036 +#: Merge.rc:1044 #, c-format msgid "Ig&nore all" msgstr "(&N)" -#: Merge.rc:1038 +#: Merge.rc:1046 #, c-format msgid "Ignor&e blank lines" msgstr "ťզ(&E)" -#: Merge.rc:1040 +#: Merge.rc:1048 #, c-format msgid "Case sensi&tive" msgstr "Ϥjpg(&T)" -#: Merge.rc:1042 +#: Merge.rc:1050 #, c-format msgid "Inclu&de command line" msgstr "[ diff ROɭ(&P)" -#: Merge.rc:1044 +#: Merge.rc:1052 #, c-format msgid "Open to e&xternal editor" msgstr "}ҥ~s边(&X)" -#: Merge.rc:1066 +#: Merge.rc:1074 #, c-format msgid "Display Columns" msgstr "" -#: Merge.rc:1072 +#: Merge.rc:1080 #, c-format msgid "Move &Up" msgstr "W(&U)" -#: Merge.rc:1073 +#: Merge.rc:1081 #, c-format msgid "Move &Down" msgstr "U(&D)" -#: Merge.rc:1083 +#: Merge.rc:1091 #, c-format msgid "Select Unpacker" msgstr "ѥ]" -#: Merge.rc:1088 +#: Merge.rc:1096 #, c-format msgid "File unpacker:" msgstr "ɮ׸ѥ]G" -#: Merge.rc:1091 +#: Merge.rc:1099 #, c-format msgid "Display all unpackers, don't check the extension" msgstr "ܩҦѥ]AnˬdɦW" -#: Merge.rc:1094 +#: Merge.rc:1102 #, c-format msgid "Extensions list:" msgstr "ɦWMG" -#: Merge.rc:1095 +#: Merge.rc:1103 #, c-format msgid "Description:" msgstr "yzG" -#: Merge.rc:1106 +#: Merge.rc:1114 #, c-format msgid " Folder Compare Progress" msgstr "Ƨ" -#: Merge.rc:1109 -#: Merge.rc:1852 +#: Merge.rc:1117 +#: Merge.rc:1874 #, c-format msgid "Stop" msgstr "" -#: Merge.rc:1114 +#: Merge.rc:1122 #, c-format msgid "Comparing items..." msgstr "ؤ..." -#: Merge.rc:1115 +#: Merge.rc:1123 #, c-format msgid "Items compared:" msgstr "LءG" -#: Merge.rc:1116 +#: Merge.rc:1124 #, c-format msgid "Items total:" msgstr "`ơG" -#: Merge.rc:1122 +#: Merge.rc:1130 #, c-format msgid "Go To" msgstr "" -#: Merge.rc:1125 +#: Merge.rc:1133 #, c-format msgid "G&oto:" msgstr "(&O)G" -#: Merge.rc:1127 +#: Merge.rc:1135 #, c-format msgid "File" msgstr "ɮ" -#: Merge.rc:1132 +#: Merge.rc:1140 #, c-format msgid "Goto what" msgstr "" -#: Merge.rc:1133 +#: Merge.rc:1141 #, c-format msgid "Li&ne" msgstr "(&N)" -#: Merge.rc:1135 +#: Merge.rc:1143 #, c-format msgid "&Difference" msgstr "۲϶(&D)" -#: Merge.rc:1137 +#: Merge.rc:1145 #, c-format msgid "&Go To" msgstr "(&G)" -#: Merge.rc:1143 -#: Merge.rc:1900 +#: Merge.rc:1151 +#: Merge.rc:1922 #, c-format msgid "Compare" msgstr "" -#: Merge.rc:1146 +#: Merge.rc:1154 #, c-format msgid "Whitespace" msgstr "ťճB" -#: Merge.rc:1147 +#: Merge.rc:1155 #, c-format msgid "&Compare" msgstr "ťճB(&W)" -#: Merge.rc:1149 +#: Merge.rc:1157 #, c-format msgid "&Ignore change" msgstr "ťռƶqܰʦӳyt(&H)" -#: Merge.rc:1151 +#: Merge.rc:1159 #, c-format msgid "I&gnore all" msgstr "ťճBt(&A)" -#: Merge.rc:1153 +#: Merge.rc:1161 #, c-format msgid "Ignore blan&k lines" msgstr "ťզ(&K)" -#: Merge.rc:1155 +#: Merge.rc:1163 #, c-format msgid "Ignore &case" msgstr "jpg(&C)" -#: Merge.rc:1157 +#: Merge.rc:1165 #, c-format msgid "Igno&re carriage return differences (Windows/Unix/Mac)" msgstr "rt(Windows/Unix/Mac)(&R)" -#: Merge.rc:1160 +#: Merge.rc:1168 #, c-format msgid "E&nable moved block detection" msgstr "쪺϶(&N)" -#: Merge.rc:1162 +#: Merge.rc:1170 #, c-format msgid "&Match similar lines" msgstr "Xۦ(&M)" -#: Merge.rc:1164 +#: Merge.rc:1172 #, c-format msgid "Ign&ore time differences less than 3 seconds" msgstr "pɮפקɶj֩TAht(&O)" -#: Merge.rc:1167 +#: Merge.rc:1175 #, c-format msgid "&File Compare method:" msgstr "ɮפ覡(&F)G" -#: Merge.rc:1170 +#: Merge.rc:1178 #, c-format msgid "S&top after first difference" msgstr "Ĥ@ӮtN(&T)" -#: Merge.rc:1173 +#: Merge.rc:1181 #, c-format msgid "Filter Comments" msgstr "zﾹ" -#: Merge.rc:1180 -#: Merge.rc:1901 +#: Merge.rc:1188 +#: Merge.rc:1923 #, c-format msgid "Editor" msgstr "s边" -#: Merge.rc:1183 +#: Merge.rc:1191 #, c-format msgid "&Highlight syntax" msgstr "G׻yk(&H)" -#: Merge.rc:1185 +#: Merge.rc:1193 #, c-format msgid "&Automatic rescan" msgstr "۰ʭsy(&A)" -#: Merge.rc:1187 +#: Merge.rc:1195 #, c-format msgid "&Preserve original EOL chars" msgstr "Odl EOL r(&P)" -#: Merge.rc:1189 +#: Merge.rc:1197 #, c-format msgid "Tabs" msgstr "" -#: Merge.rc:1190 +#: Merge.rc:1198 #, c-format msgid "&Tab size:" msgstr "jp(&T)G" -#: Merge.rc:1193 +#: Merge.rc:1201 #, c-format msgid "&Insert Tabs" msgstr "Jr(&I)" -#: Merge.rc:1195 +#: Merge.rc:1203 #, c-format msgid "Insert &Spaces" msgstr "Jť(&S)" -#: Merge.rc:1197 +#: Merge.rc:1205 #, c-format msgid "Line Difference Coloring" msgstr "椺tۦ" -#: Merge.rc:1199 +#: Merge.rc:1207 #, c-format msgid "View line differences" msgstr "˵椺t" -#: Merge.rc:1201 +#: Merge.rc:1209 #, c-format msgid "&Character level" msgstr "rh(&C)" -#: Merge.rc:1203 +#: Merge.rc:1211 #, c-format msgid "&Word-level:" msgstr "rh(&W)G" -#: Merge.rc:1218 +#: Merge.rc:1226 #, c-format msgid "Filefilters" msgstr "ɮ׿zﾹ" -#: Merge.rc:1224 +#: Merge.rc:1232 #, c-format msgid "Test" msgstr "" -#: Merge.rc:1225 +#: Merge.rc:1233 #, c-format msgid "Install..." msgstr "w..." -#: Merge.rc:1226 +#: Merge.rc:1234 #, c-format msgid "New..." msgstr "sW..." -#: Merge.rc:1227 +#: Merge.rc:1235 #, c-format msgid "Edit..." msgstr "s..." -#: Merge.rc:1228 +#: Merge.rc:1236 #, c-format msgid "Delete..." msgstr "R..." -#: Merge.rc:1234 +#: Merge.rc:1242 #, c-format msgid "Save modified files?" msgstr "xsק諸ɮסH" -#: Merge.rc:1237 +#: Merge.rc:1245 #, c-format msgid "Left side file" msgstr "ɮ" -#: Merge.rc:1240 +#: Merge.rc:1248 #, c-format msgid "&Save changes" msgstr "xsܧ(&S)" -#: Merge.rc:1242 +#: Merge.rc:1250 #, c-format msgid "&Discard changes" msgstr "ܧ(&D)" -#: Merge.rc:1244 +#: Merge.rc:1252 #, c-format msgid "Right side file" msgstr "kɮ" -#: Merge.rc:1247 +#: Merge.rc:1255 #, c-format msgid "S&ave changes" msgstr "xsܧ(&A)" -#: Merge.rc:1249 +#: Merge.rc:1257 #, c-format msgid "Dis&card changes" msgstr "ܧ(&C)" -#: Merge.rc:1251 +#: Merge.rc:1259 #, c-format msgid "Discard All" msgstr "" -#: Merge.rc:1258 -#: Merge.rc:1506 -#: Merge.rc:1907 +#: Merge.rc:1266 +#: Merge.rc:1514 +#: Merge.rc:1929 #, c-format msgid "Codepage" msgstr "sX" -#: Merge.rc:1261 +#: Merge.rc:1269 #, c-format msgid "Default Codepage" msgstr "sX" -#: Merge.rc:1262 +#: Merge.rc:1270 #, c-format msgid "Select the default codepage assumed when loading non-Unicode files:" msgstr "J non-unicode ɮ׮ɧܩҥΪsX" -#: Merge.rc:1264 +#: Merge.rc:1272 #, c-format msgid "" "Detect codepage info for these files : .html, .rc, .xml \n" @@ -2022,32 +2038,32 @@ msgstr "" "Ψϥ html, rc xml ɮתsXTC\n" "ݭnsJɮסC" -#: Merge.rc:1267 +#: Merge.rc:1275 #, c-format msgid "System codepage" msgstr "tΥΪsX" -#: Merge.rc:1269 +#: Merge.rc:1277 #, c-format msgid "According to WinMerge User Interface" msgstr "WinMerge ϥΪ̤ΪsX" -#: Merge.rc:1271 +#: Merge.rc:1279 #, c-format msgid "Custom codepage :" msgstr "ۭqsXG" -#: Merge.rc:1279 +#: Merge.rc:1287 #, c-format msgid "WinMerge - Archive support disabled" msgstr "WinMerge - wYɤ䴩" -#: Merge.rc:1282 +#: Merge.rc:1290 #, c-format msgid "Unable to detect 7-Zip version (not installed?)" msgstr "Lk 7-Zip (Sw 7-Zip ܡH)" -#: Merge.rc:1285 +#: Merge.rc:1293 #, c-format msgid "" "Archive support requires 7-Zip 3.11 or later to be installed on your computer, or its\n" @@ -2056,12 +2072,12 @@ msgstr "" "w 7-Zip 3.11 ΧߪAqA\n" "Ψ֤ߤwQƻs{ؿF" -#: Merge.rc:1287 +#: Merge.rc:1295 #, c-format msgid "There must also be an appropriate interface plugin (Merge7z*.dll) on the path." msgstr "٥bgWA~(Merge7z*.dll)A~䴩YC" -#: Merge.rc:1289 +#: Merge.rc:1297 #, c-format msgid "" "Please use the version of 7-Zip recommended below until interface plugins for later\n" @@ -2070,12 +2086,14 @@ msgstr "" "DsiΡAijϥΤU\n" "7-Zip ~C" -#: Merge.rc:1291 +# I suggest "7-Zip Version" instead. +#: Merge.rc:1299 #, c-format msgid "Version" msgstr "7-Zip " -#: Merge.rc:1293 +# I suggest "Required Interface-Plugin" instead. +#: Merge.rc:1301 #, c-format msgid "" "Plugin required\n" @@ -2084,54 +2102,56 @@ msgstr "" "Ӫҭn~\n" "(dllbuild %04u)" -#: Merge.rc:1295 +#: Merge.rc:1303 #, c-format msgid "Recommended version of 7-Zip:" msgstr "˪ 7-Zip G" -#: Merge.rc:1298 -#: Merge.rc:1301 +#: Merge.rc:1306 +#: Merge.rc:1309 #, c-format msgid "present" msgstr "sb" -#: Merge.rc:1299 +#: Merge.rc:1307 #, c-format msgid "Merge7z000U.dll" msgstr "Merge7z000U.dll" -#: Merge.rc:1302 +#: Merge.rc:1310 #, c-format msgid "7-Zip software installed on your computer:" msgstr "ww˩AqW 7-Zip nG" -#: Merge.rc:1304 -#: Merge.rc:1309 +#: Merge.rc:1312 +#: Merge.rc:1317 #, c-format msgid "none" msgstr "L" -#: Merge.rc:1306 +#: Merge.rc:1314 #, c-format msgid "missing" msgstr "sb" -#: Merge.rc:1307 +# I suggest "7-Zip components only for WinMerge:" instead. +#: Merge.rc:1315 #, c-format msgid "7-Zip components for standalone operation:" msgstr "WinMerge Ϊ 7-Zip ֤ߤG" -#: Merge.rc:1311 +#: Merge.rc:1319 #, c-format msgid "outdated" msgstr "w" -#: Merge.rc:1312 +# I suggest "Interface-Plugin on path:" instead. +#: Merge.rc:1320 #, c-format msgid "Plugins on path:" msgstr "|W~G" -#: Merge.rc:1313 +#: Merge.rc:1321 #, c-format msgid "" "Don't display this &message again.\n" @@ -2140,489 +2160,506 @@ msgstr "" "ŦAܦTC(&M)\n" "(iѻ椤sX)" -#: Merge.rc:1317 +# I suggest Interface-Plugin Download" instead. +#: Merge.rc:1325 #, c-format msgid "Plugin Download" msgstr "~U" -#: Merge.rc:1326 +#: Merge.rc:1334 #, c-format msgid "Options" msgstr "ﶵ" -#: Merge.rc:1337 +#: Merge.rc:1345 #, c-format msgid " Categories" msgstr "" -#: Merge.rc:1339 +#: Merge.rc:1347 #, c-format msgid "Import..." msgstr "פJ..." -#: Merge.rc:1340 +#: Merge.rc:1348 #, c-format msgid "Export..." msgstr "ץX..." -#: Merge.rc:1348 +#: Merge.rc:1356 #, c-format msgid "Keywords:" msgstr "rG" -#: Merge.rc:1349 +#: Merge.rc:1357 #, c-format msgid "Function names:" msgstr "ƦWG" -#: Merge.rc:1350 +#: Merge.rc:1358 #, c-format msgid "Comments:" msgstr "G" -#: Merge.rc:1351 +#: Merge.rc:1359 #, c-format msgid "Numbers:" msgstr "ơG" -#: Merge.rc:1352 +#: Merge.rc:1360 #, c-format msgid "Operators:" msgstr "BlG" -#: Merge.rc:1353 +#: Merge.rc:1361 #, c-format msgid "Strings:" msgstr "rG" -#: Merge.rc:1354 +#: Merge.rc:1362 #, c-format msgid "Preprocessor:" msgstr "eBzG" -#: Merge.rc:1355 +#: Merge.rc:1363 #, c-format msgid "User 1:" msgstr "ϥΪ 1G" -#: Merge.rc:1356 +#: Merge.rc:1364 #, c-format msgid "User 2:" msgstr "ϥΪ 2G" -#: Merge.rc:1361 -#: Merge.rc:1366 -#: Merge.rc:1371 -#: Merge.rc:1376 -#: Merge.rc:1381 -#: Merge.rc:1386 -#: Merge.rc:1391 -#: Merge.rc:1396 -#: Merge.rc:1401 +#: Merge.rc:1369 +#: Merge.rc:1374 +#: Merge.rc:1379 +#: Merge.rc:1384 +#: Merge.rc:1389 +#: Merge.rc:1394 +#: Merge.rc:1399 +#: Merge.rc:1404 +#: Merge.rc:1409 #, c-format msgid "Bold" msgstr "" -#: Merge.rc:1409 +#: Merge.rc:1417 #, c-format msgid "Folder Compare Report" msgstr "ؿ᪺i" -#: Merge.rc:1412 +#: Merge.rc:1420 #, c-format msgid "Report &File:" msgstr "i(&F)G" -#: Merge.rc:1415 -#: Merge.rc:1589 -#: Merge.rc:1593 -#: Merge.rc:1620 +#: Merge.rc:1423 +#: Merge.rc:1597 +#: Merge.rc:1601 +#: Merge.rc:1628 #, c-format msgid "Browse..." msgstr "s..." -#: Merge.rc:1416 +#: Merge.rc:1424 #, c-format msgid "&Style:" msgstr "˦(&S)G" -#: Merge.rc:1419 +#: Merge.rc:1427 #, c-format msgid "&Copy to Clipboard" msgstr "ƻsŶKï(&C)" -#: Merge.rc:1427 +#: Merge.rc:1435 #, c-format msgid "Shared or Private Filter" msgstr "@ΩέӤHzﾹ" -#: Merge.rc:1430 +#: Merge.rc:1438 #, c-format msgid "Which type of filter do you want to create?" msgstr "Anإ߭ؿzﾹH" -#: Merge.rc:1432 +#: Merge.rc:1440 #, c-format msgid "Shared Filter (for all users on this machine)" msgstr "@οzﾹ(AΩҦϥΪ)" -#: Merge.rc:1434 +#: Merge.rc:1442 #, c-format msgid "Private Filter (only for current user)" msgstr "ӤHzﾹ(ȾAβ{bϥΪ)" -#: Merge.rc:1442 -#: Merge.rc:1908 +#: Merge.rc:1450 +#: Merge.rc:1930 #, c-format msgid "Archive Support" msgstr "䴩Y" -# uH shared installation w7-Zip ~~䴩YGvuw 7-Zip ~A~䴩YGvI suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead. -#: Merge.rc:1445 +# uH shared installation w7-Zip ~~䴩YGvuw 7-Zip ~A~䴩YGv +# I suggest "The following options shall be invalid without 7-Zip inerface plugin installed first." instead. +#: Merge.rc:1453 #, c-format msgid "Archive support requires 7-Zip plugin installed:" -msgstr "w 7-Zip ~A~䴩YG" +msgstr "w 7-Zip ~AUﶵ~iG" -#: Merge.rc:1447 +# I suggest "Download 7-Zip Interface-Plugin" instead. +#: Merge.rc:1455 #, c-format msgid "Download 7-zip Plugin" msgstr "U 7-Zip ~" -#: Merge.rc:1448 +#: Merge.rc:1456 #, c-format msgid "&Enable archive file support" msgstr "Yɤ䴩(&E)" -#: Merge.rc:1450 +# I suggest "Use installed 7-Zip software" instead. +#: Merge.rc:1458 #, c-format msgid "&Use stand-alone 7-Zip if available" msgstr "ϥοWߪ 7-Zip n(&U)" -#: Merge.rc:1453 +# ϥΥH sp in + st op ﶵw˪[(w7-Zip ~)(&S) +# I suggest "U&se WinMerge-dependent 7-Zip" or "U&se 7-Zip components installed by WinMerge Plugin-installer" instead. +#: Merge.rc:1461 #, c-format msgid "U&se local 7-Zip from WinMerge folder" msgstr "ϥΤWߩ WinMerge 7-Zip ֤ߤ(&S)" -#: Merge.rc:1455 +#: Merge.rc:1463 #, c-format msgid "&Detect archive type from file signature" msgstr "ɭTHMwY(&D)" -#: Merge.rc:1463 +#: Merge.rc:1471 #, c-format msgid "Compare Statistics" msgstr "᪺έp" -#: Merge.rc:1466 +#: Merge.rc:1474 #, c-format msgid "Folders:" msgstr "ƧG" -#: Merge.rc:1467 +#: Merge.rc:1475 #, c-format msgid "Files:" msgstr "ɮסG" -#: Merge.rc:1468 -#: Merge.rc:2276 +#: Merge.rc:1476 +#: Merge.rc:2310 #, c-format msgid "Different" msgstr "P" -#: Merge.rc:1469 +#: Merge.rc:1477 #, c-format msgid "Text:" msgstr "rG" -#: Merge.rc:1472 -#: Merge.rc:1491 +#: Merge.rc:1480 +#: Merge.rc:1499 #, c-format msgid "Binary:" msgstr "GiG" -#: Merge.rc:1475 +#: Merge.rc:1483 #, c-format msgid "Unique" msgstr "W" -#: Merge.rc:1476 +#: Merge.rc:1484 #, c-format msgid "Left:" msgstr "G" -#: Merge.rc:1481 +#: Merge.rc:1489 #, c-format msgid "Right:" msgstr "kG" -#: Merge.rc:1486 -#: Merge.rc:2271 +#: Merge.rc:1494 +#: Merge.rc:2305 #, c-format msgid "Identical" msgstr "P" -#: Merge.rc:1495 +#: Merge.rc:1503 #, c-format msgid "Total:" msgstr "`pG" -#: Merge.rc:1500 +#: Merge.rc:1508 #, c-format msgid "Close" msgstr "" -#: Merge.rc:1509 +#: Merge.rc:1517 #, c-format msgid "Affects" msgstr "vT" -#: Merge.rc:1512 -#: Merge.rc:1515 +#: Merge.rc:1520 +#: Merge.rc:1523 #, c-format msgid "(Affects)" msgstr "(vT)" -#: Merge.rc:1516 +#: Merge.rc:1524 #, c-format msgid "Select Codepage for" msgstr "wsX" -#: Merge.rc:1517 +#: Merge.rc:1525 #, c-format msgid "&File Loading:" msgstr "nJɮ(&F)G" -#: Merge.rc:1519 -#: Merge.rc:1522 +#: Merge.rc:1527 +#: Merge.rc:1530 #, c-format msgid "..." msgstr "..." -#: Merge.rc:1520 +#: Merge.rc:1528 #, c-format msgid "File &Saving:" msgstr "nxsɮ(&S)G" -#: Merge.rc:1523 +#: Merge.rc:1531 #, c-format msgid "&Use same codepage for both" msgstr "ɳάۦPsX(&U)" -#: Merge.rc:1526 +#: Merge.rc:1534 #, c-format msgid "&Apply" msgstr "M(&A)" -#: Merge.rc:1527 -#: Merge.rc:1874 +#: Merge.rc:1535 +#: Merge.rc:1896 #, c-format msgid "&Cancel" msgstr "(&C)" -#: Merge.rc:1532 +#: Merge.rc:1540 #, c-format msgid "Test Filter" msgstr "տzﾹ" -#: Merge.rc:1535 +#: Merge.rc:1543 #, c-format msgid "Testing filter ..." msgstr "տzﾹ ..." -#: Merge.rc:1537 +#: Merge.rc:1545 #, c-format msgid "&Enter text to test:" msgstr "JrH(&E)G" -#: Merge.rc:1539 +#: Merge.rc:1547 #, c-format msgid "&Folder Name" msgstr "ƧW(&F)" -#: Merge.rc:1541 +#: Merge.rc:1549 #, c-format msgid "Result:" msgstr "GG" -#: Merge.rc:1545 +#: Merge.rc:1553 #, c-format msgid "&Test" msgstr "(&T)" -#: Merge.rc:1546 +#: Merge.rc:1554 #, c-format msgid "&Close" msgstr "(&C)" -#: Merge.rc:1554 +#: Merge.rc:1562 #, c-format msgid "&Use customized text colors" msgstr "ϥΦۭqrm(&U)" -#: Merge.rc:1557 +#: Merge.rc:1565 #, c-format msgid "Custom text colors" msgstr "ۭqrm" -#: Merge.rc:1559 +#: Merge.rc:1567 #, c-format msgid "Whitespace:" msgstr "ťաG" -#: Merge.rc:1560 +#: Merge.rc:1568 #, c-format msgid "Regular text:" msgstr "G" -#: Merge.rc:1561 +#: Merge.rc:1569 #, c-format msgid "Selection:" msgstr "G" -#: Merge.rc:1584 +#: Merge.rc:1592 #, c-format msgid "Paths" msgstr "|" -#: Merge.rc:1590 +#: Merge.rc:1598 #, c-format msgid "R&ead-only" msgstr "Ū(&E)" -#: Merge.rc:1594 +#: Merge.rc:1602 #, c-format msgid "Re&ad-only" msgstr "Ū(&A)" -#: Merge.rc:1600 +#: Merge.rc:1608 #, c-format msgid "Open..." msgstr "}..." -#: Merge.rc:1601 +#: Merge.rc:1609 #, c-format msgid "Save..." msgstr "xs..." -#: Merge.rc:1606 -#: Merge.rc:1909 +#: Merge.rc:1614 +#: Merge.rc:1931 #, c-format msgid "Backup Files" msgstr "ƥɮ" -#: Merge.rc:1609 +#: Merge.rc:1617 #, c-format msgid "Create backup files in:" msgstr "ͳƥɩG" -#: Merge.rc:1614 +#: Merge.rc:1622 #, c-format msgid "Create backup files into:" msgstr "ͳƥɦܡG" -#: Merge.rc:1615 +#: Merge.rc:1623 #, c-format msgid "&Original file's folder" msgstr "lɪƧ(&O)" -#: Merge.rc:1617 +#: Merge.rc:1625 #, c-format msgid "&Global backup folder:" msgstr "`ƥƧ(&G)G" -#: Merge.rc:1621 +#: Merge.rc:1629 #, c-format msgid "Backup filename:" msgstr "ƥɦWG" -#: Merge.rc:1622 +#: Merge.rc:1630 #, c-format msgid "&Append .bak -extension" msgstr "W .bak ɦW(&A)" -#: Merge.rc:1624 +#: Merge.rc:1632 #, c-format msgid "A&ppend timestamp" msgstr "WɶWO(&P)" -#: Merge.rc:1631 +#: Merge.rc:1639 +#: Merge.rc:2220 #, c-format msgid "Confirm Copy" msgstr "T{ƻs" -#: Merge.rc:1635 +#: Merge.rc:1643 #, c-format msgid "Are you sure you want to copy XXX items?" msgstr "Twnƻs XXX ءH" -#: Merge.rc:1637 +#: Merge.rc:1645 #, c-format msgid "From left" msgstr "q" -#: Merge.rc:1640 +#: Merge.rc:1648 #, c-format msgid "To right" msgstr "k" -#: Merge.rc:1643 +#: Merge.rc:1651 #, c-format msgid "Yes" msgstr "O" -#: Merge.rc:1644 +#: Merge.rc:1652 #, c-format msgid "No" msgstr "_" +#: Merge.rc:1658 +#, c-format +msgid "Plugins" +msgstr "" + +#: Merge.rc:1661 +#, c-format +msgid "&Enable plugins" +msgstr "" + #. StringFileInfo.Block -#: Merge.rc:1669 +#: Merge.rc:1691 #, c-format msgid "040904e4" msgstr "040403B6" #. VarFileInfo.Translation -#: Merge.rc:1685 +#: Merge.rc:1707 #, c-format msgid "0x409, 1252" msgstr "0x404, 950" -#: Merge.rc:1700 +#: Merge.rc:1722 #, c-format msgid "Ready" msgstr "N" -#: Merge.rc:1706 +#: Merge.rc:1728 #, c-format msgid "EXT" msgstr "EXT" -#: Merge.rc:1707 +#: Merge.rc:1729 #, c-format msgid "CAP" msgstr "CAP" -#: Merge.rc:1708 +#: Merge.rc:1730 #, c-format msgid "NUM" msgstr "NUM" -#: Merge.rc:1709 +#: Merge.rc:1731 #, c-format msgid "SCRL" msgstr "SCRL" -#: Merge.rc:1710 +#: Merge.rc:1732 #, c-format msgid "OVR" msgstr "OVR" -#: Merge.rc:1711 +#: Merge.rc:1733 #, c-format msgid "REC" msgstr "REC" -#: Merge.rc:1717 +#: Merge.rc:1739 #, c-format msgid "" "Create empty documents\n" @@ -2631,7 +2668,7 @@ msgstr "" "إߪťդ\n" "s (Ctrl+N)" -#: Merge.rc:1718 +#: Merge.rc:1740 #, c-format msgid "" "Open an existing document\n" @@ -2640,7 +2677,7 @@ msgstr "" "}Ҳ{s\n" "} (Ctrl+O)" -#: Merge.rc:1719 +#: Merge.rc:1741 #, c-format msgid "" "Close the active document\n" @@ -2649,7 +2686,7 @@ msgstr "" "ثes\n" "" -#: Merge.rc:1720 +#: Merge.rc:1742 #, c-format msgid "" "Save the active document\n" @@ -2658,7 +2695,7 @@ msgstr "" "xsثes\n" "xs (Ctrl+S)" -#: Merge.rc:1721 +#: Merge.rc:1743 #, c-format msgid "" "Save the active document with a new name\n" @@ -2667,7 +2704,7 @@ msgstr "" "HsWxsثes\n" "tss" -#: Merge.rc:1722 +#: Merge.rc:1744 #, c-format msgid "" "Change the printing options\n" @@ -2676,7 +2713,7 @@ msgstr "" "ܧCLﶵ\n" "]w" -#: Merge.rc:1723 +#: Merge.rc:1745 #, c-format msgid "" "Change the printer and printing options\n" @@ -2685,7 +2722,7 @@ msgstr "" "ܧLMCLﶵ\n" "CL]w" -#: Merge.rc:1724 +#: Merge.rc:1746 #, c-format msgid "" "Print the active document\n" @@ -2694,7 +2731,7 @@ msgstr "" "CLثes\n" "CL" -#: Merge.rc:1725 +#: Merge.rc:1747 #, c-format msgid "" "Display full pages\n" @@ -2703,12 +2740,12 @@ msgstr "" "ܾ㭶\n" "wCL" -#: Merge.rc:1730 +#: Merge.rc:1752 #, c-format msgid "Make all hidden items visible again" msgstr "ϩҦöئAܥX" -#: Merge.rc:1736 +#: Merge.rc:1758 #, c-format msgid "" "Open project file\n" @@ -2717,32 +2754,32 @@ msgstr "" "}ұM\n" "M (Ctrl+J)" -#: Merge.rc:1737 +#: Merge.rc:1759 #, c-format msgid "Unknown error attempting to open project file" msgstr "}ұMɮɵoͤ~" -#: Merge.rc:1738 +#: Merge.rc:1760 #, c-format msgid "Unknown error attempting to save project file" msgstr "xsMɮɵoͤ~" -#: Merge.rc:1739 +#: Merge.rc:1761 #, c-format msgid "Project File" msgstr "M" -#: Merge.rc:1740 +#: Merge.rc:1762 #, c-format msgid "Project file successfully loaded." msgstr "Mɦ\JC" -#: Merge.rc:1741 +#: Merge.rc:1763 #, c-format msgid "Project file successfully saved." msgstr "Mɦ\xsC" -#: Merge.rc:1742 +#: Merge.rc:1764 #, c-format msgid "" "Save current paths and options to project file\n" @@ -2751,7 +2788,7 @@ msgstr "" "xsثe|οﶵܱM\n" "xsM" -#: Merge.rc:1747 +#: Merge.rc:1769 #, c-format msgid "" "Display program information, version number and copyright\n" @@ -2760,7 +2797,7 @@ msgstr "" "ܵ{TAXMv\n" "" -#: Merge.rc:1748 +#: Merge.rc:1770 #, c-format msgid "" "Quit the application; prompts to save documents\n" @@ -2769,27 +2806,27 @@ msgstr "" "}ε{Fxs\n" "" -#: Merge.rc:1754 -#: Merge.rc:1755 -#: Merge.rc:1756 -#: Merge.rc:1757 -#: Merge.rc:1758 -#: Merge.rc:1759 -#: Merge.rc:1760 -#: Merge.rc:1761 -#: Merge.rc:1762 -#: Merge.rc:1763 -#: Merge.rc:1764 -#: Merge.rc:1765 -#: Merge.rc:1766 -#: Merge.rc:1767 -#: Merge.rc:1768 -#: Merge.rc:1769 +#: Merge.rc:1776 +#: Merge.rc:1777 +#: Merge.rc:1778 +#: Merge.rc:1779 +#: Merge.rc:1780 +#: Merge.rc:1781 +#: Merge.rc:1782 +#: Merge.rc:1783 +#: Merge.rc:1784 +#: Merge.rc:1785 +#: Merge.rc:1786 +#: Merge.rc:1787 +#: Merge.rc:1788 +#: Merge.rc:1789 +#: Merge.rc:1790 +#: Merge.rc:1791 #, c-format msgid "Open this document" msgstr "}Ҧ" -#: Merge.rc:1774 +#: Merge.rc:1796 #, c-format msgid "" "Switch to the next window pane\n" @@ -2798,7 +2835,7 @@ msgstr "" "U@\n" "U@" -#: Merge.rc:1775 +#: Merge.rc:1797 #, c-format msgid "" "Switch back to the previous window pane\n" @@ -2807,7 +2844,7 @@ msgstr "" "^W@\n" "W@" -#: Merge.rc:1781 +#: Merge.rc:1803 #, c-format msgid "" "Arrange windows so they overlap\n" @@ -2816,7 +2853,7 @@ msgstr "" "|m\n" "|m" -#: Merge.rc:1782 +#: Merge.rc:1804 #, c-format msgid "" "Arrange windows as non-overlapping tiles horizontally\n" @@ -2825,7 +2862,7 @@ msgstr "" "D|mWUƦC\n" "WUæC" -#: Merge.rc:1783 +#: Merge.rc:1805 #, c-format msgid "" "Arrange windows as non-overlapping tiles vertically\n" @@ -2834,7 +2871,7 @@ msgstr "" "D|mkƦC\n" "kæC" -#: Merge.rc:1789 +#: Merge.rc:1811 #, c-format msgid "" "Copy the selection and put it on the Clipboard\n" @@ -2843,7 +2880,7 @@ msgstr "" "ƻsҿŶKï\n" "ƻs" -#: Merge.rc:1790 +#: Merge.rc:1812 #, c-format msgid "" "Cut the selection and put it on the Clipboard\n" @@ -2852,7 +2889,7 @@ msgstr "" "ŤUҿŶKï\n" "ŤU" -#: Merge.rc:1791 +#: Merge.rc:1813 #, c-format msgid "" "Find the specified text\n" @@ -2861,7 +2898,7 @@ msgstr "" "Mwr\n" "M" -#: Merge.rc:1792 +#: Merge.rc:1814 #, c-format msgid "" "Insert Clipboard contents\n" @@ -2870,7 +2907,7 @@ msgstr "" "JŶKïe\n" "KW" -#: Merge.rc:1793 +#: Merge.rc:1815 #, c-format msgid "" "Repeat the last action\n" @@ -2879,7 +2916,7 @@ msgstr "" "ƤWʧ@\n" "" -#: Merge.rc:1794 +#: Merge.rc:1816 #, c-format msgid "" "Replace specific text with different text\n" @@ -2888,7 +2925,7 @@ msgstr "" "HPrNwr\n" "N" -#: Merge.rc:1795 +#: Merge.rc:1817 #, c-format msgid "" "Select the entire document\n" @@ -2897,7 +2934,7 @@ msgstr "" "\n" "" -#: Merge.rc:1796 +#: Merge.rc:1818 #, c-format msgid "" "Undo the last action\n" @@ -2906,7 +2943,7 @@ msgstr "" "M^Wʧ@\n" "_" -#: Merge.rc:1797 +#: Merge.rc:1819 #, c-format msgid "" "Redo the previously undone action\n" @@ -2915,7 +2952,7 @@ msgstr "" "WM^ʧ@\n" "" -#: Merge.rc:1803 +#: Merge.rc:1825 #, c-format msgid "" "Show or hide the toolbar\n" @@ -2924,7 +2961,7 @@ msgstr "" "ܩäuC\n" "ҳuC" -#: Merge.rc:1804 +#: Merge.rc:1826 #, c-format msgid "" "Show or hide the status bar\n" @@ -2933,7 +2970,7 @@ msgstr "" "ܩêAC\n" "ҳAC" -#: Merge.rc:1805 +#: Merge.rc:1827 #, c-format msgid "" "Show or hide the tab bar\n" @@ -2942,7 +2979,7 @@ msgstr "" "ܩíҦC\n" "ҳҦC" -#: Merge.rc:1806 +#: Merge.rc:1828 #, c-format msgid "" "Automatically resize panes\n" @@ -2951,57 +2988,57 @@ msgstr "" "۰ʽվ㵡jp\n" "" -#: Merge.rc:1812 +#: Merge.rc:1834 #, c-format msgid "Change the window size" msgstr "jp" -#: Merge.rc:1813 +#: Merge.rc:1835 #, c-format msgid "Change the window position" msgstr "m" -#: Merge.rc:1814 +#: Merge.rc:1836 #, c-format msgid "Reduce the window to an icon" msgstr "Ypϥ" -#: Merge.rc:1815 +#: Merge.rc:1837 #, c-format msgid "Enlarge the window to full size" msgstr "Xjù" -#: Merge.rc:1816 +#: Merge.rc:1838 #, c-format msgid "Switch to the next document window" msgstr "U@" -#: Merge.rc:1817 +#: Merge.rc:1839 #, c-format msgid "Switch to the previous document window" msgstr "W@" -#: Merge.rc:1818 +#: Merge.rc:1840 #, c-format msgid "Close the active window and prompts to save the documents" msgstr "ثesôxs" -#: Merge.rc:1823 +#: Merge.rc:1845 #, c-format msgid "Restore the window to normal size" msgstr "_зǤjp" -#: Merge.rc:1824 +#: Merge.rc:1846 #, c-format msgid "Activate Task List" msgstr "ҥΤu@M" -#: Merge.rc:1825 +#: Merge.rc:1847 #, c-format msgid "Activate this window" msgstr "ҥγoӵ" -#: Merge.rc:1831 +#: Merge.rc:1853 #, c-format msgid "" "Close print preview mode\n" @@ -3010,7 +3047,7 @@ msgstr "" "wCLҦ\n" "w" -#: Merge.rc:1838 +#: Merge.rc:1860 #, c-format msgid "" "\n" @@ -3029,7 +3066,7 @@ msgstr "" "WinMerge.ɮפ\n" "WinMerge ɮפ" -#: Merge.rc:1839 +#: Merge.rc:1861 #, c-format msgid "" "\n" @@ -3048,174 +3085,177 @@ msgstr "" "WinMerge.Ƨ\n" "WinMerge Ƨ" -#: Merge.rc:1846 +#: Merge.rc:1868 #, c-format msgid "Preserve original EOL chars" msgstr "Odl EOL r" -#: Merge.rc:1853 +#: Merge.rc:1875 #, c-format msgid "Press any key" msgstr "N" -#: Merge.rc:1859 -#: Merge.rc:1860 +#: Merge.rc:1881 +#: Merge.rc:1882 #, c-format msgid "Right click on the path to copy" msgstr "kIݽƻs|" -#: Merge.rc:1866 +#: Merge.rc:1888 #, c-format -msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +msgid "" +"Developers:\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" msgstr "" -"o̡G\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" +"o̡G\n" +"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner" -#: Merge.rc:1867 +#: Merge.rc:1889 #, c-format msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details." msgstr "OҦۥѳn WinMerge L岫CwbYDZUAoFӸ`椤 GNU @vҡC" -#: Merge.rc:1873 +#: Merge.rc:1895 #, c-format msgid "&Ok" msgstr "Tw(&O)" -#: Merge.rc:1875 +#: Merge.rc:1897 #, c-format msgid "&Abort" msgstr "(&A)" -#: Merge.rc:1876 +#: Merge.rc:1898 #, c-format msgid "&Retry" msgstr "(&R)" -#: Merge.rc:1877 +#: Merge.rc:1899 #, c-format msgid "&Ignore" msgstr "(&I)" -#: Merge.rc:1878 +#: Merge.rc:1900 #, c-format msgid "Ignore &all" msgstr "(&A)" -#: Merge.rc:1879 +#: Merge.rc:1901 #, c-format msgid "&Yes" msgstr "O(&Y)" -#: Merge.rc:1885 +#: Merge.rc:1907 #, c-format msgid "Yes to &all" msgstr "ҬO(&A)" -#: Merge.rc:1886 +#: Merge.rc:1908 #, c-format msgid "&No" msgstr "_(&N)" -#: Merge.rc:1887 +#: Merge.rc:1909 #, c-format msgid "No to a&ll" msgstr "ҧ_(&L)" -#: Merge.rc:1888 +#: Merge.rc:1910 #, c-format msgid "&Continue" msgstr "~(&C)" -#: Merge.rc:1889 +#: Merge.rc:1911 #, c-format msgid "&Skip" msgstr "L(&S)" -#: Merge.rc:1890 +#: Merge.rc:1912 #, c-format msgid "Skip &all" msgstr "L(&A)" -#: Merge.rc:1892 +#: Merge.rc:1914 #, c-format msgid "Don't display this &message again." msgstr "nAܳoӰT(&M)" -#: Merge.rc:1893 +#: Merge.rc:1915 #, c-format msgid "Don't ask this &question again." msgstr "nAܳoӰD(&Q)" -#: Merge.rc:1903 +#: Merge.rc:1925 #, c-format msgid "Syntax colors" msgstr "ykm" -#: Merge.rc:1904 +#: Merge.rc:1926 #, c-format msgid "Text Colors" msgstr "rm" -#: Merge.rc:1906 +#: Merge.rc:1928 #, c-format msgid "Version Control" msgstr "" -#: Merge.rc:1916 +#: Merge.rc:1938 #, c-format msgid "To:" msgstr "G" -#: Merge.rc:1917 +#: Merge.rc:1939 #, c-format msgid "From left:" msgstr "qG" -#: Merge.rc:1918 +#: Merge.rc:1940 #, c-format msgid "To left:" msgstr "쥪G" -#: Merge.rc:1919 +#: Merge.rc:1941 #, c-format msgid "From right:" msgstr "qkG" -#: Merge.rc:1920 +#: Merge.rc:1942 #, c-format msgid "To right:" msgstr "kG" -#: Merge.rc:1926 +#: Merge.rc:1948 #, c-format msgid "Version %1" msgstr " %1" -#: Merge.rc:1927 +#: Merge.rc:1949 #, c-format msgid "Unicode" msgstr "UX" -#: Merge.rc:1933 +#: Merge.rc:1955 #, c-format msgid "Options (%1)" msgstr "ﶵ (%1)" -#: Merge.rc:1934 +#: Merge.rc:1956 #, c-format msgid "All message boxes are now displayed again." msgstr "ҦT{b|AܡC" -#: Merge.rc:1935 +#: Merge.rc:1957 #, c-format msgid "Modifications have been made to the current file comparison session. Some settings may not take place until the current file comparison is restarted." msgstr "ɮפ諸]wwQקCsҰʤAdz]w~|ͮġC" -#: Merge.rc:1936 +#: Merge.rc:1958 #, c-format msgid "The selected font change will not be applied to any currently visible difference windows." msgstr "ҿrܧ󤣷|MΨثe{tC" -#: Merge.rc:1938 +#: Merge.rc:1960 #, c-format msgid "" "Value in Tab size -field is not in range WinMerge accepts.\n" @@ -3226,7 +3266,7 @@ msgstr "" "\n" "Хέ 1 - %1C" -#: Merge.rc:1940 +#: Merge.rc:1962 #, c-format msgid "" "Are you sure you want to reset all WinMerge options to default values?\n" @@ -3237,127 +3277,130 @@ msgstr "" "\n" "]ЭsҰ WinMergeC" -#: Merge.rc:1946 +#: Merge.rc:1968 #, c-format msgid "Open" msgstr "}" -#: Merge.rc:1947 +#: Merge.rc:1969 #, c-format msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||" msgstr "{|*.exe;*.bat;*.cmd|Ҧɮ (*.*)|*.*||" -#: Merge.rc:1948 +#: Merge.rc:1970 #, c-format msgid "All Files (*.*)|*.*||" msgstr "Ҧɮ (*.*)|*.*||" -#: Merge.rc:1949 +#: Merge.rc:1971 #, c-format msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||" msgstr "WinMerge M (*.WinMerge)|*.WinMerge||" -#: Merge.rc:1951 +#: Merge.rc:1973 #, c-format msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||" msgstr "ﶵ (*.ini)|*.ini|Ҧɮ (*.*)|*.*||" -#: Merge.rc:1957 +#: Merge.rc:1979 #, c-format msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" msgstr "Text (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||" -#: Merge.rc:1958 +#: Merge.rc:1980 #, c-format msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" msgstr "HTML (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||" -#: Merge.rc:1959 +#: Merge.rc:1981 #, c-format msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||" msgstr "XML (*.xml)|*.xml|All Files (*.*)|*.*||" -#: Merge.rc:1965 +#: Merge.rc:1987 #, c-format msgid "UTF-8" msgstr "UTF-8" -#: Merge.rc:1966 +#: Merge.rc:1988 #, c-format msgid "UTF-8 (B)" msgstr "UTF-8 (B)" -#: Merge.rc:1967 +#: Merge.rc:1989 #, c-format msgid "UCS-2 LE" msgstr "UCS-2 LE" -#: Merge.rc:1968 +#: Merge.rc:1990 #, c-format msgid "UCS-2 BE" msgstr "UCS-2 BE" -#: Merge.rc:1974 +#: Merge.rc:1996 #, c-format msgid "Full Contents" msgstr "㤺e" -#: Merge.rc:1975 +#: Merge.rc:1997 #, c-format msgid "Quick Contents" msgstr "ֳte" -#: Merge.rc:1976 +#: Merge.rc:1998 #, c-format msgid "Modified Date" msgstr "ק" -#: Merge.rc:1977 +#: Merge.rc:1999 #, c-format msgid "Modified Date and Size" msgstr "קPjp" -#: Merge.rc:1978 +#: Merge.rc:2000 #, c-format msgid "Size" msgstr "jp" -#: Merge.rc:1984 +#: Merge.rc:2006 +#: Merge.rc:2616 #, c-format msgid "Name" msgstr "W" -#: Merge.rc:1985 +#: Merge.rc:2007 #, c-format msgid "Location" msgstr "m" -#: Merge.rc:1986 +#: Merge.rc:2008 #, c-format msgid "Filters" msgstr "zﾹ" -#: Merge.rc:1987 +#: Merge.rc:2009 #, c-format msgid "[F] " msgstr "[F] " -#: Merge.rc:1988 +#: Merge.rc:2010 +#: Merge.rc:2618 #, c-format msgid "Description" msgstr "yz" -#: Merge.rc:1989 +# I suggest "Add new filter filename" instead. For it must not select a name, rather give one. +#: Merge.rc:2011 #, c-format msgid "Select filename for new filter" msgstr "إ߷szﾹɦW" -#: Merge.rc:1990 +#: Merge.rc:2012 #, c-format msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||" msgstr "ɮ׿zﾹ (*.flt)|*.flt|Ҧɮ (*.*)|*.*||" -#: Merge.rc:1992 +#: Merge.rc:2014 #, c-format msgid "" "Cannot find file filter template file!\n" @@ -3370,7 +3413,7 @@ msgstr "" "нƻsɮ %1 WinMerge/ɮ׿zﾹ-ƧG\n" "%2C" -#: Merge.rc:1994 +#: Merge.rc:2016 #, c-format msgid "" "Cannot copy filter template file to filter folder:\n" @@ -3383,7 +3426,7 @@ msgstr "" "\n" "нTwӸƧAӥB\gJC" -#: Merge.rc:1996 +#: Merge.rc:2018 #, c-format msgid "" "User's filter file folder is not defined!\n" @@ -3394,7 +3437,7 @@ msgstr "" "\n" "Щuﶵ/tΡvwɮ׿zﾹƧC" -#: Merge.rc:1998 +#: Merge.rc:2020 #, c-format msgid "" "Failed to delete the filter file:\n" @@ -3407,12 +3450,12 @@ msgstr "" "\n" "OŪɡH" -#: Merge.rc:1999 +#: Merge.rc:2021 #, c-format msgid "Locate filter file to install" msgstr "ɮ׿zﾹɥHw" -#: Merge.rc:2001 +#: Merge.rc:2023 #, c-format msgid "" "Installing filter file failed.\n" @@ -3423,208 +3466,230 @@ msgstr "" "\n" "ƻsszﾹɨɮ׿zﾹƧC" -#: Merge.rc:2003 +#: Merge.rc:2025 #, c-format msgid "Filter file already exists. Overwrite existing filter?" msgstr "ɮ׿zﾹɤwsbCл\H" -#: Merge.rc:2009 +#: Merge.rc:2031 #, c-format msgid "Regular expression" msgstr "" -#: Merge.rc:2015 +#: Merge.rc:2037 +#, c-format +msgid "" +"Filters were updated. Do you want to refresh all open folder compares?\n" +"\n" +"If you do not want to refresh all compares now you can select No and refresh compares later." +msgstr "" +"zﾹsLCQҦi椤ƧܡH\n" +"\n" +"pQ{bAu_vAHAC" + +# Tw +#: Merge.rc:2043 #, c-format msgid "&Path to cleartool.exe :" msgstr "F cleartool.exe |(&P)G" -#: Merge.rc:2016 +#: Merge.rc:2044 #, c-format msgid "&Path to SS.EXE :" msgstr "F SS.EXE |(&P)G" -#: Merge.rc:2022 +#: Merge.rc:2050 #, c-format msgid "Folder Comparison Results" msgstr "ƧﵲG" -#: Merge.rc:2023 +#: Merge.rc:2051 #, c-format msgid "File Comparison" msgstr "ɮפ襤" -#: Merge.rc:2024 +#: Merge.rc:2052 #, c-format msgid "Untitled left" msgstr "]D" -#: Merge.rc:2025 +#: Merge.rc:2053 #, c-format msgid "Untitled right" msgstr "]Dk" -#: Merge.rc:2026 +#: Merge.rc:2054 #, c-format msgid "Theirs File" msgstr "L̪(ɮ)" -#: Merge.rc:2027 +#: Merge.rc:2055 #, c-format msgid "Mine File" msgstr "ڪ(ɮ)" -#: Merge.rc:2033 +#: Merge.rc:2061 #, c-format msgid "Scanning files..." msgstr "yɮ..." -#: Merge.rc:2034 +#: Merge.rc:2062 #, c-format msgid "Opening selection" msgstr "}ҿ" -#: Merge.rc:2035 +#: Merge.rc:2063 #, c-format msgid "Copying Left to Right" msgstr "ƻsk" -#: Merge.rc:2036 +#: Merge.rc:2064 #, c-format msgid "Copying Right to Left" msgstr "ƻsk쥪" -#: Merge.rc:2037 +#: Merge.rc:2065 #, c-format msgid "Copying All to Left" msgstr "ƻs쥪" -#: Merge.rc:2038 +#: Merge.rc:2066 #, c-format msgid "Copying All to Right" msgstr "ƻsk" -#: Merge.rc:2039 +#: Merge.rc:2067 #, c-format msgid "Copying files..." msgstr "ƻsɮ..." -#: Merge.rc:2040 +#: Merge.rc:2068 #, c-format msgid "Deleting files..." msgstr "Rɮ..." -#: Merge.rc:2041 +#: Merge.rc:2069 #, c-format msgid "Moving files..." msgstr "ɮ..." -#: Merge.rc:2042 +#: Merge.rc:2070 #, c-format msgid "Creating the report..." msgstr "ͳi..." -#: Merge.rc:2048 +#: Merge.rc:2071 +#, c-format +msgid "Undoing the last operation..." +msgstr "" + +#: Merge.rc:2072 +#, c-format +msgid "Redoing the previous operation..." +msgstr "" + +#: Merge.rc:2078 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s" msgstr "G%s G%d/%d rG%d/%d 楽G%s" -#: Merge.rc:2049 +#: Merge.rc:2079 #, c-format msgid "Line: %s" msgstr "G %s" -#: Merge.rc:2050 +#: Merge.rc:2080 #, c-format msgid "Ln: %s Col: %d/%d Ch: %d/%d" msgstr "G%s G%d/%d rG%d/%d" -#: Merge.rc:2051 +#: Merge.rc:2081 #, c-format msgid "Merge" msgstr "X" -#: Merge.rc:2052 +#: Merge.rc:2082 #, c-format msgid "Difference %1 of %2" msgstr "%2 Ӯt %1" -#: Merge.rc:2053 +#: Merge.rc:2083 #, c-format msgid "%1 Differences Found" msgstr " %1 Ӯt" -#: Merge.rc:2054 +#: Merge.rc:2084 #, c-format msgid "1 Difference Found" msgstr " 1 Ӯt" #. Abbreviation from "Read Only" -#: Merge.rc:2055 +#: Merge.rc:2085 #, c-format msgid "RO" msgstr "RO" -#: Merge.rc:2061 +#: Merge.rc:2091 #, c-format msgid "Item %1 of %2" msgstr "%2 Ӷؤ %1" -#: Merge.rc:2062 +#: Merge.rc:2092 #, c-format msgid "Items: %1" msgstr "ءG%1" -#: Merge.rc:2068 +#: Merge.rc:2098 #, c-format msgid "Select two existing folders or files to compare" msgstr "Ӳ{sƧɮװ" -#: Merge.rc:2069 +#: Merge.rc:2099 #, c-format msgid "Folder Selection" msgstr "Ƨ" -#: Merge.rc:2070 +#: Merge.rc:2100 #, c-format msgid "Select two folders or two files to compare." msgstr "ӸƧɮװC" -#: Merge.rc:2071 +#: Merge.rc:2101 #, c-format msgid "Left path is invalid!" msgstr "|LġI" -#: Merge.rc:2072 +#: Merge.rc:2102 #, c-format msgid "Right path is invalid!" msgstr "k|LġI" -#: Merge.rc:2073 +#: Merge.rc:2103 #, c-format msgid "Both paths are invalid!" msgstr "|LġI" -#: Merge.rc:2074 +#: Merge.rc:2104 #, c-format msgid "Choose two files to enable unpacker selection." msgstr "ɥHҥθѥ]C" -#: Merge.rc:2075 +#: Merge.rc:2105 #, c-format msgid "Cannot compare file and folder!" msgstr "LkɮשMƧI" -#: Merge.rc:2081 +#: Merge.rc:2111 #, c-format msgid "File not found: %1" msgstr "䤣ɮסG%1" -#: Merge.rc:2082 +#: Merge.rc:2112 #, c-format msgid "File not unpacked: %1" msgstr "ѥ]ɮסG%1" -#: Merge.rc:2083 +#: Merge.rc:2113 #, c-format msgid "" "Cannot open file\n" @@ -3637,12 +3702,12 @@ msgstr "" "\n" "%2" -#: Merge.rc:2084 +#: Merge.rc:2114 #, c-format msgid "Failed to parse conflict file." msgstr "LkѪRĬɡC" -#: Merge.rc:2085 +#: Merge.rc:2115 #, c-format msgid "" "The file\n" @@ -3653,32 +3718,32 @@ msgstr "" "%1\n" "OĬɡC" -#: Merge.rc:2091 +#: Merge.rc:2121 #, c-format msgid "Save As" msgstr "tss" -#: Merge.rc:2092 +#: Merge.rc:2122 #, c-format msgid "Save changes to %1?" msgstr "xs %1H" -#: Merge.rc:2093 +#: Merge.rc:2123 #, c-format msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)" msgstr "%1 wаOŪCAnмgŪɶܡH (_AhHsɦWxs)" -#: Merge.rc:2094 +#: Merge.rc:2124 #, c-format msgid "Error checking destination writeability" msgstr "ˬdؼмgJʮɵoͿ~" -#: Merge.rc:2095 +#: Merge.rc:2125 #, c-format msgid "Error backing up file" msgstr "ƥɮ׮ɵoͿ~" -#: Merge.rc:2097 +#: Merge.rc:2127 #, c-format msgid "" "Unable to backup original file:\n" @@ -3691,7 +3756,7 @@ msgstr "" "\n" "~ܡH" -#: Merge.rc:2098 +#: Merge.rc:2128 #, c-format msgid "" "Saving file failed.\n" @@ -3708,7 +3773,7 @@ msgstr "" "\t-HPWxsɮ (uTwv)\n" "\t-ثeާ@(uv)H" -#: Merge.rc:2099 +#: Merge.rc:2129 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n" @@ -3723,7 +3788,7 @@ msgstr "" "\n" "nxsѥ]t@ɮ׶ܡH" -#: Merge.rc:2100 +#: Merge.rc:2130 #, c-format msgid "" "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n" @@ -3738,7 +3803,7 @@ msgstr "" "\n" "Anxsѫʥ]t@ɮ׶ܡH" -#: Merge.rc:2101 +#: Merge.rc:2131 #, c-format msgid "" "Another application has updated file\n" @@ -3753,7 +3818,7 @@ msgstr "" "\n" "nмgsLɮ׶ܡH" -#: Merge.rc:2102 +#: Merge.rc:2132 #, c-format msgid "" "%1\n" @@ -3762,7 +3827,7 @@ msgstr "" "%1\n" "wаOŪCnмgܡH" -#: Merge.rc:2103 +#: Merge.rc:2133 #, c-format msgid "" "Another application has updated file\n" @@ -3777,17 +3842,17 @@ msgstr "" "\n" "pnɮסAثeAsJɮסC" -#: Merge.rc:2104 +#: Merge.rc:2134 #, c-format msgid "Save Left File As" msgstr "xsɮ׬" -#: Merge.rc:2105 +#: Merge.rc:2135 #, c-format msgid "Save Right File As" msgstr "xskɮ׬" -#: Merge.rc:2111 +#: Merge.rc:2141 #, c-format msgid "" "Cannot merge differences when documents are not in synch.\n" @@ -3795,42 +3860,42 @@ msgid "" "Refresh documents before continuing." msgstr "pɮסAWinMerge ֤JʡC" -#: Merge.rc:2117 +#: Merge.rc:2147 #, c-format msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)" msgstr "@wow@ SourceSafe M׸|~~ (ҦpG $/MyProject)" -#: Merge.rc:2118 +#: Merge.rc:2148 #, c-format msgid "Checkout files from VSS..." msgstr " VSS Xɮ..." -#: Merge.rc:2119 +#: Merge.rc:2149 #, c-format msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..." msgstr "e^LɮɡAtΦ^@ӿ~CLk~..." -#: Merge.rc:2120 +#: Merge.rc:2150 #, c-format msgid "Error executing versioning system command." msgstr "檩tΫOɵoͿ~C" -#: Merge.rc:2121 +#: Merge.rc:2151 #, c-format msgid "The VSS Working Folder and the location of the current file do not match. Continue?" msgstr "VSS @~ƧMثeɮצmŦXCn~ܡH" -#: Merge.rc:2122 +#: Merge.rc:2152 #, c-format msgid "No VSS database(s) found!" msgstr "䤣 VSS ƮwI" -#: Merge.rc:2123 +#: Merge.rc:2153 #, c-format msgid "Error from VSS:" msgstr "VSS oͿ~G" -#: Merge.rc:2124 +#: Merge.rc:2154 #, c-format msgid "" "Versioning System returned an error while attempting to check in the file.\n" @@ -3841,7 +3906,7 @@ msgstr "" " ˬd˵L᪺պAC\n" " M^XH" -#: Merge.rc:2125 +#: Merge.rc:2155 #, c-format msgid "" "Versioning System returned an error while attempting to undo checkout the file.\n" @@ -3850,170 +3915,170 @@ msgstr "" "M^Xɮ׮ɡAtΦ^@ӿ~C\n" " ˬd˵L᪺պAC" -#: Merge.rc:2131 -#: Merge.rc:2566 -#: Merge.rc:2743 +#: Merge.rc:2161 +#: Merge.rc:2600 +#: Merge.rc:2788 #, c-format msgid "None" msgstr "L" -#: Merge.rc:2132 +#: Merge.rc:2162 #, c-format msgid "Visual SourceSafe (less than 5.0)" msgstr "Visual SourceSafe ( 5.0 )" -#: Merge.rc:2133 +#: Merge.rc:2163 #, c-format msgid "Visual SourceSafe (5.0 and above)" msgstr "Visual SourceSafe (5.0 Mߪ)" -#: Merge.rc:2135 +#: Merge.rc:2165 #, c-format msgid "Break at whitespace" msgstr "ťճB_" -#: Merge.rc:2136 +#: Merge.rc:2166 #, c-format msgid "Break at whitespace or punctuation" msgstr "ťճBμIB_" -#: Merge.rc:2142 -#: Merge.rc:2144 +#: Merge.rc:2172 +#: Merge.rc:2174 #, c-format msgid "Copy selected item to named directory" msgstr "ƻsnamed ؿ" -#: Merge.rc:2143 -#: Merge.rc:2145 +#: Merge.rc:2173 +#: Merge.rc:2175 #, c-format msgid "Copy selected item to custom directory" msgstr "ƻsۭqؿ" -#: Merge.rc:2146 +#: Merge.rc:2176 #, c-format msgid "Delete selected item on left" msgstr "R䪺" -#: Merge.rc:2147 +#: Merge.rc:2177 #, c-format msgid "Delete selected item on right" msgstr "Rk䪺" -#: Merge.rc:2148 +#: Merge.rc:2178 #, c-format msgid "Delete selected item(s) on both sides" msgstr "R䪺" -#: Merge.rc:2149 +#: Merge.rc:2179 #, c-format msgid "Hide selected item(s) (on the fly filter)" msgstr "ÿ (۰ʿzﾹ)" -#: Merge.rc:2150 +#: Merge.rc:2180 #, c-format msgid "Rename selected item on both sides" msgstr "سsRW" -#: Merge.rc:2151 +#: Merge.rc:2181 #, c-format msgid "Right to Left (%1)" msgstr "k쥪 (%1)" -#: Merge.rc:2152 +#: Merge.rc:2182 #, c-format msgid "Left to Right (%1)" msgstr "k (%1)" -#: Merge.rc:2153 +#: Merge.rc:2183 #, c-format msgid "Right to Left (%1 of %2)" msgstr "k쥪 (%2 %1)" -#: Merge.rc:2154 +#: Merge.rc:2184 #, c-format msgid "Left to Right (%1 of %2)" msgstr "k (%2 %1)" -#: Merge.rc:2155 -#: Merge.rc:2171 +#: Merge.rc:2185 +#: Merge.rc:2201 #, c-format msgid "Left to... (%1)" msgstr "... (%1)" -#: Merge.rc:2156 -#: Merge.rc:2172 +#: Merge.rc:2186 +#: Merge.rc:2202 #, c-format msgid "Right to... (%1)" msgstr "k... (%1)" -#: Merge.rc:2157 -#: Merge.rc:2173 +#: Merge.rc:2187 +#: Merge.rc:2203 #, c-format msgid "Left to... (%1 of %2)" msgstr "... (%2 %1)" -#: Merge.rc:2158 -#: Merge.rc:2174 +#: Merge.rc:2188 +#: Merge.rc:2204 #, c-format msgid "Right to... (%1 of %2)" msgstr "k... (%2 %1)" -#: Merge.rc:2164 +#: Merge.rc:2194 #, c-format msgid "Left (%1)" msgstr " (%1)" -#: Merge.rc:2165 +#: Merge.rc:2195 #, c-format msgid "Right (%1)" msgstr "k (%1)" -#: Merge.rc:2166 +#: Merge.rc:2196 #, c-format msgid "Both (%1)" msgstr " (%1)" -#: Merge.rc:2167 +#: Merge.rc:2197 #, c-format msgid "Left (%1 of %2)" msgstr " (%2 %1)" -#: Merge.rc:2168 +#: Merge.rc:2198 #, c-format msgid "Right (%1 of %2)" msgstr "k (%2 %1)" -#: Merge.rc:2169 +#: Merge.rc:2199 #, c-format msgid "Both (%1 of %2)" msgstr " (%2 %1)" -#: Merge.rc:2170 +#: Merge.rc:2200 #, c-format msgid "Select destination folder" msgstr "ؼиƧ" -#: Merge.rc:2175 +#: Merge.rc:2205 #, c-format msgid "Left side - select destination folder:" msgstr " - ؼиƧG" -#: Merge.rc:2176 +#: Merge.rc:2206 #, c-format msgid "Right side - select destination folder:" msgstr "k - ؼиƧG" -#: Merge.rc:2177 +#: Merge.rc:2207 #, c-format msgid "(%1 Files Affected)" msgstr "(%1 vTɮ)" -#: Merge.rc:2178 +#: Merge.rc:2208 #, c-format msgid "(%1 of %2 Files Affected)" msgstr "(%2 vTɮפ %1)" -#: Merge.rc:2184 +#: Merge.rc:2214 #, c-format msgid "" "Are you sure you want to delete\n" @@ -4024,17 +4089,17 @@ msgstr "" "\n" "%1H" -#: Merge.rc:2185 +#: Merge.rc:2215 #, c-format msgid "Are you sure you want to copy:" msgstr "TwnƻsG" -#: Merge.rc:2186 +#: Merge.rc:2216 #, c-format msgid "Are you sure you want to copy %d items:" msgstr "Twnƻs %d ءG" -#: Merge.rc:2187 +#: Merge.rc:2217 #, c-format msgid "" "Operation aborted!\n" @@ -4053,458 +4118,473 @@ msgstr "" "\n" "ЭC" -#: Merge.rc:2193 +#: Merge.rc:2218 +#, c-format +msgid "Are you sure you want to move:" +msgstr "" + +#: Merge.rc:2219 +#, c-format +msgid "Are you sure you want to move %d items:" +msgstr "" + +#: Merge.rc:2221 +#, c-format +msgid "Confirm Move" +msgstr "" + +#: Merge.rc:2227 #, c-format msgid "Open left file" msgstr "}ҥɮ" -#: Merge.rc:2194 +#: Merge.rc:2228 #, c-format msgid "Open the left file to external editor" msgstr "}ҥɮר~s边" -#: Merge.rc:2195 +#: Merge.rc:2229 #, c-format msgid "Open left file with ..." msgstr "H...}ҥɮ" -#: Merge.rc:2196 +#: Merge.rc:2230 #, c-format msgid "Open right file" msgstr "}ҥkɮ" -#: Merge.rc:2197 +#: Merge.rc:2231 #, c-format msgid "Open the right file to external editor" msgstr "}ҥkɮר~s边" -#: Merge.rc:2198 +#: Merge.rc:2232 #, c-format msgid "Open right file with..." msgstr "H...}ҥkɮ" -#: Merge.rc:2199 +#: Merge.rc:2233 #, c-format msgid "Failed to execute external editor: %1" msgstr "Lk~s边 %1" -#: Merge.rc:2200 +#: Merge.rc:2234 #, c-format msgid "Unknown extension on external editor: %1" msgstr "ɦW~s边G%1" -#: Merge.rc:2201 +#: Merge.rc:2235 #, c-format msgid "Copy filenames to clipboard" msgstr "ƻsɦWŶKï" -#: Merge.rc:2202 +#: Merge.rc:2236 #, c-format msgid "Copy left side pathnames to clipboard" msgstr "ƻs|WŶKï" -#: Merge.rc:2203 +#: Merge.rc:2237 #, c-format msgid "Copy right side pathnames to clipboard" msgstr "ƻsk|WŶKï" -#: Merge.rc:2204 +#: Merge.rc:2238 #, c-format msgid "Copy both sides pathnames to clipboard" msgstr "ƻs|WŶKï" -#: Merge.rc:2210 +#: Merge.rc:2244 #, c-format msgid "Unknown archive format" msgstr "Y榡" -#: Merge.rc:2211 +#: Merge.rc:2245 #, c-format msgid "Add items from left side to archive" msgstr "䶵إ[Y" -#: Merge.rc:2212 +#: Merge.rc:2246 #, c-format msgid "Add items from right side to archive" msgstr "k䶵إ[Y" -#: Merge.rc:2213 +#: Merge.rc:2247 #, c-format msgid "Add items from both sides to archive" msgstr "䶵إ[Y" -#: Merge.rc:2214 +#: Merge.rc:2248 #, c-format msgid "Add different items to archive (both sides)" msgstr "۲إ[JY" -#: Merge.rc:2216 +#: Merge.rc:2250 #, c-format msgid "Move selected file on left to custom directory" msgstr "زۭqƧ" -#: Merge.rc:2218 +#: Merge.rc:2252 #, c-format msgid "Move selected file on right to custom directory" msgstr "kزۭqƧ" -#: Merge.rc:2224 +#: Merge.rc:2258 #, c-format msgid "Filename" msgstr "ɮצW" -#: Merge.rc:2225 +#: Merge.rc:2259 #, c-format msgid "Folder" msgstr "Ƨ" -#: Merge.rc:2226 +#: Merge.rc:2260 #, c-format msgid "Comparison result" msgstr "ﵲG" -#: Merge.rc:2227 +#: Merge.rc:2261 #, c-format msgid "Left Date" msgstr "" -#: Merge.rc:2228 +#: Merge.rc:2262 #, c-format msgid "Right Date" msgstr "k" -#: Merge.rc:2229 +#: Merge.rc:2263 #, c-format msgid "Extension" msgstr "ɦW" -#: Merge.rc:2230 +#: Merge.rc:2264 #, c-format msgid "Left Size" msgstr "jp" -#: Merge.rc:2231 +#: Merge.rc:2265 #, c-format msgid "Right Size" msgstr "kjp" -#: Merge.rc:2232 +#: Merge.rc:2266 #, c-format msgid "Right Size (Short)" msgstr "kjp (²)" -#: Merge.rc:2233 +#: Merge.rc:2267 #, c-format msgid "Left Size (Short)" msgstr "jp (²)" -#: Merge.rc:2239 +#: Merge.rc:2273 #, c-format msgid "Left Creation Time" msgstr "إ߮ɶ" -#: Merge.rc:2240 +#: Merge.rc:2274 #, c-format msgid "Right Creation Time" msgstr "kإ߮ɶ" -#: Merge.rc:2241 +#: Merge.rc:2275 #, c-format msgid "Newer File" msgstr "sɮ" -#: Merge.rc:2242 +#: Merge.rc:2276 #, c-format msgid "Left File Version" msgstr "ɮת" -#: Merge.rc:2243 +#: Merge.rc:2277 #, c-format msgid "Right File Version" msgstr "kɮת" -#: Merge.rc:2244 +#: Merge.rc:2278 #, c-format msgid "Short Result" msgstr "²G" -#: Merge.rc:2245 +#: Merge.rc:2279 #, c-format msgid "Left Attributes" msgstr "ݩ" -#: Merge.rc:2246 +#: Merge.rc:2280 #, c-format msgid "Right Attributes" msgstr "kݩ" -#: Merge.rc:2247 +#: Merge.rc:2281 #, c-format msgid "Left EOL" msgstr " EOL" -#: Merge.rc:2248 +#: Merge.rc:2282 #, c-format msgid "Right EOL" msgstr "k EOL" -#: Merge.rc:2254 +#: Merge.rc:2288 #, c-format msgid "Left Encoding" msgstr "sX" -#: Merge.rc:2255 +#: Merge.rc:2289 #, c-format msgid "Right Encoding" msgstr "ksX" -#: Merge.rc:2256 +#: Merge.rc:2290 #, c-format msgid "Ignored Diff." msgstr "t" -#: Merge.rc:2257 +#: Merge.rc:2291 #, c-format msgid "Differences" msgstr "t" -#: Merge.rc:2258 -#: Merge.rc:2562 +#: Merge.rc:2292 +#: Merge.rc:2596 #, c-format msgid "Binary" msgstr "Gi" -#: Merge.rc:2264 +#: Merge.rc:2298 #, c-format msgid "Unable to compare files" msgstr "Lkɮ" -#: Merge.rc:2265 +#: Merge.rc:2299 #, c-format msgid "Item aborted" msgstr "_" -#: Merge.rc:2266 +#: Merge.rc:2300 #, c-format msgid "File skipped" msgstr "Lɮ" -#: Merge.rc:2267 +#: Merge.rc:2301 #, c-format msgid "Folder skipped" msgstr "LƧ" -#: Merge.rc:2268 +#: Merge.rc:2302 #, c-format msgid "Left only: %1" msgstr "ȥG%1" -#: Merge.rc:2269 +#: Merge.rc:2303 #, c-format msgid "Right only: %1" msgstr "ȥkG%1" -#: Merge.rc:2270 +#: Merge.rc:2304 #, c-format msgid "Binary files are identical" msgstr "GiɧۦP" -#: Merge.rc:2272 +#: Merge.rc:2306 #, c-format msgid "Binary files are different" msgstr "GiɤP" -#: Merge.rc:2273 +#: Merge.rc:2307 #, c-format msgid "Files are different" msgstr "ɮפP" -#: Merge.rc:2274 +#: Merge.rc:2308 #, c-format msgid "Left Only" msgstr "ȥ" -#: Merge.rc:2275 +#: Merge.rc:2309 #, c-format msgid "Right Only" msgstr "ȥk" -#: Merge.rc:2277 +#: Merge.rc:2311 #, c-format msgid "Error" msgstr "~" -#: Merge.rc:2283 +#: Merge.rc:2317 #, c-format msgid "Elapsed time: %ld ms" msgstr "gLɶG %ld @" -#: Merge.rc:2284 +#: Merge.rc:2318 #, c-format msgid "1 item selected" msgstr "w 1 Ӷ" -#: Merge.rc:2285 +#: Merge.rc:2319 #, c-format msgid "%1 items selected" msgstr "w %1 Ӷ" -#: Merge.rc:2291 +#: Merge.rc:2325 #, c-format msgid "Filename or folder name." msgstr "ɮצW٩θƧW١C" -#: Merge.rc:2292 +#: Merge.rc:2326 #, c-format msgid "Subfolder name when subfolders are included." msgstr "]AlƧɤlƧW١C" -#: Merge.rc:2293 +#: Merge.rc:2327 #, c-format msgid "Comparison result, long form." msgstr "GAC" -#: Merge.rc:2294 +#: Merge.rc:2328 #, c-format msgid "Left side modification date." msgstr "קC" -#: Merge.rc:2295 +#: Merge.rc:2329 #, c-format msgid "Right side modification date." msgstr "קC" -#: Merge.rc:2296 +#: Merge.rc:2330 #, c-format msgid "File's extension." msgstr "ɦWC" -#: Merge.rc:2297 +#: Merge.rc:2331 #, c-format msgid "Left file size in bytes." msgstr "ɮצ줸դjpC" -#: Merge.rc:2298 +#: Merge.rc:2332 #, c-format msgid "Right file size in bytes." msgstr "kɮצ줸դjpC" -#: Merge.rc:2299 +#: Merge.rc:2333 #, c-format msgid "Left file size abbreviated." msgstr "ɮ²jpC" -#: Merge.rc:2300 +#: Merge.rc:2334 #, c-format msgid "Right file size abbreviated." msgstr "kɮ²jpC" -#: Merge.rc:2306 +#: Merge.rc:2340 #, c-format msgid "Left side creation time." msgstr "إ߮ɶC" -#: Merge.rc:2307 +#: Merge.rc:2341 #, c-format msgid "Right side creation time." msgstr "kإ߮ɶC" -#: Merge.rc:2308 +#: Merge.rc:2342 #, c-format msgid "Tells which side has newer modification date." msgstr "i䦳sקC" -#: Merge.rc:2309 +#: Merge.rc:2343 #, c-format msgid "Left side file version, only for some filetypes." msgstr "ɮתAuYɮC" -#: Merge.rc:2310 +#: Merge.rc:2344 #, c-format msgid "Right side file version, only for some filetypes." msgstr "kɮתAuYɮC" -#: Merge.rc:2311 +#: Merge.rc:2345 #, c-format msgid "Short comparison result." msgstr "uGC" -#: Merge.rc:2312 +#: Merge.rc:2346 #, c-format msgid "Left side attributes." msgstr "ݩʡC" -#: Merge.rc:2313 +#: Merge.rc:2347 #, c-format msgid "Right side attributes." msgstr "kݩʡC" -#: Merge.rc:2314 +#: Merge.rc:2348 #, c-format msgid "Left side file EOL type" msgstr "ɮ EOL " -#: Merge.rc:2315 +#: Merge.rc:2349 #, c-format msgid "Right side file EOL type" msgstr "kɮ EOL " -#: Merge.rc:2321 +#: Merge.rc:2355 #, c-format msgid "Left side encoding." msgstr "sXC" -#: Merge.rc:2322 +#: Merge.rc:2356 #, c-format msgid "Right side encoding." msgstr "ksXC" -#: Merge.rc:2323 +#: Merge.rc:2357 #, c-format msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged." msgstr "QɮפtӼơCJQANX֡C" -#: Merge.rc:2324 +#: Merge.rc:2358 #, c-format msgid "Number of differences in file. This number does not include ignored differences." msgstr "ɮפtӼơCƤ]AQtC" -#: Merge.rc:2325 +#: Merge.rc:2359 #, c-format msgid "Shows an asterisk (*) if the file is binary." msgstr "OGiɡANܬP (*)" -#: Merge.rc:2331 +#: Merge.rc:2365 #, c-format msgid "Compare %1 with %2" msgstr " %1 M %2" -#: Merge.rc:2332 +#: Merge.rc:2366 #, c-format msgid "Comma-separated list" msgstr "rjC" -#: Merge.rc:2333 +#: Merge.rc:2367 #, c-format msgid "Tab-separated list" msgstr "渹jC" -#: Merge.rc:2334 +#: Merge.rc:2368 #, c-format msgid "Simple HTML" msgstr " HTML" -#: Merge.rc:2335 +#: Merge.rc:2369 #, c-format msgid "Simple XML" msgstr " XML" -#: Merge.rc:2337 +#: Merge.rc:2371 #, c-format msgid "The report file already exists. Do you want to overwrite existing file?" msgstr "iɤwgsbCл\H" -#: Merge.rc:2338 +#: Merge.rc:2372 #, c-format msgid "" "Error creating the report:\n" @@ -4513,32 +4593,32 @@ msgstr "" "ͳiɵoͿ~G\n" "%1" -#: Merge.rc:2339 +#: Merge.rc:2373 #, c-format msgid "The report has been created successfully." msgstr "\ͳiC" -#: Merge.rc:2345 +#: Merge.rc:2379 #, c-format msgid "The same file is opened in both panels." msgstr "ۦPɮ׶}ҨC" -#: Merge.rc:2346 +#: Merge.rc:2380 #, c-format msgid "The selected files are identical." msgstr "ҿɮקۦPC" -#: Merge.rc:2347 +#: Merge.rc:2381 #, c-format msgid "An error occurred while comparing the files." msgstr "ɮ׮ɵoͿ~C" -#: Merge.rc:2348 +#: Merge.rc:2382 #, c-format msgid "Temporary files could not be created. Check your temporary path settings." msgstr "Lkإ߼ȦsɮסCˬdȦs|]wC" -#: Merge.rc:2349 +#: Merge.rc:2383 #, c-format msgid "" "These files use different carriage return types.\n" @@ -4553,7 +4633,7 @@ msgstr "" "\n" "`NGpnNҦrYۦPAob(s > ﶵ) ﶵܲuvҳ]wﶵurtvC" -#: Merge.rc:2350 +#: Merge.rc:2384 #, c-format msgid "" "The EOL are of different types (Windows/Unix/Mac) in the file '%1'.\n" @@ -4564,22 +4644,22 @@ msgstr "" "HثeﶵA̷|Τ@DC\n" "AnܧﶵëOdPɮ׵rܡH" -#: Merge.rc:2351 +#: Merge.rc:2385 #, c-format msgid "An error occurred while prediffing the file '%1' with the plugin '%2'. The prediffing is not applied any more." msgstr "@ӿ~oͩemPɮ '%1' H~ '%2'C emPLkAMΡC" -#: Merge.rc:2352 +#: Merge.rc:2386 #, c-format msgid "The selected folder is invalid." msgstr "ҿ諸ƧLġC" -#: Merge.rc:2353 +#: Merge.rc:2387 #, c-format msgid "Cannot open a binary file to editor." msgstr "s边}ҤGiɡC" -#: Merge.rc:2354 +#: Merge.rc:2388 #, c-format msgid "" "The folder exists only in other side and cannot be opened.\n" @@ -4594,7 +4674,7 @@ msgstr "" "%1\n" "t@AM}Ҩ⧨ܡH" -#: Merge.rc:2360 +#: Merge.rc:2394 #, c-format msgid "" "Different codepages found in left (cp%d) and right (cp%d) files. \n" @@ -4605,132 +4685,136 @@ msgstr "" "YϺUOX|OݨrAX/ƻs|MIC\n" "nϥάۦPw] windows sXhݨܡH(ij)" -#: Merge.rc:2361 +#: Merge.rc:2395 #, c-format msgid "Warning: Files use different encodings, left=%s and right=%s, and merging may lead to information loss." msgstr "ĵiGɮרϥΤPsXA=%sAk=%sAX֥iɭPTlC" -#: Merge.rc:2362 +#: Merge.rc:2396 #, c-format msgid "Information lost due to encoding errors: both files" msgstr "]sXDɭPeLk`e{Gɮ׬ҦpC" -#: Merge.rc:2363 +#: Merge.rc:2397 #, c-format msgid "Information lost due to encoding errors: right file" msgstr "]sXDɭPTlGkɮצpC" -#: Merge.rc:2364 +#: Merge.rc:2398 #, c-format msgid "Information lost due to encoding errors: left file" msgstr "]sXDɭPTlGɮצpC" -#: Merge.rc:2370 +#: Merge.rc:2404 #, c-format msgid "No difference" msgstr "Lt" -#: Merge.rc:2371 +#: Merge.rc:2405 #, c-format msgid "Line difference" msgstr "椺t" -#: Merge.rc:2377 +#: Merge.rc:2411 #, c-format msgid "Replaced %1 string(s)." msgstr "wN %1 ӦrC" -#: Merge.rc:2378 +#: Merge.rc:2412 #, c-format msgid "Cannot find string \"%s\"" msgstr "䤣 \"%s\" r" -#: Merge.rc:2384 +#: Merge.rc:2418 #, c-format msgid "Copy Full Path" msgstr "ƻs|" -#: Merge.rc:2385 +#: Merge.rc:2419 #, c-format msgid "Copy Filename" msgstr "ƻsɦW" -#: Merge.rc:2391 +# also refer to line 5584 +# m +#: Merge.rc:2425 #, c-format msgid "Location Pane" -msgstr "m" +msgstr "浡" -#: Merge.rc:2392 +# also refer to line 5578 +# t +#: Merge.rc:2426 #, c-format msgid "Diff Pane" -msgstr "t" +msgstr "" -#: Merge.rc:2398 +#: Merge.rc:2432 #, c-format msgid "Patch file successfully written." msgstr "ɺɦ\gJC" -#: Merge.rc:2399 +#: Merge.rc:2433 #, c-format msgid "1. item is not found or is directory!" msgstr "1. ا䤣ΥOƧI" -#: Merge.rc:2400 +#: Merge.rc:2434 #, c-format msgid "2. item is not found or is directory!" msgstr "2. ا䤣ΥOƧI" -#: Merge.rc:2401 +#: Merge.rc:2435 #, c-format msgid "The patch file already exists. Do you want to overwrite it?" msgstr "ɺɤwsbCnмgܡH" -#: Merge.rc:2402 +#: Merge.rc:2436 #, c-format msgid "[%1 files selected]" msgstr "[%1 ɮפw]" -#: Merge.rc:2403 +#: Merge.rc:2437 #, c-format msgid "Normal" msgstr "@" -#: Merge.rc:2404 +#: Merge.rc:2438 #, c-format msgid "Context" msgstr "ߵ" -#: Merge.rc:2405 +#: Merge.rc:2439 #, c-format msgid "Unified" msgstr "P@" -#: Merge.rc:2406 +#: Merge.rc:2440 #, c-format msgid "Could not write to file %1." msgstr "LkgJɮ %1C" -#: Merge.rc:2407 +#: Merge.rc:2441 #, c-format msgid "The specified output path is not an absolute path: %1" msgstr "wX|O|G%1" -#: Merge.rc:2408 +#: Merge.rc:2442 #, c-format msgid "Specify an output file" msgstr "w@ӿX" -#: Merge.rc:2409 +#: Merge.rc:2443 #, c-format msgid "Cannot create a patch file from binary files." msgstr "LkqGiɫظɺɡC" -#: Merge.rc:2410 +#: Merge.rc:2444 #, c-format msgid "Cannot create a patch file from directories." msgstr "LkqؿظɺɡC" -#: Merge.rc:2411 +#: Merge.rc:2445 #, c-format msgid "" "Please save all files first.\n" @@ -4741,17 +4825,17 @@ msgstr "" "\n" "ظɺɫeoxsɤҦʡC" -#: Merge.rc:2412 +#: Merge.rc:2446 #, c-format msgid "Folder does not exist." msgstr "ƧsbC" -#: Merge.rc:2417 +#: Merge.rc:2451 #, c-format msgid "Current directory comparison results will be cleared." msgstr "|MثeƧGC" -#: Merge.rc:2418 +#: Merge.rc:2452 #, c-format msgid "" "Archive support is not enabled.\n" @@ -4762,7 +4846,7 @@ msgstr "" "䤣䴩YҦn (7-Zip M/ Merge7z*.dll)C\n" "аѦҤUohY䴩MҥYTC" -#: Merge.rc:2419 +#: Merge.rc:2453 #, c-format msgid "" "\n" @@ -4771,7 +4855,7 @@ msgstr "" "\n" "`NGWinMerge ]ww 7-Zip XC" -#: Merge.rc:2420 +#: Merge.rc:2454 #, c-format msgid "" "\n" @@ -4780,37 +4864,37 @@ msgstr "" "\n" "`NGWinMerge ]w 7-Zip w]W߹B@C" -#: Merge.rc:2421 +#: Merge.rc:2455 #, c-format msgid "Select file for export" msgstr "ɮץHץX" -#: Merge.rc:2422 +#: Merge.rc:2456 #, c-format msgid "Select file for import" msgstr "ɮץHפJ" -#: Merge.rc:2423 +#: Merge.rc:2457 #, c-format msgid "Options imported from the file." msgstr "qɮ׶פJﶵC" -#: Merge.rc:2424 +#: Merge.rc:2458 #, c-format msgid "Options exported to the file." msgstr "ץXﶵɮסC" -#: Merge.rc:2425 +#: Merge.rc:2459 #, c-format msgid "Failed to import options from the file." msgstr "Lkqɮ׶פJﶵC" -#: Merge.rc:2426 +#: Merge.rc:2460 #, c-format msgid "Failed to write options to the file." msgstr "LkץXﶵɮסC" -#: Merge.rc:2427 +#: Merge.rc:2461 #, c-format msgid "" "You are about to close several compare windows.\n" @@ -4821,474 +4905,495 @@ msgstr "" "\n" "n~ܡH" -#: Merge.rc:2433 +#: Merge.rc:2467 #, c-format msgid "Regular expression error" msgstr "~" -#: Merge.rc:2434 +#: Merge.rc:2468 #, c-format msgid "No match" msgstr "SŦX" -#: Merge.rc:2435 +#: Merge.rc:2469 #, c-format msgid "Invalid regular expression" msgstr "LĪ" -#: Merge.rc:2436 +#: Merge.rc:2470 #, c-format msgid "Invalid collation character" msgstr "LĪr" -#: Merge.rc:2437 +#: Merge.rc:2471 #, c-format msgid "Invalid character class name" msgstr "LĪrW" -#: Merge.rc:2438 +#: Merge.rc:2472 #, c-format msgid "Trailing backslash" msgstr "즲ϱ׽u" -#: Merge.rc:2439 +#: Merge.rc:2473 #, c-format msgid "Invalid back reference" msgstr "LĪ^" -#: Merge.rc:2440 +#: Merge.rc:2474 #, c-format msgid "Unmatched [ or [^" msgstr "[ or [^ " -#: Merge.rc:2441 +#: Merge.rc:2475 #, c-format msgid "Unmatched ( or \\(" msgstr "( or \\( " -#: Merge.rc:2442 +#: Merge.rc:2476 #, c-format msgid "Unmatched \\{" msgstr "\\{ " -#: Merge.rc:2443 +#: Merge.rc:2477 #, c-format msgid "Invalid content of \\{\\}" msgstr "\\{\\} LĤe" -#: Merge.rc:2444 +#: Merge.rc:2478 #, c-format msgid "Invalid range end" msgstr "LĪd" -#: Merge.rc:2445 +#: Merge.rc:2479 #, c-format msgid "Out of memory" msgstr "O餣" -#: Merge.rc:2446 +#: Merge.rc:2480 #, c-format msgid "Invalid preceding regular expression" msgstr "LĪem" -#: Merge.rc:2447 +#: Merge.rc:2481 #, c-format msgid "Premature end of regular expression" msgstr "" -#: Merge.rc:2448 +#: Merge.rc:2482 #, c-format msgid "Regular expression too big" msgstr "Ӫ" -#: Merge.rc:2453 +#: Merge.rc:2487 #, c-format msgid "Unmatched ) or \\)" msgstr " ) or \\)" -#: Merge.rc:2459 +#: Merge.rc:2493 #, c-format msgid "Western European" msgstr "Western European " -#: Merge.rc:2460 +#: Merge.rc:2494 #, c-format msgid "Eastern European" msgstr "Eastern European F" -#: Merge.rc:2461 +#: Merge.rc:2495 #, c-format msgid "East Asian" msgstr "East Asian F" -#: Merge.rc:2462 +#: Merge.rc:2496 #, c-format msgid "SE & SW Asian" msgstr "SE & SW Asian FnMn" -#: Merge.rc:2463 +#: Merge.rc:2497 #, c-format msgid "Middle Eastern" msgstr "Middle Eastern " -#: Merge.rc:2464 -#: Merge.rc:2474 +#: Merge.rc:2498 +#: Merge.rc:2508 #, c-format msgid "Not applicable" msgstr "Not applicable LiA" -#: Merge.rc:2470 +#: Merge.rc:2504 #, c-format msgid "MS-Windows" msgstr "MS-Windows Ln@~t" -#: Merge.rc:2471 +#: Merge.rc:2505 #, c-format msgid "MS-DOS" msgstr "MS-DOS Ln DOS @~t" -#: Merge.rc:2472 +#: Merge.rc:2506 #, c-format msgid "Macintosh" msgstr "Macintosh @~t" # According to the rc file. It has to do with CODEPAGE PLATFORM GROUPS. As I can know, "IBM" is not a name of operating system. So the original string is wrong. And I remain the string untranslated. -#: Merge.rc:2473 +#: Merge.rc:2507 #, c-format msgid "IBM" msgstr "IBM" -#: Merge.rc:2480 +#: Merge.rc:2514 #, c-format msgid "EBCDIC" msgstr "EBCDIC" -#: Merge.rc:2481 +#: Merge.rc:2515 #, c-format msgid "IBM EBCDIC Cyrillic" msgstr "IBM EBCDIC Cyrillic 訽Jy" -#: Merge.rc:2487 +#: Merge.rc:2521 #, c-format msgid "MS-DOS Latin US" msgstr "MS-DOS Latin US ԤBw" -#: Merge.rc:2488 +#: Merge.rc:2522 #, c-format msgid "MS-DOS Arabic" msgstr "MS-DOS Arabic ԧBy" -#: Merge.rc:2489 +#: Merge.rc:2523 #, c-format msgid "MS-DOS Greek" msgstr "MS-DOS Greek þy" -#: Merge.rc:2490 +#: Merge.rc:2524 #, c-format msgid "MS-DOS Baltic Rim" msgstr "MS-DOS Baltic Rim iùiy" -#: Merge.rc:2491 +#: Merge.rc:2525 #, c-format msgid "MS-DOS Latin 1" msgstr "MS-DOS Latin 1 ԤB 1" -#: Merge.rc:2492 +#: Merge.rc:2526 #, c-format msgid "MS-DOS Greek 1" msgstr "MS-DOS Greek 1 þy 1" -#: Merge.rc:2493 +#: Merge.rc:2527 #, c-format msgid "MS-DOS Latin 2" msgstr "MS-DOS Latin 2 ԤB 2" -#: Merge.rc:2494 +#: Merge.rc:2528 #, c-format msgid "MS-DOS Cyrillic" msgstr "MS-DOS Cyrillic 訽Jy" -#: Merge.rc:2495 +#: Merge.rc:2529 #, c-format msgid "MS-DOS Turkish" msgstr "MS-DOS Turkish gըy" -#: Merge.rc:2496 +#: Merge.rc:2530 #, c-format msgid "MS-DOS Portuguese" msgstr "MS-DOS Portuguese y" -#: Merge.rc:2502 +#: Merge.rc:2536 #, c-format msgid "MS-DOS Icelandic" msgstr "MS-DOS Icelandic Bqy" -#: Merge.rc:2503 +#: Merge.rc:2537 #, c-format msgid "MS-DOS Hebrew" msgstr "MS-DOS Hebrew ƧBӻy" -#: Merge.rc:2504 +#: Merge.rc:2538 #, c-format msgid "MS-DOS French Canada" msgstr "MS-DOS French Canada kݥ[j" -#: Merge.rc:2505 +#: Merge.rc:2539 #, c-format msgid "MS-DOS Nordic" msgstr "MS-DOS Nordic _" -#: Merge.rc:2506 +#: Merge.rc:2540 #, c-format msgid "MS-DOS Cyrillic CIS 1" msgstr "MS-DOS Cyrillic 訽Jy CIS 1" -#: Merge.rc:2507 +#: Merge.rc:2541 #, c-format msgid "MS-DOS Greek 2" msgstr "MS-DOS Greek 2 þy 2" -#: Merge.rc:2513 +#: Merge.rc:2547 #, c-format msgid "Windows Thai" msgstr "Windows Thai y" -#: Merge.rc:2514 +#: Merge.rc:2548 #, c-format msgid "Windows Japanese" msgstr "Windows Japanese y" -#: Merge.rc:2515 +#: Merge.rc:2549 #, c-format msgid "Windows Simplified Chinese" msgstr "Windows Simplified Chinese ²餤" -#: Merge.rc:2516 +#: Merge.rc:2550 #, c-format msgid "Windows Korean" msgstr "Windows Korean y" -#: Merge.rc:2517 +#: Merge.rc:2551 #, c-format msgid "Windows Traditional Chinese" msgstr "Windows Traditional Chinese 餤" -#: Merge.rc:2518 +#: Merge.rc:2552 #, c-format msgid "Windows Latin 2" msgstr "Windows Latin 2 ԤB 2" -#: Merge.rc:2519 +#: Merge.rc:2553 #, c-format msgid "Windows Cyrillic (Slavic)" msgstr "Windows Cyrillic (Slavic) 訽Jy (Ԥ)" -#: Merge.rc:2520 +#: Merge.rc:2554 #, c-format msgid "Windows Latin 1" msgstr "Windows Latin 1 ԤB 1" -#: Merge.rc:2521 +#: Merge.rc:2555 #, c-format msgid "Windows Greek" msgstr "Windows Greek þy" -#: Merge.rc:2522 +#: Merge.rc:2556 #, c-format msgid "Windows Latin 5 (Turkish)" msgstr "Windows Latin 5 (Turkish) ԤB 5 (gը)" -#: Merge.rc:2523 +#: Merge.rc:2557 #, c-format msgid "Windows Hebrew" msgstr "Windows Hebrew ƧBӻy" -#: Merge.rc:2524 +#: Merge.rc:2558 #, c-format msgid "Windows Arabic" msgstr "Windows Arabic ԧBy" -#: Merge.rc:2525 +#: Merge.rc:2559 #, c-format msgid "Windows Baltic Rim" msgstr "Windows Baltic Rim iùiy" -#: Merge.rc:2526 +#: Merge.rc:2560 #, c-format msgid "Windows Vietnamese" msgstr "Windows Vietnamese Vny" -#: Merge.rc:2532 +#: Merge.rc:2566 #, c-format msgid "Macintosh Roman" msgstr "Macintosh Roman ùy" -#: Merge.rc:2533 +#: Merge.rc:2567 #, c-format msgid "Macintosh Greek" msgstr "Macintosh Greek þy" -#: Merge.rc:2534 +#: Merge.rc:2568 #, c-format msgid "Macintosh Cyrillic" msgstr "Macintosh Cyrillic 訽Jy" -#: Merge.rc:2535 +#: Merge.rc:2569 #, c-format msgid "Macintosh " msgstr "Macintosh" -#: Merge.rc:2536 +#: Merge.rc:2570 #, c-format msgid "Macintosh Central Europe" msgstr "Macintosh Central Europe " -#: Merge.rc:2537 +#: Merge.rc:2571 #, c-format msgid "Macintosh Turkish" msgstr "Macintosh Turkish gըy" -#: Merge.rc:2546 +#: Merge.rc:2580 #, c-format msgid "Approximates ISO-8859-2" msgstr " ISO-8859-2" -#: Merge.rc:2549 +#: Merge.rc:2583 #, c-format msgid "Approximates ISO-8859-1" msgstr " ISO-8859-1" -#: Merge.rc:2550 +#: Merge.rc:2584 #, c-format msgid "Approximates ISO-8859-7" msgstr " ISO-8859-7" -#: Merge.rc:2551 +#: Merge.rc:2585 #, c-format msgid "Approximates ISO-8859-9" msgstr " ISO-8859-9" -#: Merge.rc:2552 +#: Merge.rc:2586 #, c-format msgid "Approximates ISO-8859-8" msgstr " ISO-8859-8" -#: Merge.rc:2558 +#: Merge.rc:2592 #, c-format msgid "Win" msgstr "Win" -#: Merge.rc:2559 +#: Merge.rc:2593 #, c-format msgid "Mac" msgstr "Mac" -#: Merge.rc:2560 +#: Merge.rc:2594 #, c-format msgid "Unix" msgstr "Unix" -#: Merge.rc:2561 +#: Merge.rc:2595 #, c-format msgid "Mixed" msgstr "VX" -#: Merge.rc:2563 +#: Merge.rc:2597 #, c-format msgid "LF" msgstr "LF" -#: Merge.rc:2564 +#: Merge.rc:2598 #, c-format msgid "CR" msgstr "CR" -#: Merge.rc:2565 +#: Merge.rc:2599 #, c-format msgid "CRLF" msgstr "CRLF" -#: Merge.rc:2572 +#: Merge.rc:2606 #, c-format msgid " B" msgstr " B" -#: Merge.rc:2573 +#: Merge.rc:2607 #, c-format msgid " KB" msgstr " KB" -#: Merge.rc:2574 +#: Merge.rc:2608 #, c-format msgid " MB" msgstr " MB" -#: Merge.rc:2575 +#: Merge.rc:2609 #, c-format msgid " GB" msgstr " GB" -#: Merge.rc:2576 +#: Merge.rc:2610 #, c-format msgid " TB" msgstr " TB" -#: Merge.rc:2577 +#: Merge.rc:2611 #, c-format msgid " PB" msgstr " PB" -#: Merge.rc:2584 +#: Merge.rc:2617 +#, c-format +msgid "Type" +msgstr "" + +#: Merge.rc:2619 +#, c-format +msgid "Unpacker" +msgstr "ѥ]" + +#: Merge.rc:2620 +#, c-format +msgid "Prediffer" +msgstr "Bz" + +# What does "Editor script" mean? Perhaps "editing scripts" or "scripts to edit"? +#: Merge.rc:2621 +#, c-format +msgid "Editor script" +msgstr "s边HĶYX" + +#: Merge.rc:2628 #, c-format msgid "Save the left file" msgstr "xsɮ" -#: Merge.rc:2585 +#: Merge.rc:2629 #, c-format msgid "Save the right file" msgstr "xskɮ" -#: Merge.rc:2586 +#: Merge.rc:2630 #, c-format msgid "Save the left file with name..." msgstr "xsɮץHW..." -#: Merge.rc:2587 +#: Merge.rc:2631 #, c-format msgid "Save the right file with name..." msgstr "xskɮץHW..." -#: Merge.rc:2588 +#: Merge.rc:2632 #, c-format -msgid "Change left file/dir read-only status" +msgid "Change left side file/folder read-only status" msgstr "ܧɮ/ƧŪA" -#: Merge.rc:2589 +#: Merge.rc:2633 #, c-format -msgid "Change right file/dir read-only status" +msgid "Change right side file/folder read-only status" msgstr "ܧkɮ/ƧŪA" -#: Merge.rc:2590 +#: Merge.rc:2634 #, c-format msgid "Convert EOL to Windows mode" msgstr "ഫr Windows " -#: Merge.rc:2591 +#: Merge.rc:2635 #, c-format msgid "Convert EOL to Unix mode" msgstr "ഫr Unix " -#: Merge.rc:2592 +#: Merge.rc:2636 #, c-format msgid "Convert EOL to Mac mode" msgstr "ഫr Mac " -#: Merge.rc:2593 +#: Merge.rc:2637 #, c-format msgid "Switch between editing and merging modes" msgstr "sMXּҦ" -#: Merge.rc:2594 +#: Merge.rc:2638 #, c-format msgid "" "View and adjust file encoding properties\n" @@ -5297,12 +5402,12 @@ msgstr "" "˵Pվɮ׽sX\n" "ɮ׽sX" -#: Merge.rc:2595 +#: Merge.rc:2639 #, c-format msgid "Open and resolve conflict file" msgstr "}ҨøѨMĬ" -#: Merge.rc:2601 +#: Merge.rc:2645 #, c-format msgid "" "Select difference area in the current line\n" @@ -5311,7 +5416,7 @@ msgstr "" "ثe椧t\n" "ثe椧t" -#: Merge.rc:2602 +#: Merge.rc:2646 #, c-format msgid "" "Go to line or difference\n" @@ -5320,7 +5425,7 @@ msgstr "" "ܬYάY۲϶\n" " (Ctrl+G)" -#: Merge.rc:2603 +#: Merge.rc:2647 #, c-format msgid "" "Set program options\n" @@ -5329,7 +5434,7 @@ msgstr "" "]w{ﶵ\n" "ﶵ" -#: Merge.rc:2604 +#: Merge.rc:2648 #, c-format msgid "" "Refresh display\n" @@ -5338,37 +5443,37 @@ msgstr "" "\n" " (F5)" -#: Merge.rc:2605 +#: Merge.rc:2649 #, c-format msgid "Copy selected lines to clipboard adding linenumbers to line begin" msgstr "ƻsŶKï([渹歺)" -#: Merge.rc:2606 +#: Merge.rc:2650 #, c-format msgid "Refresh selected items" msgstr "" -#: Merge.rc:2607 +#: Merge.rc:2651 #, c-format msgid "Toggle bookmark" msgstr "}" -#: Merge.rc:2608 +#: Merge.rc:2652 #, c-format msgid "Go to next bookmark" msgstr "ܤU@" -#: Merge.rc:2609 +#: Merge.rc:2653 #, c-format msgid "Go to previous bookmark" msgstr "ܤW@" -#: Merge.rc:2610 +#: Merge.rc:2654 #, c-format msgid "Clear all bookmarks" msgstr "MҦ" -#: Merge.rc:2616 +#: Merge.rc:2660 #, c-format msgid "" "Displays items that are exactly the same\n" @@ -5377,7 +5482,7 @@ msgstr "" "ܧۦP\n" "ܬۦP" -#: Merge.rc:2617 +#: Merge.rc:2661 #, c-format msgid "" "Displays items that have differences\n" @@ -5386,7 +5491,7 @@ msgstr "" "ܬ۲\n" "ܬ۲" -#: Merge.rc:2618 +#: Merge.rc:2662 #, c-format msgid "" "Displays items that exist in only on the left side\n" @@ -5395,7 +5500,7 @@ msgstr "" "ܥub䦳\n" "ܥW" -#: Merge.rc:2619 +#: Merge.rc:2663 #, c-format msgid "" "Displays items that exist in only on the right side\n" @@ -5404,7 +5509,7 @@ msgstr "" "ܥubk䦳\n" "ܥkW" -#: Merge.rc:2620 +#: Merge.rc:2664 #, c-format msgid "" "Displays binary files\n" @@ -5413,7 +5518,7 @@ msgstr "" "ܤGiɮ\n" "ܤGiɮ" -#: Merge.rc:2621 +#: Merge.rc:2665 #, c-format msgid "" "Displays skipped items\n" @@ -5422,7 +5527,7 @@ msgstr "" "ܲL\n" "ܲL" -#: Merge.rc:2627 +#: Merge.rc:2671 #, c-format msgid "" "Select the font for the view\n" @@ -5431,7 +5536,7 @@ msgstr "" "˵Φr\n" "˵r" -#: Merge.rc:2628 +#: Merge.rc:2672 #, c-format msgid "" "Revert to using the default system font for view\n" @@ -5440,27 +5545,30 @@ msgstr "" "_ϥιw]tΦr˵\n" "w]r" -#: Merge.rc:2629 +#: Merge.rc:2673 #, c-format msgid "Shows whitespace characters" msgstr "ܪťթMr" -#: Merge.rc:2630 +# I would suggest "Toggle Microview Pane" instead. +# "}t" +#: Merge.rc:2674 #, c-format msgid "Toggle Diff Pane" -msgstr "}t" +msgstr "}" -#: Merge.rc:2631 +# mɮץ +#: Merge.rc:2675 #, c-format msgid "Location pane shows overall picture from files" -msgstr "mɮץ" +msgstr "浡ɮץ" -#: Merge.rc:2632 +#: Merge.rc:2676 #, c-format msgid "Show folder compare statistics dialog" msgstr "ܸƧέpܲ" -#: Merge.rc:2633 +#: Merge.rc:2677 #, c-format msgid "" "Select the current user interface language\n" @@ -5469,7 +5577,7 @@ msgstr "" "ثeϥΪ̤y\n" "y" -#: Merge.rc:2634 +#: Merge.rc:2678 #, c-format msgid "" "Shows differences inside lines with different colors\n" @@ -5478,12 +5586,12 @@ msgstr "" "HPmܦ椺t\n" "ܦ椺t" -#: Merge.rc:2635 +#: Merge.rc:2679 #, c-format msgid "Swap the positions of the two panes" msgstr "ըⵡm" -#: Merge.rc:2636 +#: Merge.rc:2680 #, c-format msgid "" "Shows line numbers\n" @@ -5492,7 +5600,7 @@ msgstr "" "ܦ渹\n" "ܦ渹" -#: Merge.rc:2637 +#: Merge.rc:2681 #, c-format msgid "" "Enable word wrap\n" @@ -5501,7 +5609,7 @@ msgstr "" "ҥΦ۰ʧ\n" "۰ʧ" -#: Merge.rc:2638 +#: Merge.rc:2682 #, c-format msgid "" "Shows selection margins for both panes\n" @@ -5510,22 +5618,22 @@ msgstr "" "ܨⵡ\n" "ܨⵡ" -#: Merge.rc:2639 +#: Merge.rc:2683 #, c-format msgid "Increase text size" msgstr "[jr" -#: Merge.rc:2640 +#: Merge.rc:2684 #, c-format msgid "Decrease text size" msgstr "pr" -#: Merge.rc:2641 +#: Merge.rc:2685 #, c-format msgid "Reset text zoom to default size" msgstr "_rljp" -#: Merge.rc:2647 +#: Merge.rc:2691 #, c-format msgid "" "Scroll to the previous difference\n" @@ -5534,7 +5642,7 @@ msgstr "" "W@t\n" "W@t (Alt + Up)" -#: Merge.rc:2648 +#: Merge.rc:2692 #, c-format msgid "" "Scroll to the next difference\n" @@ -5543,7 +5651,7 @@ msgstr "" "U@t\n" "U@t (Alt + Down)" -#: Merge.rc:2649 +#: Merge.rc:2693 #, c-format msgid "" "Scroll to the first difference\n" @@ -5552,7 +5660,7 @@ msgstr "" "̪t\n" "̪t (Alt+Home)" -#: Merge.rc:2650 +#: Merge.rc:2694 #, c-format msgid "" "Scroll to the current difference\n" @@ -5561,7 +5669,7 @@ msgstr "" "ثet\n" "ثet (Alt+Enter)" -#: Merge.rc:2651 +#: Merge.rc:2695 #, c-format msgid "" "Scroll to the last difference\n" @@ -5570,7 +5678,7 @@ msgstr "" "̥t\n" "̥t (Alt+End)" -#: Merge.rc:2652 +#: Merge.rc:2696 #, c-format msgid "" "Copy the selected text to the right file\n" @@ -5579,7 +5687,7 @@ msgstr "" "ƻst϶kɮ\n" "ƻsk (Alt + Right)" -#: Merge.rc:2653 +#: Merge.rc:2697 #, c-format msgid "" "Copy the selected text to the left file\n" @@ -5588,7 +5696,7 @@ msgstr "" "ƻst϶쥪ɮ\n" "ƻs쥪 (Alt + Left)" -#: Merge.rc:2654 +#: Merge.rc:2698 #, c-format msgid "" "Copy difference to right and advance to next\n" @@ -5597,7 +5705,7 @@ msgstr "" "ƻstkèU@t\n" "ƻskëei (Ctrl+Alt+Right)" -#: Merge.rc:2655 +#: Merge.rc:2699 #, c-format msgid "" "Copy difference to left and advance to next\n" @@ -5606,7 +5714,7 @@ msgstr "" "ƻst쥪èU@t\n" "ƻs쥪ëei (Ctrl+Alt+Left)" -#: Merge.rc:2656 +#: Merge.rc:2700 #, c-format msgid "" "Copy all differences to the right file\n" @@ -5615,7 +5723,7 @@ msgstr "" "ƻsҦtkɮ\n" "Ҧk" -#: Merge.rc:2657 +#: Merge.rc:2701 #, c-format msgid "" "Copy all differences to the left file\n" @@ -5624,74 +5732,81 @@ msgstr "" "ƻsҦt쥪ɮ\n" "Ҧ쥪" -#: Merge.rc:2658 +#: Merge.rc:2702 #, c-format msgid "Delete selected items from both directories" msgstr "qؿҦ" -#: Merge.rc:2659 +#: Merge.rc:2703 #, c-format msgid "Compare selected item (compare first item if multiple items selected)" msgstr "(YhءAĤ@Ӷ)" -#: Merge.rc:2665 +#: Merge.rc:2709 #, c-format msgid "Select and reorder directory compare columns" msgstr "ìƧ" -#: Merge.rc:2666 +#: Merge.rc:2710 #, c-format msgid "Generate a patch-file" msgstr "͸ɺ" -#: Merge.rc:2667 +#: Merge.rc:2711 #, c-format msgid "Select and modify filters" msgstr "íקzﾹ" -#: Merge.rc:2668 +#: Merge.rc:2712 #, c-format msgid "Generates a report from compare results" msgstr "qGͳi" -# Instead of "The user selects the unpacker (no unpacking when comparing dir)" I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)". -#: Merge.rc:2674 +#: Merge.rc:2718 +#, c-format +msgid "Shows a list of available plugins" +msgstr "CXiΪ~" + +# "ϥΪ̿(Ƨɤ) +# " I would suggest "The user selects the unpacker (no automatic unpacking non-text files when comparing dir)" instead. +#: Merge.rc:2719 #, c-format msgid "The user selects the unpacker (no unpacking when comparing dir)" msgstr "ϥΪ̿ѥ](Ƨɤ۰ʸѶ}D¤rɮ)" # Instead of "one file only needs the extension" I would suggest "at least one file should have a needed extension". -#: Merge.rc:2675 +#: Merge.rc:2720 #, c-format msgid "The adapted unpacker is applied to both files (one file only needs the extension)" msgstr "HΪѥ]Ψ (ܤ֤@ɮ׻ݰɦW)" -#: Merge.rc:2676 +#: Merge.rc:2721 #, c-format msgid "Select an unpacker to edit this file" msgstr "@Ӹѥ]Hsoɮ" -#: Merge.rc:2677 +#: Merge.rc:2722 #, c-format msgid "No prediffer (normal)" msgstr "nBz (`A)" -#: Merge.rc:2678 +#: Merge.rc:2723 #, c-format msgid "Suggested plugins" msgstr "ij~" -#: Merge.rc:2679 +#: Merge.rc:2724 #, c-format msgid "Other plugins" msgstr "L~" -#: Merge.rc:2680 +#: Merge.rc:2725 #, c-format msgid "Unload all plugins and reload them (for developers)" msgstr "Ҧ~AsJ (Aεoi)" -#: Merge.rc:2686 +# The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. +#: Merge.rc:2731 #, c-format msgid "" "Activates next visible file\n" @@ -5700,12 +5815,12 @@ msgstr "" "JIܥt@\n" "ܥt@" -#: Merge.rc:2687 +#: Merge.rc:2732 #, c-format msgid "Closes all open windows" msgstr "Ҧ}ҵ" -#: Merge.rc:2693 +#: Merge.rc:2738 #, c-format msgid "" "Opens the WinMerge Help\n" @@ -5714,22 +5829,22 @@ msgstr "" "} WinMerge \n" "WinMerge " -#: Merge.rc:2694 +#: Merge.rc:2739 #, c-format msgid "Outputs current WinMerge version info and configuration to text file" msgstr "Xثe WinMerge TΨպArɮ" -#: Merge.rc:2695 +#: Merge.rc:2740 #, c-format msgid "Display the GNU General Public License" msgstr " GNU @뤽@v" -#: Merge.rc:2696 +#: Merge.rc:2741 #, c-format msgid "Private Build: %1" msgstr "pHsĶG%1" -#: Merge.rc:2697 +#: Merge.rc:2742 #, c-format msgid "" "Opens the release notes document\n" @@ -5738,7 +5853,7 @@ msgstr "" "}ҵo满\n" "o满" -#: Merge.rc:2698 +#: Merge.rc:2743 #, c-format msgid "" "Opens the translations website\n" @@ -5747,262 +5862,262 @@ msgstr "" "}½Ķ\n" "½Ķ" -#: Merge.rc:2704 +#: Merge.rc:2749 #, c-format msgid "Plugin Settings" msgstr "~]w" -#: Merge.rc:2705 +#: Merge.rc:2750 #, c-format msgid "No prediffer" msgstr "nΥBz" -#: Merge.rc:2706 +#: Merge.rc:2751 #, c-format msgid "Prediff if possible" msgstr "piNΥBz" -#: Merge.rc:2708 +#: Merge.rc:2753 #, c-format msgid "WSH not found - .sct scripts disabled" msgstr "䤣 WSH - .sct OX" -#: Merge.rc:2709 +#: Merge.rc:2754 #, c-format msgid "" msgstr "" -#: Merge.rc:2710 +#: Merge.rc:2755 #, c-format msgid "" msgstr "<۰>" -#: Merge.rc:2716 +#: Merge.rc:2761 #, c-format msgid "Open the file with registered application" msgstr "Hnε{}ɮ" -#: Merge.rc:2717 +#: Merge.rc:2762 #, c-format msgid "Open the file with external editor" msgstr "H~bs边}ɮ" -#: Merge.rc:2718 +#: Merge.rc:2763 #, c-format msgid "Open the file with a particular program" msgstr "HSwε{}ɮ" -#: Merge.rc:2724 +#: Merge.rc:2769 #, c-format msgid "Do not display moved blocks" msgstr "ܲ쪺϶" -#: Merge.rc:2725 +#: Merge.rc:2770 #, c-format msgid "Display all moved blocks" msgstr "ܩҦ쪺϶" -#: Merge.rc:2726 +#: Merge.rc:2771 #, c-format msgid "Display moved blocks only from current diff" msgstr "ȴNثe۲Bܨ䲾쪺϶" -#: Merge.rc:2727 +#: Merge.rc:2772 #, c-format msgid "Go to diff under cursor" msgstr "{bФUҥܦ" -#: Merge.rc:2728 +#: Merge.rc:2773 #, c-format msgid "G&oto Diff %1 of %2" msgstr " %2 %1 ۲B(&O)" -#: Merge.rc:2729 +#: Merge.rc:2774 #, c-format msgid "G&oto Line %1" msgstr "ܲ %1 (&O)" -#: Merge.rc:2735 +#: Merge.rc:2780 #, c-format msgid "Disabled" msgstr "" -#: Merge.rc:2736 +#: Merge.rc:2781 #, c-format msgid "From file system" msgstr "qɮרt" -#: Merge.rc:2737 +#: Merge.rc:2782 #, c-format msgid "From MRU list" msgstr "q MRU " -#: Merge.rc:2744 +#: Merge.rc:2789 #, c-format msgid "ASP" msgstr "ASP" -#: Merge.rc:2745 +#: Merge.rc:2790 #, c-format msgid "Basic" msgstr "Basic" -#: Merge.rc:2746 +#: Merge.rc:2791 #, c-format msgid "Batch" msgstr "Batch" -#: Merge.rc:2747 +#: Merge.rc:2792 #, c-format msgid "C/C++" msgstr "C/C++" -#: Merge.rc:2748 +#: Merge.rc:2793 #, c-format msgid "C#" msgstr "C#" -#: Merge.rc:2749 +#: Merge.rc:2794 #, c-format msgid "CSS" msgstr "CSS" -#: Merge.rc:2750 +#: Merge.rc:2795 #, c-format msgid "DCL" msgstr "DCL" -#: Merge.rc:2751 +#: Merge.rc:2796 #, c-format msgid "Fortran" msgstr "Fortran" -#: Merge.rc:2752 +#: Merge.rc:2797 #, c-format msgid "HTML" msgstr "HTML" -#: Merge.rc:2753 +#: Merge.rc:2798 #, c-format msgid "INI" msgstr "INI" -#: Merge.rc:2754 +#: Merge.rc:2799 #, c-format msgid "InnoSetup" msgstr "InnoSetup" -#: Merge.rc:2755 +#: Merge.rc:2800 #, c-format msgid "InstallShield" msgstr "InstallShield" -#: Merge.rc:2756 +#: Merge.rc:2801 #, c-format msgid "Java" msgstr "Java" -#: Merge.rc:2757 +#: Merge.rc:2802 #, c-format msgid "AutoLISP" msgstr "AutoLISP" -#: Merge.rc:2758 +#: Merge.rc:2803 #, c-format msgid "NSIS" msgstr "NSIS" -#: Merge.rc:2759 +#: Merge.rc:2804 #, c-format msgid "Pascal" msgstr "Pascal" -#: Merge.rc:2760 +#: Merge.rc:2805 #, c-format msgid "Perl" msgstr "Perl" -#: Merge.rc:2761 +#: Merge.rc:2806 #, c-format msgid "PHP" msgstr "PHP" -#: Merge.rc:2762 +#: Merge.rc:2807 #, c-format msgid "Portable Object" msgstr "i⦡" -#: Merge.rc:2763 +#: Merge.rc:2808 #, c-format msgid "PowerShell" msgstr "PowerShell" -#: Merge.rc:2764 +#: Merge.rc:2809 #, c-format msgid "Python" msgstr "Python" -#: Merge.rc:2765 +#: Merge.rc:2810 #, c-format msgid "REXX" msgstr "REXX" -#: Merge.rc:2766 +#: Merge.rc:2811 #, c-format msgid "Resources" msgstr "Resources" -#: Merge.rc:2767 +#: Merge.rc:2812 #, c-format msgid "Ruby" msgstr "Ruby" -#: Merge.rc:2768 +#: Merge.rc:2813 #, c-format msgid "SGML" msgstr "SGML" -#: Merge.rc:2769 +#: Merge.rc:2814 #, c-format msgid "Shell" msgstr "Shell" -#: Merge.rc:2770 +#: Merge.rc:2815 #, c-format msgid "SIOD" msgstr "SIOD" -#: Merge.rc:2771 +#: Merge.rc:2816 #, c-format msgid "SQL" msgstr "SQL" -#: Merge.rc:2772 +#: Merge.rc:2817 #, c-format msgid "TCL" msgstr "TCL" -#: Merge.rc:2773 +#: Merge.rc:2818 #, c-format msgid "TEX" msgstr "TEX" -#: Merge.rc:2774 +#: Merge.rc:2819 #, c-format msgid "XML" msgstr "XML" -#: Merge.rc:2779 +#: Merge.rc:2824 #, c-format msgid "Hide the toolbar" msgstr "äuC" -#: Merge.rc:2780 +#: Merge.rc:2825 #, c-format msgid "Show small toolbar" msgstr "ܤpuC" -#: Merge.rc:2781 +#: Merge.rc:2826 #, c-format msgid "Show big toolbar" msgstr "ܤjuC" From d633ded38d4b17a4f2603271405b0748235f3e63 Mon Sep 17 00:00:00 2001 From: Jochen Tucht Date: Fri, 8 Aug 2008 17:32:34 +0000 Subject: [PATCH 054/168] precompiled header fixes from patch #2036603 --HG-- branch : R2_10 --- Src/Merge.vcproj | 50 +++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj index 48c3e1b8054..ba67a608cab 100644 --- a/Src/Merge.vcproj +++ b/Src/Merge.vcproj @@ -104,7 +104,7 @@ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="2" + UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\MergeUnicodeDebug/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeUnicodeDebug/" @@ -176,7 +176,7 @@ PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;HAVE_STDLIB_H;STDC_HEADERS;HAVE_STRING_H=1;PR_FILE_NAME=\"pr\";DIFF_PROGRAM=\"diff\";REGEX_MALLOC;__MSC__;__NT__;USG=1;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;_CRT_SECURE_NO_DEPRECATE" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - UsePrecompiledHeader="2" + UsePrecompiledHeader="3" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\..\BuildTmp\MergeDebug/Merge.pch" AssemblerListingLocation=".\..\BuildTmp\MergeDebug/" @@ -396,7 +396,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_WINDOWS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;UNICODE;_UNICODE;$(NoInherit)" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -416,6 +417,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="" BrowseInformation="1"/> @@ -426,7 +428,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;_AFXDLL;EDITPADC_CLASS=;COMPILE_MULTIMON_STUBS;$(NoInherit)" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -1038,7 +1040,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2"/> + UsePrecompiledHeader="0"/> @@ -1047,7 +1049,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" BrowseInformation="1"/> + UsePrecompiledHeader="0"/> @@ -2812,6 +2815,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="" BrowseInformation="1"/> @@ -2822,7 +2826,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -3561,7 +3565,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -3581,6 +3586,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="" BrowseInformation="1"/> @@ -3591,7 +3597,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -3715,7 +3721,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -3735,6 +3742,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="" BrowseInformation="1"/> @@ -3745,7 +3753,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -3906,7 +3914,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -3927,7 +3935,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="" BrowseInformation="1"/> @@ -3938,7 +3946,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -4695,7 +4703,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> @@ -4715,6 +4724,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="" BrowseInformation="1"/> @@ -4725,7 +4735,7 @@ Optimization="1" AdditionalIncludeDirectories="" PreprocessorDefinitions="" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough=""/> From b3271034245e67417f61cff97d487eba84ee53c8 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Fri, 8 Aug 2008 22:12:16 +0000 Subject: [PATCH 055/168] PATCH: [ 2027300 ] Rename color scheme menu item "None" and add separator --HG-- branch : R2_10 --- Docs/Users/ChangeLog.txt | 1 + Src/Languages/English.pot | 8 ++++++-- Src/Merge.rc | 2 +- Src/MergeEditView.cpp | 8 ++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index 17219ab14e7..08245ec8616 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -18,6 +18,7 @@ WinMerge 2.9.1.6 Confirmation dialog for move operations (#2026508) Unlimited undo (#2033754) Add wait cursor for undo and redo (#2039228) + Rename color scheme menu item "None" and add separator (#2027300) 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) diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot index 7e44b8c7e82..dd3f80a12ae 100644 --- a/Src/Languages/English.pot +++ b/Src/Languages/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n" -"POT-Creation-Date: 2008-08-06 19:36+0000\n" +"POT-Creation-Date: 2008-08-09 00:09+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -3566,7 +3566,6 @@ msgstr "" #: Merge.rc:2161 #: Merge.rc:2600 -#: Merge.rc:2788 #, c-format msgid "None" msgstr "" @@ -5374,6 +5373,11 @@ msgstr "" msgid "From MRU list" msgstr "" +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "" + #: Merge.rc:2789 #, c-format msgid "ASP" diff --git a/Src/Merge.rc b/Src/Merge.rc index 7b69ee9c876..60405231a9e 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -2785,7 +2785,7 @@ END // COLOR SCHEMES STRINGTABLE BEGIN - IDS_COLORSCHEME_PLAIN "None" + IDS_COLORSCHEME_PLAIN "No Highlighting" IDS_COLORSCHEME_ASP "ASP" IDS_COLORSCHEME_BASIC "Basic" IDS_COLORSCHEME_BATCH "Batch" diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index e726131b92f..6f5be203a3a 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -3196,9 +3196,13 @@ void CMergeEditView::OnUpdateViewChangeScheme(CCmdUI *pCmdUI) const HMENU hSubMenu = pCmdUI->m_pSubMenu->m_hMenu; - for (int i = ID_COLORSCHEME_FIRST; i <= ID_COLORSCHEME_LAST; ++i) + String name = theApp.LoadString(ID_COLORSCHEME_FIRST); + DoAppendMenu(hSubMenu, MF_STRING, ID_COLORSCHEME_FIRST, name.c_str()); + DoAppendMenu(hSubMenu, MF_SEPARATOR, 0, NULL); + + for (int i = ID_COLORSCHEME_FIRST + 1; i <= ID_COLORSCHEME_LAST; ++i) { - String name = theApp.LoadString(i); + name = theApp.LoadString(i); DoAppendMenu(hSubMenu, MF_STRING, i, name.c_str()); } From 1d00b39c258169311ad710afc864967200d93053 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 9 Aug 2008 09:28:28 +0000 Subject: [PATCH 056/168] PATCH: [ 2039929 ] update ChineseTraditional.po from revision 5739 Submitted by wck3 --HG-- branch : R2_10 --- Src/Languages/ChineseTraditional.po | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Src/Languages/ChineseTraditional.po b/Src/Languages/ChineseTraditional.po index 26746ba548f..444e2ed76d7 100644 --- a/Src/Languages/ChineseTraditional.po +++ b/Src/Languages/ChineseTraditional.po @@ -286,7 +286,7 @@ msgstr " #: Merge.rc:450 #, c-format msgid "&List..." -msgstr "" +msgstr "CX(&L)..." # "ʸY(&M)" #: Merge.rc:152 @@ -2605,12 +2605,12 @@ msgstr " #: Merge.rc:1658 #, c-format msgid "Plugins" -msgstr "" +msgstr "~" #: Merge.rc:1661 #, c-format msgid "&Enable plugins" -msgstr "" +msgstr "ҥΥ~(&E)" #. StringFileInfo.Block #: Merge.rc:1691 @@ -2794,7 +2794,7 @@ msgid "" "Display program information, version number and copyright\n" "About" msgstr "" -"ܵ{TAXMv\n" +"ܵ{TAXMۧ@v\n" "" #: Merge.rc:1770 @@ -3917,7 +3917,6 @@ msgstr "" #: Merge.rc:2161 #: Merge.rc:2600 -#: Merge.rc:2788 #, c-format msgid "None" msgstr "L" @@ -4121,17 +4120,17 @@ msgstr "" #: Merge.rc:2218 #, c-format msgid "Are you sure you want to move:" -msgstr "" +msgstr "TwnG" #: Merge.rc:2219 #, c-format msgid "Are you sure you want to move %d items:" -msgstr "" +msgstr "Twn %d ءG" #: Merge.rc:2221 #, c-format msgid "Confirm Move" -msgstr "" +msgstr "T{" #: Merge.rc:2227 #, c-format @@ -5805,7 +5804,7 @@ msgstr " msgid "Unload all plugins and reload them (for developers)" msgstr "Ҧ~AsJ (Aεoi)" -# The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. +# The original text is strange because the next file seems to be always visible. The correct one is "Activate next file" or "Change the focus to next file", etc. #: Merge.rc:2731 #, c-format msgid "" @@ -5952,6 +5951,11 @@ msgstr " msgid "From MRU list" msgstr "q MRU " +#: Merge.rc:2788 +#, c-format +msgid "No Highlighting" +msgstr "LG" + #: Merge.rc:2789 #, c-format msgid "ASP" From 057e375cae6df323d9b4d0ccc3cda5da2bd9a3c3 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 9 Aug 2008 15:17:01 +0000 Subject: [PATCH 057/168] PATCH: [ 2038924 ] Major edit Compare_files help topic Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/Compare_dirs.xml | 33 +- Docs/Users/Manual/Compare_files.xml | 1986 ++++++++++++----- Docs/Users/Manual/Intro_diffs.xml | 23 +- Docs/Users/Manual/Open_paths.xml | 12 +- Docs/Users/Manual/Quick_start.xml | 26 +- Docs/Users/Manual/screenshots/allleft_btn.png | Bin 0 -> 704 bytes .../Users/Manual/screenshots/allright_btn.png | Bin 0 -> 688 bytes .../Manual/screenshots/copyl_adv_btn.png | Bin 0 -> 607 bytes .../Manual/screenshots/copyr_adv_btn.png | Bin 0 -> 593 bytes .../Manual/screenshots/diff_inline_btn.png | Bin 0 -> 571 bytes .../Manual/screenshots/filecomp_margin2.png | Bin 3827 -> 2749 bytes .../Users/Manual/screenshots/lastdiff_btn.png | Bin 0 -> 539 bytes Docs/Users/Manual/screenshots/linediff.png | Bin 41273 -> 5114 bytes .../screenshots/locpane_currentdiff.png | Bin 0 -> 337 bytes .../Manual/screenshots/locpane_diffs.png | Bin 0 -> 271 bytes .../screenshots/locpane_moved_diffs.png | Bin 0 -> 11179 bytes .../Manual/screenshots/locpane_viewbar.png | Bin 0 -> 444 bytes .../Manual/screenshots/multifilecomp1.png | Bin 0 -> 35749 bytes .../Manual/screenshots/multifilecomp2.png | Bin 0 -> 17806 bytes .../Manual/screenshots/multifilecomp3.png | Bin 0 -> 20253 bytes .../Users/Manual/screenshots/prevdiff_btn.png | Bin 0 -> 539 bytes Docs/Users/Manual/screenshots/save_mod1.png | Bin 0 -> 10265 bytes Docs/Users/Manual/screenshots/undo_btn.png | Bin 0 -> 530 bytes 23 files changed, 1492 insertions(+), 588 deletions(-) create mode 100644 Docs/Users/Manual/screenshots/allleft_btn.png create mode 100644 Docs/Users/Manual/screenshots/allright_btn.png create mode 100644 Docs/Users/Manual/screenshots/copyl_adv_btn.png create mode 100644 Docs/Users/Manual/screenshots/copyr_adv_btn.png create mode 100644 Docs/Users/Manual/screenshots/diff_inline_btn.png create mode 100644 Docs/Users/Manual/screenshots/lastdiff_btn.png create mode 100644 Docs/Users/Manual/screenshots/locpane_currentdiff.png create mode 100644 Docs/Users/Manual/screenshots/locpane_diffs.png create mode 100644 Docs/Users/Manual/screenshots/locpane_moved_diffs.png create mode 100644 Docs/Users/Manual/screenshots/locpane_viewbar.png create mode 100644 Docs/Users/Manual/screenshots/multifilecomp1.png create mode 100644 Docs/Users/Manual/screenshots/multifilecomp2.png create mode 100644 Docs/Users/Manual/screenshots/multifilecomp3.png create mode 100644 Docs/Users/Manual/screenshots/prevdiff_btn.png create mode 100644 Docs/Users/Manual/screenshots/save_mod1.png create mode 100644 Docs/Users/Manual/screenshots/undo_btn.png diff --git a/Docs/Users/Manual/Compare_dirs.xml b/Docs/Users/Manual/Compare_dirs.xml index d581844ca92..f2b0a51e902 100644 --- a/Docs/Users/Manual/Compare_dirs.xml +++ b/Docs/Users/Manual/Compare_dirs.xml @@ -1,13 +1,13 @@

      - Comparing folders<indexterm> + <title>Comparing and merging folders<indexterm> <primary>comparing folders</primary> </indexterm> This topic describes how to compare and merge folders using the Folder Compare window. -
      +
      Starting a folder compare operation You can begin a folder compare operation from either the WinMerge @@ -121,7 +121,7 @@ I get the partial list, but no Abort indicator.-->
      -
      +
      Folder Compare window<indexterm> <primary>Folder Compare window</primary> </indexterm> @@ -304,7 +304,7 @@ I get the partial list, but no Abort indicator.-->
      -
      +
      Working with multiple Folder Compare windows By default, the WinMerge window displays a single Folder Compare @@ -312,10 +312,10 @@ I get the partial list, but no Abort indicator.--> window is currently open, the new Compare window replaces the current one. If you prefer to work with multiple compare operations simultaneously, consider setting (checking) the Enable multiple compare windows - for Folder compare option. + for Folder compare option.
      - Using the Tab bar with maximized compare windows + Using tabs with maximized Compare windows If you open multiple Compare windows, they are displayed by default as individually resizeable child windows within the WinMerge window, like @@ -327,8 +327,9 @@ I get the partial list, but no Abort indicator.--> fileref="screenshots/multifoldercomp1.png" format="PNG" /> - Multiple Folder Compare windows: default - display + + Multiple Folder Compare windows: default display + Often, it's convenient to maximize your Compare window (by clicking @@ -342,7 +343,9 @@ I get the partial list, but no Abort indicator.--> fileref="screenshots/multifoldercomp2.png" format="PNG" /> - Multiple Comparison windows: maximized + + Multiple Folder Compare windows: maximized + When you maximize one Compare window, any other Compare windows are @@ -373,12 +376,14 @@ I get the partial list, but no Abort indicator.--> fileref="screenshots/multifoldercomp3.png" format="PNG" /> - Multiple Comparison windows: tabbed + + Multiple Folder Compare windows: tabbed +
      -
      +
      File operations in Folder Compare<indexterm> <primary>file operations</primary> @@ -612,7 +617,7 @@ I get the partial list, but no Abort indicator.--></para> </itemizedlist> </section> - <section> + <section id="protectingfiles"> <title>Protecting files<indexterm> <primary>Folder Compare window</primary> @@ -757,7 +762,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i </section> </section> - <section> + <section id="Compare_dirs_browsing"> <title>Browsing folders in the Folder Compare window<indexterm> <primary>folders</primary> @@ -957,7 +962,7 @@ added/deleted/copied. User can create a new archive file using above menuitems i </section> </section> - <section> + <section id="Compare_dirs_customizing"> <title>Customizing the Folder Compare window<indexterm> <primary>Folder Compare window</primary> diff --git a/Docs/Users/Manual/Compare_files.xml b/Docs/Users/Manual/Compare_files.xml index 9d69a462172..6e952eb4c67 100644 --- a/Docs/Users/Manual/Compare_files.xml +++ b/Docs/Users/Manual/Compare_files.xml @@ -1,665 +1,1563 @@ <?xml version="1.0" encoding="UTF-8"?> <article id="CompareFiles"> - <title>Comparing Files - - File compare window is basically two files opened to editor into two - horizontal panes. The editor allows user to do a basic file editing inside - WinMerge without needing to open files to external editor program or - development environment. - - - - - - - File Compare Window - - - WinMerge editor is not comparable to specialized editor programs, but it - has basic features like Undo/Redo, - Find/Replace and - Goto (to linenumber). The editor also has a syntax - highlighting feature supporting several file formats (colors configurable). - Note however WinMerge does not syntax highlight text inside differences. - Syntax highlighting can be disabled from options. - - - If Automatic rescan is not enabled manual refresh - is recommended after editing. - - -
      - Showing the Differences - - WinMerge uses different (user configurable) colors to highlight and - select differences. By default WinMerge shows different lines with yellow - background and missing lines with gray background. If user selects the - difference, it is shown with red background and missing lines with milder - red. -
      - -
      - Tabs + Comparing and merging files<indexterm> + <primary>comparing files</primary> + </indexterm> - WinMerge can show open windows in tab bar below toolbar. Tab bar can - be shown and hidden from menu - View - - Tab Bar - . When the tab bar is shown it has one tab for every open - window. The tab contains last part of the folder names or file names. -
      + This topic describes how to use the WinMerge File Compare window to + compare and merge files. To understand the basic concepts about differences + used here, we suggest you read read + first. -
      - File Headerbar +
      + Starting a file compare operation - The file headerbar has several functionalities. See screenshot - below: + You can start a file compare operation from either the WinMerge window + or a Command Prompt window. - - - - - + + + From the WinMerge window - Headerbar shows full path to the open file. If the path is longer than - available space one part of the path is replaced with an ellipsis (...). - Headerbar also shows: - the current active file with sunken border (like in the above - screenshot), the non-active file is shown with flat - headerbar. + Click + File + + Open + . Use the Select Files or Folders dialog to specify the + left and right source files to compare. For more details about the + Select Files or Folder dialog, see . + + + + From a Command Prompt window - if the file has been modified (has unsaved changes). This is - indicated by adding asterisk (*) before the - filename, like in the screenshot. + Run WinMergeU.exe, which is in your WinMerge + install directory. In your command arguments, include the left and + right files to compare. For more information about using the command + line, see . - - - Headerbar has a context menu with items to copy full path or filename - to clipboard. + +
      -
      - Statusbar +
      + File Compare window<indexterm> + <primary>File Compare window</primary> + </indexterm> - - - - - - - Statusbar upper line shows information about current line. In first - pane: - - - - Ln : current linenumber - - - - Col: current column for cursor and total - number of columns in line - - - - Ch : current char for cursor and total - number of chars in line - - - - EOL : current line EOL style (shown only - when Preserve original EOL chars-option is - enabled) - - - - - Col counts TAB as - X chars (as defined in editor options) and - Ch counts TAB as one - character. - - - Other three panes are: - - - - read-only: RO is shown in the pane if - the file is read-only / protected - + The File Compare window displays compared files in two File panes, + side by side. The WinMerge toolbar and context menu provides functions for + viewing, navigating, and merging differences. The screen shot below shows a + comparison of two versions of a file. - - encoding: this pane shows codepage number for ANSI files and - Unicode encoding type for Unicode files - + + + + + + File Compare Window + + + +
      + File panes<indexterm> + <primary>File panes</primary> + </indexterm> + + The left and right File panes show the text contents and differences + of the two files being compared. The File panes are the main area for + navigating and merging differences, and also allow you to edit the text + directly. This section describes the features that support these actions, + and ways that you can customize the File panes. + +
      + File pane header + + The header at the top of each File pane shows the full path of the + source file. The left and right file names are also identified in the + header of the Compare Window, above the File panes. + + One of the File panes is always active (indicated by the dark + header background); the other is inactive and has a lighter header bar. + You can edit only in the active pane (as described in ). Click in either side to make it + active and make the other side inactive. + + An asterisk (*) before the filename in the header indicates that + there are unsaved changes in the file. + + The header bar's context menu has shortcuts that are useful for + copying and pasting file information: + + + + Copy Full Path + Copy Full Path function + + + + Copies the full path of the source file into the system + clipboard. + + + + + Copy Filename + Copy Filename function + + + + Copies just the source filename into the system + clipboard. + + + +
      + +
      + Difference colors in File panes<indexterm> + <primary>difference colors</primary> + + <secondary>in File panes</secondary> + </indexterm> + + Unless your files are identical, the content of the File panes + includes some differences. Difference blocks are marked with background + colors, which you can configure in WinMerge options. The basic + difference color is dark yellow, by default. When selected, the + difference color is red. Identical lines (like the second line in the + preceding screen shot) have white backgrounds. + + WinMerge inserts one or more gray blank lines in one version of a + difference when the other version has more lines. These empty lines + (which change from gray to light red when the difference is selected) do + not represent blank lines in the source file; they are only placeholders + in the display. The purpose of placeholder lines is to keep the left and + right versions of differences vertically aligned. + + By default, different words within difference lines are also + marked with a background color. You can disable this coloring, or (for + even more granular highlighting) add character-level difference + coloring. Both are controlled by the Line Difference Coloring settings + in the Editing page of WinMerge options. To change the various + difference colors used, edit the values in the Colors page of WinMerge + options. +
      + +
      + File pane editing features<indexterm> + <primary>editing</primary> + + <secondary>features in File Compare window</secondary> + </indexterm> + + Although WinMerge is a not a full-featured editor or IDE, it does + provide basic editing functions, like Undo and + Redo, Find and + Replace, and Goto. These basic + editing tasks are often needed during merging (for example, to change + text within differences). You can edit in the active File pane + (remember, click in a pane to make it active). Changes are not written + to a file until you save a pane to a result file. + + WinMerge editing features also include syntax highlighting. This + optional feature supports several file formats, and you can configure + the colors used. Note that syntax highlighting is not applied within + differences, as the preceding screen shot shows. + + + Make sure that Automatic rescan is enabled, + as described in . If it is not, + manually refresh your view (press F5) before and after editing a file, + to ensure that WinMerge difference detection is up to date. + +
      + +
      + File pane fonts<indexterm> + <primary>fonts</primary> + + <secondary>choosing in File Compare window</secondary> + </indexterm> + + You can choose fonts for the File pane by clicking + View + + Select Font + . WinMerge supports only fixed width fonts. + + Here are font suggestions for using WinMerge with East Asian + languages: + + + + Simplified Chinese: SimSun or + SimHei fixed-width fonts + + + + Traditional Chinese: MingLiU + fixed-width font + + + + Japanese: MS Gothic or MS + Mincho fixed-width fonts + + + + Korean: GulimChe fixed-width font (not + Gulim, because this variant uses + proportional-spacing glyphs that are not centered in grid cells and + poorly aligned in fixed-width mode). + + +
      + +
      + File pane margins<indexterm> + <primary>margins</primary> + + <secondary>in File panes</secondary> + </indexterm> + + The File panes have optional gray margins that show line numbers + and some symbols. To show or hide the margins, clicking + View + + View Margins + . If you are using multiple File Compare windows, you can + control margins for each window independently. The margin can show any + or all of these features: + line numbers + + in File panes + + bookmarks + + word wrapping + + in File panes + + + + + Line numbers, if + View + + View Line Numbers + is enabled. + + + + Bookmarks, if + Edit + + Bookmarks + is enabled. A bookmark is a blue circle, in the + margin next to a line, that you can make WinMerge remember and + return to. + + + + To set a bookmark on a line, double-click in its margin + (or press ( + Ctrl + + F2 + ). The same action deletes an existing + bookmark. + + + + To navigate bookmarks, click + Edit + + Bookmarks + and choose Next or + Previous. + + + + Double-click a single bookmark to delete it (or press + ( + Ctrl + + F2 + ). + + + + Click + Edit + + Bookmarks + + Clear All Bookmarks + to delete all bookmarks. + + + + + + Word wrap arrow symbols, if + View + + Wrap Lines + is enabled. + + + + The following screen shot shows a margin with bookmarks and word + wrap enabled. Without line numbers, the margin width is minimal. + + + + + + + + File Compare window margin with bookmark and word + wrap + + + + The next screen shot shows a margin with bookmarks and line + numbers enabled. Notice that the margin is wider. In fact, the margin is + wide enough for the largest line number. Thus, the margins for large + files with many lines can be quite wide. + + + + + + + + File Compare window margin with bookmark and line + numbers + + +
      +
      + +
      + Toolbar and menus<indexterm> + <primary>toolbar, with File Compare window</primary> + </indexterm><indexterm> + <primary>menus, with File Compare window</primary> + </indexterm> + + The WinMerge toolbar and menus provide a range of functions to + navigate, select, and merge differences within files. + + + WinMerge shortcuts have the same names and buttons whether you + open a Folder Compare or File Compare window. However, the functions + behave differently: with a File Compare window, the functions operate on + differences within files, not on differences within folders. + + + The difference functions you can use depend on your context, which + often changes as you work. This means that a function is available only + when its operation is possible for a given location or other condition in + your WinMerge environment. For example, if you click in a line of text + within a difference, you might notice several navigation and merge buttons + become enabled in the toolbar. If you click in another area of text that + is not within a difference, these functions become unavailable. + + Difference functions are available in the WinMerge toolbar,and also + through these alternate mechanisms: + + - EOL style: EOL style can be Win for - Windows/DOS files (CRLF), Unix (LF) or - Mac (CR) - - Note there are two different ways to show EOL style. When - per-line EOL style is not remembered, EOL style is shown on own pane in - statusbar. And when per-line EOL style is remembered line's EOL style is - shown after char number. When per-line EOL style is used there is no - file-wide EOL style. - - Difference between column and char is that column counts tabulator - character as so many (space) chars as it occupies (4 by default, can be - changed from options). But char count counts tabulator char as one - char. - - Lower line in statusbar shows current difference and amount of - differences. Text can be: - - Identical : files are identical there - are no differences + WinMerge menus, especially Merge - X differences Found : amount of - differences, no difference is selected + Context menus within the File Compare window (when you + right-click in text) - Difference X of Y : amount of - differences (Y) and number of selected difference - (X) + Keyboard shortcuts - -
      +       -
      - Editor Margin + Difference functions are described in and , + later in this topic. and provide examples of comparing and + merging. - The editor panes (file panes) have optional gray margin area for line - numbers and some symbols. This margin can be shown/hidded from menu - - View +
      + Merge Mode<indexterm> + <primary>merge mode</primary> + </indexterm> - View Margins - . The margin shows: + + File - - - Line numbers (from menu - View + Merge Mode + restores these WinMerge 1.7.1 single keyboard shortcuts + for difference merging and navigating functions: - View Line Numbers - ) - + + + Up and Down keys for the + Previous Difference and Next + Difference functions. + - - Bookmarks (menu - Edit + + Left and Right keys for + the Copy Left and Copy + Right functions. + + - Bookmarks - ) - + Merge mode omits the Alt key for these common + operations (making them quicker to use than the normal mode). Note that + the Shift and Alt + Arrow key combinations work in merge mode in the same + way as normal mode. - - Word wrap symbols, when word wrap is enabled - - + Merge mode is indicated in the status bar by the text, + Merge. +
      +
      - When line numbers are not shown then margin is shown like screenshot - below. +
      + Location pane<indexterm> + <primary>Location pane, File Compare window</primary> + </indexterm> + + The Location pane, to the left of the File panes, maps the entire + length of the compared files into two vertical bars (corresponding to the + left and right File panes). It is especially useful for working with files + that are too long to easily navigate in the File panes. + + The Location pane shows several kinds of items: + + + + + + + + + + Location pane diff lines + + Difference blocks - - - - - + + Each difference block in the File panes is indicated in the + Location pane by a horizontal line across each vertical bar. The + thickness, color , and locations of these lines are clues about of + the size (number of lines), types and distribution of all + differences in the files. For example, the color of a line is the + same as the color of the corresponding difference block. The + Location pane in the preceding screen shot shows many basic + differences (gold) and some empty difference blocks (gray). + + - Blue circle is a Bookmark. And arrow marks word-wrapped line. Next - screenshot shows same lines without word-wrap and with linenumbers. + + + + + - - - - - + + Location pane current diff pointer + + Current difference - If linenubmers are not visible it takes pretty minimal width. Note - that with linenumbers the margin width is set so that the longest line - number fits into it. So with large files with lots of lines it needs space - for several numbers. -
      + + If you have selected a difference, the Location pane marks the + current difference line with a pair of small triangles on either + side of the vertical bars. If you navigate to another difference, + the pointer moves up or down with the location. Scrolling the File + pane does not change the location of the difference pointer (or any + of the difference lines) in the location pane. + + -
      - <indexterm> - <primary>Difference Navigation</primary> + <varlistentry> + <term><inlinemediaobject> + <imageobject> + <imagedata contentdepth="15" + fileref="screenshots/locpane_viewbar.png" /> + </imageobject> - <secondary>File Compare</secondary> - </indexterm>Difference Navigation + + Location pane view area bar + + View area - Difference navigation commands are in Merge - menu: + + The area of the files currently visible in the File panes is + indicated by a shaded (translucent) view bar over the Location pane. + The area bar's height and location correspond to the portion of the + files that is visible in the scroll region. For example, you might + see the bar expand or shrink if you change the height of your File + panes. This synchronization of the Location pane view bar and File + panes enables quick navigation, and some useful actions: + + + + When you scroll the File panes, the view area in the + Location pane moves with it. + + + + Conversely, you can drag the view area bar in the Location + pane up or down to scroll the File panes. This scrollbar thumb + action is very handy for navigating long files. + + + + Click anywhere in the Location pane to jump to the + corresponding location in the File panes. + + + + - - - - - + + Moved differences + moved differences, in File Compare window + -
      - Selecting a difference + + The Location pane can indicate difference blocks that are + moved. Moved blocks are two sides of a difference that are in + different locations. Moved blocks are indicated by the + Moved and Selected Moved + difference colors (configurable in WinMerge Options) and by lines + connecting their locations in the left and right location bars. For + example: + + + + + + + + Location pane with moved diff + + + + Showing moved blocks can make it easier to visualize changes + in files. However, if there are too many moved lines it can appear + cluttered. Use your own judgement! + + + - Before difference can be merged, it must be selected. Selecting can - happen by difference navigation keys/items (see below) or by selecting - wanted difference directly: + The Location pane's context menu contains these shortcuts: + context menu + + Location pane + + Moved Blocks functions + - Double-click over difference with mouse + Goto Line 1: Moves the cursor to the + top of the file. + + + + Goto: Moves the cursor to a line you + specify (described in ). - Move cursor inside difference and select it with - Current Difference. + No Moved Blocks: Turns off moved + difference color for moved blocks. + + + + All Moved Blocks: Turns on moved + difference color for all moved blocks. + + + + Moved Block for Current Diff: Turns + on moved difference color only for current selected moved + difference.
      - Navigating differences - - Merge-menu has items for navigating to - next/previous and first/last difference. Navigation is always done based - on current cursor location. So Next - Difference-command selects next difference from cursor, not - from current selected difference. - - - When difference is selected with navigation commands cursor is - moved to begin of first line of difference. In both files. - + Diff pane<indexterm> + <primary>Diff pane, File Compare window</primary> + </indexterm> + + The Diff pane shows the contents of the two sides of a selected + difference. + + When you select a difference, the two versions are loaded in the + upper and lower sides of the Diff pane. In this way, the Diff pane + confirms which lines are included in a difference, and lets you examine + them in isolation from the rest of the file. + + You can merge differences directly in the Diff pane by + right-clicking in either the top or bottom side and choosing + Copy to Right or + Copy to Left.
      - <guimenuitem>Current Difference</guimenuitem>-command + Status bars<indexterm> + <primary>status bars</primary> + + <secondary>for File Compare window</secondary> + </indexterm><indexterm> + <primary>tab</primary> + + <secondary>character encoding</secondary> + </indexterm> + + Each File pane contains a status bar at the bottom. The status bar + contains several panes with different types of information about the + document and your location in it: + + + + Line status + + + + + Ln: Line number in the source + file. + + + + Col: Column location of the cursor + and the total number of columns in the line. + + Col counts tabs as + n spaces, where + n is the number of characters defined + as the Tab size in the Editor page of + WinMerge options (4 by default). + + + + Ch: Character location of cursor and + the total number of chars in the line. + + Ch counts tabs as single tab + characters. + + + + EOL: Linefeed style of the current + line (shown only when the Preserve original EOL + chars option is enabled in the Editor page of + WinMerge options). + + + + + + + Read-only status + + + RO is shown in the pane if the file is + set to read-only (as described in ). Otherwise the pane is empty. + + + + + File encoding + + + Codepage number for ANSI files, Unicode encoding type for + Unicode files. + + + + + EOL style - This command has two important functions: - When there is no difference selected and cursor is inside - difference, it selects this difference. This is very handy way to - select difference from keyboard. + EOL style of the file: Win for + Windows/DOS files (CRLF), Unix (LF), + Mac (CR), or Mixed. + + + When the per-line EOL style is used, the file EOL style is + not shown (this pane is blank). + + + + When a File Compare window is open, the WinMerge window status bar + shows one of these messages about the compared files: - When there is selected difference, it scrolls to selected - difference. This is handy if user has scrolled selected difference - out of screen. So this allows user to scroll files to see other - contents and quickly return back to selected difference. + Identical: The files contain no + differences + + + + n Differences + Found: The number of differences detected, displayed only + when no difference is selected. + + + + Difference x of + n: The selected difference's + sequence number in the total number of differences, starting with + 1.
      +
      + Working with multiple File Compare windows<indexterm> + <primary>File Compare window</primary> + + <secondary>multiple</secondary> + </indexterm> + + By default, the WinMerge window displays a single File Compare + window. If you start another file comparison (by clicking + File + + Open + and selecting another pair of files) while a File Compare + window is currently open, the current File Compare window is closed, + unless WinMerge detects unsaved changes in the left or right file. If you + have modified either file, WinMerge prompts you to save or discard your + changes before opening a new File Compare window. + + + + For example, in the next screen shot WinMerge gives you a chance to + save changes detected in the right side file: + + + + + + + + Save modifed files? dialog + + + + If you plan to work with multiple compare operations simultaneously, + consider setting (checking) the Enable multiple compare windows + for File compare option, which is disabled by default. With + this option enabled, you can open multiple File Compare windows without + the intervening Save step. +
      +
      - Go To line or difference - - Using Go To from - Edit-menu user can jump to certain line or difference. - Go To -dialog shows current line and side when opened. - - - Go To line number is useful if there is need to merge same change - to several target files from one original file. Rather than using - Find or difference navigation it is faster to - jump to first line of difference. - + Using tabs with maximized Compare windows<indexterm> + <primary>File Compare window</primary> + + <secondary>using tabs when maximizing</secondary> + </indexterm> + + By default, Compare windows are displayed as individually resizeable + child windows within the WinMerge window, like this: + + + + + + + + Multiple File Compare windows: default display + + + + If you maximize your Compare window (by clicking its Maximixe + button), the window fills all the available space in the WinMerge window, + giving you the most room possible to work in. However, if you are working + with multiple Compare windows, only one one maximized window is visible: + any others are hidden. The screen shot below shows the header area of a + maximized Compare window: + + + + + + + + Multiple File Compare windows: maximized + + + + To access other Compare windows, you could return to the default + view by clicking the + + + + + + Restore button + + Restore button. But a better solution is to enable + tabs by setting (checking) + View + + Tab Bar + . + + When you display the Tab bar, each Compare window has a tab that + shows the filenames of the two compared files. Now, you can easily + identify the available Compare windows. To open any of them, just click + its tab: + + + + + + + + Multiple File Compare windows: tabbed + +
      -
      - <indexterm> - <primary>Merging Differences</primary> - </indexterm>Merging Differences - - Merging commands are located in Merge-menu after - navigation commands. Basically there are only two types of merging commands - - copy difference from right to left and copy difference from left to right. - Additional commands make merging several differences easier. - - Copy to Right and Copy to - Left copy difference from side to side. At simplest this means - replacing text in destination difference with text in source difference. But - because difference can contain also removed lines, new lines may be created - or some lines removed. If there are several differences selected, then all - fully selected differences are merged with one command. This makes merging - many small differences a lot faster. - - WinMerge rescans files after every merging operation. This is done to - ensure differences were copied correctly and all changes after last - rescanning are taken care of. If Automatic - rescan-option is not set, user may have edited files and - differences may not have shown correctly before merging. If result of - merging is not what were wanted, user can undo merging operation. - - - It is strongly advised to run Rescan - (F5) before merging differences if Automatic - rescan is set off. Usually files get out of sync when editing - and merging differences may have unpredictable results. If merging result - looks incorrect try undoing ( - Edit - - Undo - from menu or - Ctrl - - Z - ) it and rescanning files. And then merging again. - - - Copy to Right/Left and Advance-commands - merge current difference and then select next difference (if there is one). - Using these commands makes merging several differences easier and - faster. - - Copy All to Right/Left-commands sync two - open files by merging all differences. Note that you can undo this whole - operation with one undo command. +
      + Navigating differences<indexterm> + <primary>difference navigation</primary> + + <secondary>File Compare window</secondary> + </indexterm> + + This section describes how to navigate and select differences in the + File Compare window. Note that when you select a difference, it is always + selected in both File panes. - Enable Automatically scroll to first difference - -option from general options. This saves you from scrolling to first - difference and selecting it. See for more - information. + To save time, enable Automatically scroll to first + difference in the General page of WinMerge options. Then you + don't have to manually navigate to the first difference and select + it. -
      -
      - <indexterm> - <primary>Merge Mode</primary> - </indexterm>Merge Mode +
      + Navigation functions<indexterm> + <primary>WinMerge functions</primary> - <para>Merge mode can be enabled from the <guimenu>File</guimenu>-menu. It - restores the WinMerge 1.7.1 single keys for difference merging and - navigating:</para> + <secondary>difference navigation in File Compare window</secondary> + </indexterm> - - - Up- and Down arrow keys - select previous and next difference - + Here are the functions for navigating differences in the File + Compare window, and their shortcuts in the toolbar and menus: - - Left- and Right arrow keys - merge difference to left side or right side. - - + + + Difference in the Current Line/Select Line Difference + Difference in the Current LIne function + + Select Line Difference function + - Unlike the normal mode, in this schema the Alt-key is - not needed for these basic operations (which makes them quicker and more - convenient). Note that - Shift + + Shortcuts: + + + + + + Difference in the Current Line button + + button, + Edit + + Select Line Difference + , F4, context menu in File pane + within a difference. + + Enabled if you have clicked in (or selected) text within a + difference in a File pane. Selects the word differences within the + line. For example: + + + + + + + + Select Line Difference example + + + + If you want to select the difference block itself, use + Current Difference instead. + + - Arrow - , - Alt + + Next Difference + Next Difference function - Arrow - and - Ctrl + with Compare Files + - Alt + + Shortcuts: + + + + + + Next Difference button + + button, + Merge + + Next Difference + , + Alt + + Down + (or Down in merge mode). + + Selects the next difference below your current cursor location + in the document (not necessarily relative to the current + difference). Use to step through differences sequentially from any + point. Available except when the last difference is currently + selected. + + - Arrow - keys work in merge mode like in normal mode. + + Previous Difference + Previous Difference function - When merge mode is enabled Merge text is shown in - statusbar. -
      + with Compare Files + -
      - Refreshing + + Shortcuts: + + + + + + Previous Difference button + + button, + Merge + + Previous Difference + , + Alt + + Up + (or Up in merge mode). + + Selects the previous difference above your current cursor + location (not necessarily relative to the current difference). Use + to step backwards sequentially through differences. Available except + when the first difference is currently selected. + + - Refreshing updates differences after changes are made to files. It is - important to do a refresh before merging changes between files. + + First Difference + First Difference function - - Refresh does not reload file. That means, if another programs has - updated files etc, those changes are not seen. Refresh updates differences - according changes user has done. - -
      + with Compare Files + + + + Shortcuts: + + + + + + First Difference button + + button, + Merge + + First Difference + , + Alt + + Home + . + + Use this to begin comparing or merging differences, or to + locate the first difference from any other location. Available + except when the first difference is currently selected. You can also + select a difference by double-clicking its text. + + -
      - View Whitespaces + + Current Difference + Current Difference function - When enabled from View menu View - Whitespace feature shows all whitespace characters (spaces, - tabulators, line ends). This is very useful for example when there are - spaces in other file and tabulators in other. Also, if Preserve - original EOL chars is enabled, WinMerge shows type of EOL - (Windows/Unix/Mac). -
      + with Compare Files + -
      - Editing Files + + Shortcuts: + + + + + + Current Difference button + + button, + Merge + + Current Difference + , + Alt + + Enter + . + + This function has two modes of action: + + + + If your cursor is inside a difference but no + difference is selected, this function selects the entire + difference. This is a very handy way to select a difference + using the keyboard. + + + + When there is a current difference, the function + jumps to that location. This is handy if you have scrolled the + selected difference out of view, and want to quickly return to + its location. + + + + - Normal editing features work in WinMerge editor. User can type and - delete text, select text, copy, cut and paste text etc. There is some - customisation because there can be removed lines in files (lines existing - only in other side). Anyway these customisations are not usually visible to - users otherwise that lines can sometimes "jump" when WinMerge has to - relocate matching/non-matching files. -
      + + Last Difference ( + Alt -
      - Line Difference Highlight + End + ) + Last Difference function - WinMerge can automatically highlight all differences it finds in - lines. This makes it fast to look through and find differences. See - screenshot below for an example of highlighted differences. + with Compare Files + - - - - - + + Shortcuts: + + + + + + Last Difference button + + button, + Merge + + Last Difference + , + Alt + + End + . + + Enabled except when the last difference is currently + selected. + + - This feature can be enabled and disabled from menu - View + + Go To + Go To function + - View Line Differences - . + + Shortcuts: + Edit + + Go to + , + Ctrl + + G + , context menu in File pane and Location pane. + + Enables you to jump to either a line number or a difference + number (for example, difference 2 is the second difference). Opens + the Go To dialog, where you specify the number, which file to use + (either the left or right), and the type of location (either line or + difference). + + + The Go To line number can be useful when you need to merge + the same change from one file to several target files. Jumping to + a particular difference can be quicker than using + Find to search text, or stepping + through differences. + + + - With default settings WinMerge uses whitespace characters (namely - spaces and tabulators) to separate words. WinMerge does not consider commas - or dots as word separators. That means WinMerge thinks "For Example" is two - words but "For,Example" is one word. More characters can be included as - word-separator characters from editor options (select from menu - Edit + + Refresh - Options - and Editor page). See for more information. + + See . + + + +
      -
      - Line Difference Selection +
      + Merging Differences<indexterm> + <primary>merging differences</primary> + </indexterm> - Many times it is useful to see exact differences inside lines. - WinMerge can highlight different area between lines. This feature is called - Select Line Difference. It is available in - Edit-menu, toolbar and shortcut key - (F4). In screenshot below there is one difference - highlighted + Merging differences amounts to copying them from one File pane to the + other — either left to right, or right to left. This is different from + directly editing text using WinMerge's editing functions (described earlier + in this topic). - - - - - -
      +
      + Rescanning files<indexterm> + <primary>rescanning files</primary> + </indexterm> -
      - Location Pane + By default, the Automatic rescan option is + enabled in the Editor page of WinMerge options. WinMerge rescans your + files after every change to update its difference mapping. Without + rescanning, WinMerge differences might not be synchronized with the + current content of the files, causing unpredictable merge results. - Location pane is a handy side-pane showing a overall (difference) map - of files compared. + + Rescanning does not reload files. Therefore, if an external + program has updated a file, those changes are not seen in WinMerge: only + changes made in WinMerge are used to update differences. + - - - - - - - Location Pane shows differences as they are located in the files. So - it gives a good overall view for files compared. Location Pane shows - differences with same colors than editor panes. There are different - indicators in Location Pane: - - - - small triangles point to begin of the selected - difference - - - - selected difference is shown with different color - - - - area visible in editor panes is shown with different background - color - - - - Clicking with mouse in Location Pane moves cursor to place clicked in - file. Right-clicking with mouse opens the context menu with items to select - line to go to. And the visible area locator (area with different background - color) can be used like a scrollbar thumb - after pressing down the left - mouse button over it can be dragged upwards and downwards to scroll the - files. -
      + + If Automatic rescan is disabled, we strongly + advise that you run Refresh + before performing any merge operation: click + + Edit -
      - Context Menu + Refresh + or the + + + - File compare context menu contains items for frequently used - features: + + Refresh button + + toolbar button, or press + F5. - - - - - + If a merge result looks incorrect, click + Edit - Most of these items are familiar from Main menu. Worth noting is last - item Open. It allows to open file with (system) - registered application or with external editor. Also context menu - merge-commands are not relative to active file. They always merge the - selected difference. -
      + Undo +       or press + Ctrl -
      - Fonts - - Font used by editor can be changed from - View - - Select Font... - . Due to limitations in the editor, only fixed width fonts - are supported in WinMerge. - - Font suggestions for use of WinMerge with East Asian languages: - - - - Simplified Chinese texts with the SimSun - or SimHei fixed-width fonts - - - - Traditional Chinese texts with the MingLiU - fixed-width font, or - - - - Japanese texts with the MS Gothic or - MS Mincho fixed-width fonts - - - - Korean texts with the GulimChe fixed-width - font (not Gulim as this variant uses proportional-spacing glyphs that - are not centered in grid cells and then poorly aligned in fixed-width - mode) - - -
      + Z +       to undo the merge. Then rescan the files and try merging + again.       +       +
      -
      - <indexterm> - <primary>Conflict Files</primary> - </indexterm>Resolving Conflict Files +
      + Merge functions<indexterm> + <primary>WinMerge functions</primary> - <para>WinMerge can resolve conflict files several version control systems - produce when merging files. Conflict file is basically two different - versions of files embedded into one file. WinMerge reads this file and - separates it into its original files, and shows those files in file compare. - So conflicted file can be resolved using normal WinMerge file compare - functionality.</para> + <secondary>merging</secondary> + </indexterm> -
      - Opening Conflict Files + The merging functions can implicitly select differences based on a + cursor location or text selection. For example, if you click anywhere in a + difference and then click the Copy Right toolbar + button, the entire difference block is merged. This makes it easy to merge + many small differences. Similarly, if you select text that spans all or + part of multiple differences, all the included differences are merged with + a single merge command. - Conflict files can be opened into WinMerge using - File + If the result of a merge operation is not what you expected, you can + click Undo to reverse the operation. + + Here are the merge functions and their shortcuts in the toolbar and + menus: + + + + Copy Right + Copy Right function + + + + Shortcuts: + + + + + + Copy Right button + + button, + Merge + + Copy to Right + , + Alt + + Right + ( or Right in merge mode), context + menu in File pane within a difference, and in Diff pane. + + Copies one or more difference from left to right. Note that + differences do not need to be fully selected: At its simplest, this + means replacing text in the target difference with text in source + difference. But because differences can also contain empty lines, + new lines may be created or removed. + + + + + Copy Left + Copy Left function + + + + Shortcuts: + + + + + + Copy Left button + + button, + Merge + + Copy to Left + , + Alt + + Left + (or Left in merge mode), context menu + in File pane within a difference, and in Diff pane. + + Copies the current difference from the right to the left File + pane. See Copy Right description for + details. + + + + + Copy Right and Advance + Copy Right and Advance function + - Open Conflict File... - . Conflict file to resolve can be selected using file - selection dialog that opens. At the moment there are no other ways to open - conflict files. + + Shortcuts: + + + + + + Copy Right and Advance button + + button, + Merge + + Copy to Left + , + Ctrl + + Alt + + Right + , context menu in File pane within a difference. + + Merges the current difference from the right to the left File + pane, then selects the next difference (if one exists). Equivalent + to Copy Right and Next + Difference in one step. + + + + + Copy Left and Advance + Copy Left and Advance function + + + + Shortcuts: + + + + + + Copy Left and Advance button + + button, + Merge + + Copy to Left + , + Ctrl + + Alt + + Left + , context menu in File pane within a difference. + + Merges the current difference from left to right, then selects + the next difference (if one exists). Equivalent to Copy + Left and Next Difference in one + step. + + + + + All Right + All Right function + + + + Shortcuts: + + + + + + All Right button + + button, + Merge + + Copy to Left + , + Alt + + Left + , context menu in File pane within a difference. + + Copies all differences from the left to the right File pane. + Use to synchronize two files with one command. Similarly, you can + back out the entire merge by clicking the + + + + + + Refresh button + + Undo or pressing + Ctrl + + Z + . + + + + + All Left + All Left function + + + + Shortcuts: + + + + + + All Left button + + button, + Merge + + Copy to Left + , + Alt + + Left + , context menu in File pane within a difference. + + Copies all differences from the right to the left File pane. + Effectively, replaces the content of the left File pane. See similar + to All Right. + + + + + Refresh + Refresh function - - WinMerge overwrites original conflict file. If original file is - wanted to save, it must be copied to another folder or another filename - before opening it into WinMerge. - + rescanning files + + + + Shortcuts: + + + + + + Refresh button + + button, + View + + Refresh + , F5. + + Rescans files to update differences. Use after changes are + made to files, if automatic scanning is disabled (see for details). + + +
      -
      - Conflict Resolving - - WinMerge opens conflict file into normal file compare (see above). - All normal WinMerge file compare features are in use. Files in two panels - are: - - - Left panel: this file is called - "theirs" file. It is usually the file that is in - version control system's repository. This file usually cannot be edited. - An as such, WinMerge opens left-side file as read-only. Differences can - be moved only from this file to the another file. - - Right panel: this file is called - "mine" file. It is the user's working file - originally. All changes should be done to this file. I.e. this file is - at the same time the result file. - - - After the wanted resolved file is in right-side panel, it can be - saved like normal file. WinMerge saves the file over original file. - - Left side "mine" file is set to modified after - opening conflict file. This allows fast resolve by just saving the file - when user's file is the wanted end result. This also prevents accidentally - not resolving the files. As resolving only happens when file is saved. If - file is no saved, original conflict file is kept unmodified. - - Many version control tools allow configuring external merge tool. - WinMerge accepts three filenames ("Theirs", - "Mine" and "Resolved") as - command line parameters. See more info from . Single path to the conflict file is also - accepted in command line. +
      + Resolving Conflict Files<indexterm> + <primary>conflict files</primary> + </indexterm> + + You can use WinMerge to resolve conflict files that some version + control systems produce during their merge operations. A conflict file is + created when a merge encounters differences that cannot be automatically + resolved. It is a single file containing the incompletely merged content + of the two files. WinMerge separates the conflict file into separate files + and opens those files in file Compare window. You can then use WinMerge's + compare and merge functions to resolve the conflicts and save the merged + result file. + + + + Click + File + + Open Conflict File + , and use the Open dialog to select the conflict file + in your file system. The conflict file opens in the File Compare + window: + + + + The left File pane file header is titled, Theirs + File. This side represents the file that is usually in + the version control system's repository. This file usually cannot + be edited, so WinMerge sets the left File pane to be read-only. + This means that differences can be merged only from this file to + the other file. + + + + The right File pane is titled, Mine + File. This side is the working copy of the file. All + changes should be done to this file, which is the result + file. + + The Mine File side is set to modified + after opening conflict file (you will notice the asterisk in the + File pane header). This allows you to save the file quickly if the + it does not require any changes. It also ensures that you do not + forget to resolve the files. If you choose not to save the file, + the original conflict file is not modified. + + + + + + Use all the normal compare and merge functions described earlier + in this topic to resolve the conflicts in the Mine File pane. + + + + When you are done, click + Ctrl + + S + to save the the Mine File side as + the result file. By default, the new version overwrites the original + conflict file. Alternatively, you can click + File + + Save Right + + Save As + , and choose a different file name. + + + + Many version control systems allow you to configure an external + merge tool. If yours does, you might be able to have your version control + system launch WinMerge automatically when a merge conflict occurs. + + You can also open a conflict file from the WinMerge command line, + which accepts three filename parameters: , + , and optionally, (if you + want a different result file from the conflict file). For more + information, see . Single path to the + conflict file is also accepted in command line.
      diff --git a/Docs/Users/Manual/Intro_diffs.xml b/Docs/Users/Manual/Intro_diffs.xml index 7b4481e4557..b07e9346e5d 100644 --- a/Docs/Users/Manual/Intro_diffs.xml +++ b/Docs/Users/Manual/Intro_diffs.xml @@ -6,7 +6,7 @@ within files, and demonstrates simple file comparing and merging operations. -
      +
      Comparing files We usually compare two files that are related in some way, such as two @@ -86,7 +86,7 @@ Believe it or not. File1 as the Left file and File2 as the Right file, then click OK. The File Compare window displays - the two files in the left and right document pane, like this: + the two files in the left and right File pane, like this: @@ -99,7 +99,7 @@ Believe it or not. - The window elements are described in more detail in The elements are described in more detail in . Here are some features you should notice in this example: @@ -108,8 +108,9 @@ Believe it or not. Number of differences - The message in the status bar (at the bottom) tells you - that two differences were detected. + The message in the status bar at the bottom of the + WinMerge window tells you that two differences were + detected. @@ -117,13 +118,9 @@ Believe it or not. Difference colors - WinMerge marks differences with various background colors - (which you can configure in WinMerge options). The basic - difference color is dark yellow, by default. Within each line - difference, WinMerge marks words and characters that are - different with a lighter background color. Identical lines (like - the third line in the example) are unmarked: they have white - backgrounds. + The basic difference color is dark yellow, by default. + Identical lines (like the third line in the example) are + unmarked: they have white backgrounds. @@ -239,7 +236,7 @@ Believe it or not.
      -
      +
      Merging files The purpose of merging is to combine changes from two files into one diff --git a/Docs/Users/Manual/Open_paths.xml b/Docs/Users/Manual/Open_paths.xml index fcf3355f4d5..6c298a48189 100644 --- a/Docs/Users/Manual/Open_paths.xml +++ b/Docs/Users/Manual/Open_paths.xml @@ -125,7 +125,9 @@ format="PNG" /> - Simple WinMerge context menu + + Simple WinMerge context menu + You can enable the shell integration when you install WinMerge. After @@ -180,7 +182,9 @@ - Advanced WinMerge context menu + + Advanced WinMerge context menu + @@ -392,7 +396,9 @@ to compare one file/folder against several files/folders. --> - Project File dialog + + Project File dialog +
      diff --git a/Docs/Users/Manual/Quick_start.xml b/Docs/Users/Manual/Quick_start.xml index dcfd1859448..451a54428cf 100644 --- a/Docs/Users/Manual/Quick_start.xml +++ b/Docs/Users/Manual/Quick_start.xml @@ -8,7 +8,7 @@ Opening files and folders - basic methods + getting started Opening files and folders After you have installed WinMerge, step through the procedure and @@ -85,7 +85,7 @@ Select Files or Folders dialog - basic usage + getting started The Select Files or Folders dialog opens: @@ -297,11 +297,11 @@ <indexterm> <primary>comparing folders</primary> - <secondary>basic methods</secondary> + <secondary>getting started</secondary> </indexterm><indexterm> <primary>Folder Compare window</primary> - <secondary>basic usage</secondary> + <secondary>getting started</secondary> </indexterm>Comparing folders If you selected two folders in the Open dialog, the Folder Compare @@ -383,11 +383,11 @@ <indexterm> <primary>comparing files</primary> - <secondary>basic methods</secondary> + <secondary>getting started</secondary> </indexterm><indexterm> <primary>File Compare window</primary> - <secondary>basic usage</secondary> + <secondary>getting started</secondary> </indexterm>Comparing files @@ -402,21 +402,19 @@ The File Compare window shows the two selected files side by side, in - separate document panes. Different lines are highlighted with a background + separate File panes. Different lines are highlighted with a background color. One or more consecutive different lines form one difference (or diff). In the preceding example, a single difference - is selected in the document panes, which displays it in the Diff Pane. - WinMerge mainly works with these differences, not separate lines. + is selected in the File panes and displayed by itself in the Diff Pane. + WinMerge mainly works with these differences, not separate lines. When you + merge a difference, you copy all of its lines from one side to the + other. Notice how WinMerge fills missing lines, so that similar lines are always aligned vertically, side by side. This is different from most other compare/merge programs, and can take a while to learn. - During merging operations, lines in a difference can be copied - between sides. Missing lines can also be be copied. When missing lines are - copied from one side to the other, matching existing lines are removed. In - the preceding screenshot, a merge that copied lines in the second difference - from left to right would remove the matching lines in the left side. + WinMerge has a simple integrated editor that features basic typing, copying, cutting and pasting of text. If Automatic diff --git a/Docs/Users/Manual/screenshots/allleft_btn.png b/Docs/Users/Manual/screenshots/allleft_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..a2f0d49d3e3d45f16b689e19a11380ce275e367b GIT binary patch literal 704 zcmV;x0zdtUP)5r00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOP# z3^^+U;yN|}000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006TNklGmGSWefY}B>00lTY zgYKV1vN?o?Ln#!K1OO2nz)FN3A|8l`;BoTW7?REL>dra-Df;>*X#L>Q`aTKS-X;ZT zZD+uEb#mrH2a?S(l|Re(vSGA4!_=i=ykf}TQiNZL2){mqLLmXTZVPez4ke1CgIAGk zj*)yf>$@>-H6k4vhI^W6(~9=A&Edj2*Q&pVSzN>hEH~ALQcYA|zeKIg@#yA9L?AH2pK8pna?ENWV&!+hmyK#2 zU~7jE&`zoasr|st>>JVpFmnqoj-EjjR6?QTMU)F66)$W6QZ<0KT_U3ZLD58YcAg^x z@Zvt4ztRN=-=07IuYoMB2>>00Wo+9;sYWAgK7GRRA$U6jy#t*9EH6xu?doa}9ESj~ zf}n^}E(#Z=TrB0{`&&fwdDPlmy^Vre)g&A&trH7=u*J^qI5r00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOP# z3^*D~Ckssg000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006DNklRCHPU5wgD@a#x!ZtG|6jo9bRlw>DCLE1DAV$|NlAn9I@6~_OawW>_845xx4G$^3qj|1K45_q^;29$6~R= zNz7=5#fMR7m9Rj!7ZU<(sl;GzsLOx)Uxv)wInCHLIC=r9Z;D{s8qx)zSOkV}PM*W< zF+}?feKChCBT*JBEpDeyaXkakvmRA%DR|ieqoY9zl*>Efk1rl#wYJTlEz6HJpPHj+ zgbfp^5$kgna(3+d;6!2Gr&nr#77kn1V+x*(M_H$EVFkB!$au{MGminRfu4&YU; zN>86d@1R4!qv>rIYx?F#B=1q1eG9};0uma)Gy!D{0RETf_&^2t4aCPUBNkrV%OQD> z`fL^?g2f^TM!5k%I}V$LCp#|k^YffYqygdG^gNRHSb6pokz>K4H4wP}) z(a@yRQ*dY5r00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOP# z3^o--8#__}000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005HNkl&M`YR!NNog(f`W)NnIJ}=nkCGDV>y$j#d|)U`G@Af<-$4l`*H5?+^a-Hs343; z0)X<;FaTPmaMjIw$8uUFu!PJLd94!o{Y1;j+Se6zCK#;k<8n`f3oot~-P#*vb4rT$ z1tlPkka9fL+cDa6NXX>zKr`QS`)ud-dHpU=>GK?$*Rpm89L|I08H51FLl=HD8YXM~ zV*O`{jg8;#v8vfwTR`-?r!;>ZD4g$0Q?!Q-!0ryDtTc5`4FXRzQdXL+T#~Jnh5D9ZVdf)BKzaOLcb0K$(z#O& zyttagDu3ZY^*DE?;qV|yc}XxL3EpN*t~A!W0h~QO-wHMgU8Jf5edYRjvqC$d@v@Hg|PTODDlORe?xB@k?Pnd(c4DcoO{X_ t!v@cQy&_%#<^7HRUfZSOv;Y5~e*vuz?AqWz(Ek7c002ovPDHLkV1iU-2QB~r literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/copyr_adv_btn.png b/Docs/Users/Manual/screenshots/copyr_adv_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..ee5e90f59e4cf54a8dc48b7cbe1a65d710e90f8c GIT binary patch literal 593 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 literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/linediff.png b/Docs/Users/Manual/screenshots/linediff.png index 877c55fa1b9ed088cc3ecd698b7fa01851ebef5c..852020559a422a8fba06505c1f18f7e99d8ca6f2 100644 GIT binary patch literal 5114 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 O0GOhNLfJD5^#1`;*tDMj literal 41273 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

      UsWHKF^qKdqL||DK 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 YY~&DFld`f_ALwodPgg&ebxsLQ0QhQqRsaA1 literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/locpane_diffs.png b/Docs/Users/Manual/screenshots/locpane_diffs.png new file mode 100644 index 0000000000000000000000000000000000000000..b99de310b04e5839a1587c6a68dc9b8451c7a680 GIT binary patch literal 271 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 H2@CiiDnGYy literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/locpane_viewbar.png b/Docs/Users/Manual/screenshots/locpane_viewbar.png new file mode 100644 index 0000000000000000000000000000000000000000..8d4f5bcf213d35e8813b7278d56c79483f2674a9 GIT binary patch literal 444 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 W80;&nbf-fa1Poiaqb22x5B?vji%t{( literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/multifilecomp2.png b/Docs/Users/Manual/screenshots/multifilecomp2.png new file mode 100644 index 0000000000000000000000000000000000000000..d8d9b376cc1dec5d286b510dbb8d4fd740d17692 GIT binary patch literal 17806 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

      y;CB&~WoK{-=dZsvlve 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 JPDHLkV1lZxd;tIe literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/multifilecomp3.png b/Docs/Users/Manual/screenshots/multifilecomp3.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc15d4bde1f87b6ae0a2ace8a736bce1329c14f GIT binary patch literal 20253 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 VVft)G>DT}O002ovPDHLkV1o0yilP7j literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/prevdiff_btn.png b/Docs/Users/Manual/screenshots/prevdiff_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..e1f23df1994973aab049eb07956a15b5e814cb52 GIT binary patch literal 539 zcmV+$0_6RPP)5r00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOP# z3@|FCC$Z@O000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0004YNkla6=M;#7%ay*CM(xIte+&z|NfW%{|MmoPg3n6E+m`?azD1W@dti9>D)&hzux^ z0Yg#+04a8upx?3xul9kz{!JF>`DOP7d1(U(TNa~!5`g@QMa@YXFOgFNV8pVB`bn5; zj7dUyT(l^c3=lOa6hlLoqK;oy$1iK>QZy7ZT9tNT+smr$-K*{0>zT9L79y$|R0zif z=7fuAs!>dYXYZP$$|m{xBO7mbkWeaX&DH_nC%iwt-K>XlSlJ>|JO4Hdd-w}uJ`kX|nR z{}O?gPT{yvbX{(pEE(s4V!hf(Hn;D|L^n&otf0 d2q2+!t1lY8|FyXB-)jH>002ovPDHLkV1oB9+r$6> literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/save_mod1.png b/Docs/Users/Manual/screenshots/save_mod1.png new file mode 100644 index 0000000000000000000000000000000000000000..fa0089753d52a330498d0b000c98f0cb54c0da60 GIT binary patch literal 10265 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 UeVu(b9smFU07*qoM6N<$f@=BXga7~l literal 0 HcmV?d00001 From 11bdcadcd25232d0eb67d584a12d0b02b0627751 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 10 Aug 2008 08:17:25 +0000 Subject: [PATCH 058/168] PATCH: [ 2038924 ] Major edit Compare_files help topic Minor, misc doc changes Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/About_Doc.xml | 10 +- Docs/Users/Manual/Compare_dirs.xml | 6 +- Docs/Users/Manual/Compare_files.xml | 14 +- Docs/Users/Manual/Install.xml | 4 +- Docs/Users/Manual/Introduction.xml | 199 ++++++++++++++---- Docs/Users/Manual/Open_paths.xml | 19 +- Docs/Users/Manual/Quick_start.xml | 6 +- Docs/Users/Manual/screenshots/options_btn.png | Bin 0 -> 566 bytes 8 files changed, 198 insertions(+), 60 deletions(-) create mode 100644 Docs/Users/Manual/screenshots/options_btn.png diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index 203424e17a7..2581d8d5395 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -2,9 +2,11 @@
      About this document - This document is the user manual for WinMerge 2.8. It explains the - capabilities and limitations of WinMerge. This manual is recommended reading - for both new and experienced users. + This document is the user manual for WinMerge . It explains the capabilities and limitations + of WinMerge. This manual is recommended reading for both new and experienced + users. To learn essential WinMerge basics, please read the following topics: @@ -101,4 +103,4 @@ -
      +

      h1x1Xg!|BZm< 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 Z-U0iO)63$4CsJVGqoZk{@f2wn@h?^2c~}4d literal 35429 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 bp2!K3cpMv{7e;$LJe`&XRJ~Hw_T~QpbyG`= literal 0 HcmV?d00001 diff --git a/Docs/Users/Manual/screenshots/foldercomp1.png b/Docs/Users/Manual/screenshots/foldercomp1.png index f441e9a8c2ecc4f80189fc0e65fd85a7d5208191..25f08db19e8fda4419a0ed65cbeebad393edabc8 100644 GIT binary patch literal 36512 zcmXtf1yozl({_UMLkq>Nw1t-9UfhdAp=fb;cTdqmDGtHiU4sO7cXto&u3!59&USCS9;LZ?llR=e3e`Z>Rjf53)e_BQ8Q#UWlpaCQ>Up<2-KI zKDx9yHOkS)ZAr9z6o16|w}`>Q;T^bSWVi2^Vyp*>-JpEzZ9==wygCa@CA`vOk2_IQ zD^tmZM@Rf}GNEYmBvkDAh*1eR0B6F7j>C}A^(lkBN*>I#{iba^2q<3!QCt!a zg5tktvuBKuUEd*BEkcyLS~qaX)P^$ingk-s$EpATegw>c(A!b0H827Ecr0)(Fodq# z-p^9&U{cNM91kl3-LZ-LWWr>glgDrX61sePyzg4_<5aElu9l|ChQ%W|K9mL#Y-6;-*o}S-rXcsnOicJf%silNBN0E zUnpZ4g0Q_J8N@E(loD@J$Ms3_b4ehjKH?CtAG>FcA7u)YC31t+U->{8QQw^Hb6zAX z;6U~o3qWNQ6ToT_(2VH+?sw;no4oY5z3d!aS~)r&WiY8(S`Dx?ja`;)1p(H{mb+c) z?Ecl7B@$a$275MZ00PPqAvMPcq?{(j1Rxxnn+Ixs1V{c;iV}VQol|YK`>ff;|vCKP7A*(!Z*Hgoy-l1h@ngq+?O5l=;jyZ@;K|2uu)W{zZ z@Ic!Lq6oq%Nblr@T|d`8w9^23Z3ckz2a0=`A{dN7>t_VwA(m$w6-oev>cuxJ)+fF4 z3PHb#@CKCS@g7As?Q%g5&0;^zQW3WWi&O?rTrUyn_XIO_2Tktp7*#-Zjr#9IkeaB~ z5e&7rWV2PUyQ0et)FpStLwso_C$ACgJx-z>pPMc-mBNznQ>#xn+$MAoL z_TGm-xq0vNX$3R!cg}IC{qCVxjkZ0VDLjT8amr%7T7G@>_5@0K?JLf;iZ(4J&d)vK zCyUj4J1q%}20!%)5o{{8fW+pDp)aW2tJMJjStdZHn5{|fJblkjE>!$fbdmvEq>i^j z+qv|0u?A)JwzRH(z!s|?gg%szk0l>q0R-V?gJ@=8pwOF4&Ib3_&JtArKgf2-Z1Un^ z$V2|1hCQoR)V75tzX>}_vfD6-8VRP) zmk37sDnU~o2xUav{)5<#p$e9Wbm%U(_^YAt2)mc4-5wjyHHb6x=we`3I!)JOzOT;W zTLfGpow;k41=u&6`T|q~60?l_O02CV#{Dg%sr51Jfpi8A13YpOnRHA3=C)gpx2LBe zHm?uQ8>rg4u|eWYE9k<4LXM|CbNgb&iMGEJo|_w$l0_2p-y$q0q$1)$Xn4R7x{*xG z+J&-_zmKsR~tYx-~Xok^RjG&YFi3*mi9R@Mu_N|4zl=SG27|Ysq(Cb$CE}g z+4HTG=gx-IZxAzFqgSJT$SEG8A7r8V_s0bj@-)Tl^Rhd;V-6ta>Jw(lqGKtG%AnA3 z0(FdnX$5%sd0kH|LsM}_Io|9La&r=QNwVvN*s^pXcH~7>GSa!A2+I^n(^4m)Fgk~u zy8m=NEhRky0xD1mLp}#Uh_VDYb5WCtcoA~+xOpb)6yd@26IyjbVbHBU{`o~+2Fuvd#e!h+v|M=Fn}QgW%_lwxfekTnF!w8nXF z-dUS#(N%4*5QC8ji33@5ZB{mHBP65fFe1%{Gkok6gQ^Y8nodl1V~U|H8dvI|1Wa<| znaB*qKxmM`3FuN5N$Ux4E=C_#WQ8NhrMdqp19H)N~9zgh8PjLpw?dj#e! zF_)OdDi)B{v3mj5yEexZdikWP`%mB>6S+vW^2)O~K@fm{K4vnDjYTrr;$-!kS~ypb zk>1hdMv)p(2GGcCw=M|6=oK=iNV(rwBxUElNoHEol8qEv6585ZX?wzE_@R+s8&Jt$ zflA$d_G!&d^Fh1I|6W-t-(vW8o3c!R8g>OL7XXnLBND`cuE+Y=Q8T6kImugs>G;gx zmz+Go7TcO@O!i+b=ca2lv=zSIMTMd&M#$K9J&SEmsUn7vfPg&=2baN*A%$InO*NZ2 zeDtZOuXP@Xk~sV15q~MOTe$4>Z`Ba)omKBL9(JRL25*?izhsm@^r<2$%N$UtW1*3K zqN#T2nfIbb%eFHhx)Exxo*)&L1&H7$5ImT{zdVu9pG)o+Kr*UpdzerT^s9==ZH_Z~ zn>JJ?_lFzf!t9qNEn}9w3mUojtMn&Ss zSHq*n8pmuBW2s88FC`L7i495VdN^x(;h0^^OVMjrPZmi8(X9_8cj?e_pz@xkYnQ04<_yjnW}%|(-x#j~hqXc(9HES@UxVa(iTrQ@ zXDeZm2FNQJ@jdj_msT>tBkDo~Z8cF%@BH_ih=ZPS(0)$V>L*uP&ucG|L!z|X31ejE zm4EsNy*SvT1JUScG+-+(@*n9YLY)t6zbC?_X0rN5`&I1PWQOV$-B!%r9{NBYTrjFXY3{+;JD&xg%gI8auZ*Sr+z_4BgWVi=Qq zAE^&9=rZCnLMHdgm%xKX*Q*{&V}L$vP?Zdu&uzTE?aHsUTT9JEfwx2cKUsBDV5-w@ zx8$zPZWnDsv#o1I;R#$9vh~pum5t=k29O&9zrV(>g8)eFKrNpH766M>63ZI^Y=w|T zo}|`bk*(jrkz{)quM)Y{J9j=z=A)rN9wtg|z6hFq>*L_%m)A<-b|41$-8lg zYR`8|7!635NhaqXjXi*sN1F2T_gFW_Ro zL$Lxa_3Hv(rHYr2%h?4oV~SPJ)dVkyH3uc)`t%VYeL}3ZDjo$?6rxfNLTj@R{7 zeghI}S$)}()Z*P$KrOLT;O}NXfnfo3Q|90z*6PD(I7Qid_q;CfYOUyO8|DtMUbcxW z<2Y%9)ynFTA_*;;>85@roAb>vzX^S*itp`Rx!J+^nc!o~2{G8RJ-n;<%X+Z3*@f-k zF{70#%^^g;2mc zrVidjCM5jrFRm3#QSNutK~ZwE!#pJi9YjD(zfA#`tTdS1I0s!Gp#5Xw-m>F=fCmc@ zRVfk(#g2}Hx!IS6Vi`33=dsEWQs=imwb?=+=GLOw?4)V2;$>o!k#IGYdHsjuKlX1S zDqtW=z%-c_=S<__Up~d;BQ1!b+1+Knjr?PZzxTNP&GAFT{)kYKP0m=xPKL*ckXhOd zIF|O2@>v0tG%`*MlGnP?@q7^(wodm^p6Ff4;!&Ob`PzRpIi&cdX%iB!C-iCu&QPgc z_cz^RApdfgR`7Z~m7;zpZ@?&% zUvpj-tNp;OnRRo;ULak1VOQru!%d2Wn_tD%!dyMU-&=Oe~=gCDyzw8@hhO=ImmyG6)=3;04vKlrWKAHdT zgYA3EY%Znu!gB8^9%;HD#w>uLBX?K&q&Q9?K~C@ZWDFdGWMer?IrDY7MY%;>asWRH zKjtI`z?Gi=89K^-h>1c^H$~s;)vkiVX^tTJxYx3~gDTg2sV*s#+DZJey|cCXWaG;` zvo%0g2xdet0Hd72X_x0_=Gmx|oq=($y(r&3cKw)~sm#)W#}yCvV7+Hb5WXqJx=#IG z_a!sn>`B&Y?4?)T_qy8)M!|Zq;Ahu*6S5V-XL|K`Y6YX%Ks=iZ0VCn?61F#f!hGC6 zmMuN+E6PpxyZ^JE8}0by0B19TM$2Z+%{~nHb)(!bv?&|{Xs?94GVWXvK2Vltsi{oR;0m7w$)E|+)nnhL8Ao3da zxXB~g%OC;fptJ}8UBF~@pp9h{Hf>UzeiUgj<%8ST5>-VX$m7#_l=6Q-blR_96Dxtj z?j1LyFx!YbmW&v}XfmQ0@~p=9g9H!VoB;WT4H&M4HPBoh)iltJQK*HV*UC zQnB94QNI(8iBZVGA4C2(NUU&0Z z57S~_5T}9>@9w5ZTO45R$|LvMfD1e7`gETP9ua2p!JF3X=ud)g-JR!}WSNOy3wXpb z`0TK#Jin`O^0QRFvvE_HqB}$R*6l_sB^xwc3BDgJ-x_kIM zA{ZhVO(=GZQ){{DpDZRD-**<+K?JdrKm)3V*%KB9~_!Siz$%3TQ7=W_Dz z9H!=Uls;6TUSe-tWrT-n7l8fKTrdC46|a&CS?F5T4q{+0LBou{0%qnp;{!p@)Ul+pLJ zP8P`UTzfpYFn0bT7L$%43@t3%Te}5*Mp;yRmaw+jb8Id!zG;(XY60vZhBfOkU|?nt zyCgQfH!Me3-^V$=#9`)j?tj5i9u&qdC-(X{Ve-*92J5%3WQQG!(IT69$2hQ8_sK=+ z2pDUJDa?jW$D5$-(7}+`PGNBM9{<Zb0f`tnQ3TvltM_OUWAPBWvP=$4 z7Pt$0;wSjANj(+NF97y-+1q+G=y?udT2=9KCCCN9!ksMK#PJLTGi&f!^@*v~7fnCk zAn424W%x21eg5KeFx7W3rswgLhO=y9ZW$s)j2S%Y{MUmc5dwIJMQ}$1$o(4(iORX3 zJ4$w?^h*y%HvO7MZhv};ddA;C1;rsBd*!ML#Xxs3L!3;*kpjMCfW?=v^H&_@D? z+xx}WXJ^ynGousUIgK-}*BSQrTnm0r-2nUTfk>Z=1zUjkIGWQzk@T2qZJKA<4`xin z_76hiX5oe*E0&Sv08n3s#(*{ZO+=@9vro=>B>k1V3!8UOp4Ik!$d*0sG z2Vx^M8|fYz;XZ(bG$HU(E*YsoOn!_g!iL5I)DT@H?@WMPY_)t_7PlTn%GHm;R1UR~ zd=Fsw#T2@ioJ7>mzPlf3n%s-U{d&e0v)E z@N%eeSFhS^+3c9pvD$L$lErP^WI9@U0ZfPd0UI_^*KkyX6gYt8kn6Tb@Nhq+rwYR-VW{>Ei@_e7 z>jw;Eu$%{6vSSv=xlnPC_b0Y!FDkU2u+_sAy3dO9+Warm&&{WqbKtWJFT3rJKwMKuvsc#Co?&Im&0DYO}9w| zZ+j5CCqll_Ag>35w=w>#`JIQF0KWYtK5Kg&zMl%(y_DrzZShn-YAo6>pF`A_#aDRF z*=Rhn`?*56e}0Z=b|DsFrgN%5QQ=r(_aJU%^}qYADG43J#+j`y+ny?Q`9X?2bo(w& zZapfD!nop*b2@5!OZ!XY$F$BAco&IQivZfhx0wDNhQmlT9~sb>f^FDsWm5v2=;Dn% z6Nkk8@$v&LKH#SOo~RP4v5~FO*=wRT>DqGRWN5}vX1V^as`j1SJYj<>T;Yd7wT;`5 zZS7(Y{Yc&Uq} zxIOm=)G?7u?#EABq7nIds9LLA^~;YW zkM~FKv4xo?=O~o&!8dbZGD&lN&H)yf@8d9IA+!wku?w`*kmv-9l-U>8s&ZtQP1Mma zA)wOws9wLk=SDH7fG8*~c_fR>@|A8+W64>rAAi;mQmP_Y`>?ndr)&DQo2?P!_5Epb z)y9mTIv7Wv?C^Xqrm2KU_wx`v`*8YC3>)o*n#0=XkaEgqk%~gzv3{jYM*n_#POR)= zzaJ~UQurc~w&pRcbRT0$e=MmuStqpbjlbM@ue=n}Vizc%zBftL*-j5fAfj%~(c-aO&)u@fhI8n_M1ZNJ za%po<^B(oS8o|AHd2)64KidIE@6;78V9WI31&|I|V`ntF!ke zULV-ywj)pPh`jegXw1eiS6!~ar>{?)&rnxSfnZ}f7A(;{QX@dDHaHc%T)LwXwBGcV z7M$(4%^KOvayr6_u{v%rpy20r7$V~~#F{C-&(wgmGA@7zNJJF`y1SH#$<#&NIFd+e z=S}~L;0{91=9c$x@Ei+!cM%p6`Uji+)!D+qQujj8VaVy11eFJ4kx5)XyUia#7KWmZ zU`c!;3WL}Eu*qq>g(16pufy!T;Z4j0EQ>63)}|8V^&gSZZ#=zU|Gbv~(OG)NVk~Y&~{f&_$btVE~QAnAns8Qv|>16W?DzwHGojFwx zRsNOldmLd| zvxP)^B!rgOGD8YoZ=8XzIlHLbps(|NHNOZh(nQVK18TwzS$E=68FSuS#t|>z_HpS8 z(H%&jZ~@DJb~)dCJnEcoq;Lq$N_9$GN?B}4?q$wT?OzY=o-0aLt*DpC;Y8CsA^HE!C@-yh=#JpL) zV?>RWUMI>YL&g)u0=1wf)+LoZ^v=4IFLOUWj~ssQ`0cTNb|5uN7o=pi!g88FA7|I% zk$$PkRIxL-CNZ=nY}CEhmgccg{@KRYYhz+dQIFr{V7fu)+jhpaS8IPWeyBXVl6w3> z-TO#IX5`!Z$mZ|a(0-*)>C>J(P1?nCgVFP_g1D&$kx6y`y{zW5O<5}6yN#zMTWmk4 zsR}zj=iV#3)FgX5amf{|qt({k9E!si{PP*RZ0w}3GP5miC!gF+JAV;Wp^LlFXzpvq z(8iR#l-yni97J3!^z;!l`?CoaQHWe&=e|{Dqcb6jWZ&(1cO5iaMapwfI>glIzTJN? zuFaZ@rv$4Jd^!^YT-r9@L$qxFqk3J7r}Enxp2`_@EP!6mSDgqEp!y!R8&M$v_y9Rp z+np=*IgTfKcBGJ-6}M01cOx9VcbfZ;*~<-Qs%%%ZIg_C?W%D>pd=FBJ^r`O4CEdH! z7oek`%!3$_@;rak!)LY%$->zpQjSbwNMIN=)xyD?9VQOOU!8<;1IcVt{3PGu{(kB` zy`i zL+elJ>FjZZr(&j;g-VWz9)dORB|=YFwHh7M-A2Y*pbXu$1wlrrybeWZk^~E1T;+tWY;lFQ?=q|MOGti$GdCK zFTYy6ZV`w%%-2=bU*tUcmCPC^SJF}hr&@gd7VMEoHz_Nj0+okpw_%8k`|_JTH+)Rc z34S88WpC39XO@%DD)oV&>*~CSBzL>}v2T>aF{_|=v)}KT)%@RyrXSkW7dD#YmWcKx{)Cxq3cI=k6*-Mqwq_~ly5(R;rTyk?7Ot$A)b6|~i>dV_#NTQryL`KUJn~H~jKOYzFked%7dhgsw*N0+_{d)mioKir`b?uN0;6%h&O?`UWKfYj z^E*BSEc4`q?b6>?&ugkes4S3qG96UXY@ zzb~onh|#JMzqehVz+9qPzxBakKhpOqXQS&$#o8lt4l1$@iowkCfS5oNgCFqjj;TU=euHs16BCrwJh%=1$Jq_!d^gHf{S+|GWEM&~O&5)~O;CzTg0i5CBG)pt$wrY6kjOGnaEWid?s&`6`vve>hJ4A&-Ue zsBEpsg@F=Vz|#a1WZ*u&;rkz5gU$U@p5@jb@AP)g^|Wcz(6Xjya>l8$DWft9KaVs?cjQfw6MK&S0Nn7q8Mq$G z1rM~|b~FVC2UCj$tEi|H{;YRBUW7ME*iEh1S_N+Iy3E2upD()NQ#Li~nml&~<9Bv; z@INVFA|d<|&TMUMg+L(9%}@Owl)YBYGjgz9oaVV9PxZ`KcmzacNZ;GcQ9|_;Cs)dU zF5%5C@|E+&%UU=M>;3dQd_G;hx|GHaeY*aIF4VSvIldbY0EL_;o&{v&&C**WyUuEw z0Uff*Waxls)PUx@%|AZ53@$oCm&5EWx^`yucdK5SQf}CPUUo&2u5y*uUVYua(KyCB zQ&j%nT7ZHCV4kC}g^C3$z$@iPzmh9H)f2|+P>y={^M1IzckQh@jnF)6vGbi_8G*pKZR+gYoo=g7@3Kz2DUH zcq~<>xe-w?-H+?$28V`lc=s}IZf@WlfgfiCKL$72u=$VrQGG+ofkq$OLCkKa4-d;^ zz*4U#R+MJPaf5=2*Ux#~dfxW}0Ln;7ELR`FjKz_c@TmyES?^MbDz^!7umQ1eo8JL- zml6K`b`8ZZ;dY445=0g3@-#<_=v7a^{9P_u*U$#Hso9fkcb3rjf z%=BtL4kDtQrBU(Gu^J6?$Wx0uI8@;+N=?Ko|4g_(su_c8uyK!aF-c(4)>K6Q<-SrO zEky~Gk&!XH>UgRCbg>RYSXz3ZhPhcsSGWA9qvzYh-iJ_Vrypgls|HzVuGxLM`}-T& z)1w7_%HKh_0OHyRWqi!ULqSgyNaV$Q^Myx`P(>;`Pu>AW0E;dD9=yT!T4W71D{?L_}nh#kTT@qP9LZ1qL@ z!P#n->WXA!JzJ`|5inP#1^yguF_j@^u1+^VCC6 zioFVauII?ur9+%3IahVse0{{kx;8?nT3rs+z@goQ%$fx7?%vlx|<^4)wd^^KNsF>%Y&oUEY7;U_p zn+p3BZo1MlIk8fnm&MSS0v1Ht1{;iCWNY+M8lp<%&YzEiL(CLj7julGiP84jySF0q zd@T|og7%NBBqIst$;rR==PEMr^r-{$EmEDPIJC614i65BOG>6niVUc|;bMbIBf<(Vbd07oLa|>{VaZ5ipsj5iEbc#&@t4=608;GE+Zf zbo9XvrP5hPOT*Jm=m)-2io@huTgA{GA!pl#2uY{yoka17D3KqvsnA^@W9;mq`XrJpU%R< z->h8lVJ@L`Kk~gF_6z7t#K)e9?jPjfk%2ArUtiBQh@t+Td0j|oFPxy(|-bMCW>nfG&0S6RL}V@-rN_g zTwK8R$!nX8x}lPajEfZLcaM{jo0Q0aHuSFoy_D=1j{wotdf!xsWmleyxPK&2#hj#z=+~=`GwVWqDV>hnrw-K`?g3}4aMK# zCh~h+9L$t}8MR!8S^JLG+SdNIX{o6}tQV>;E-nUQKcOQ0dh_9%MuLfEg3VIuB^=&_ z-$i}1Q*)S*@tc|6nG0X6oO?JQ@)`=c>&3i%-kB5PvomSo-)lbmp^K6ouVVk z6QqsBh4JyI^tK_M3|^OF((L5?BGbe!Me{h>G;;tMXJT1V(L$Y-y8GhsdH{}E%}96^ zTnJctt(O!yy)4VB<6>9|J<8zz#dWP#9&_Nh%SvnmL+W#z8*KX7VOpN=4#wA0{9gqQ z+uNxm>3hTHh-v;#9_yu!lw=73&<=jOpy}xSjMFD$lbbrvlR&C9o|lIU8u@I>cCxLE zpWbuwGjpF5`8^%fydF=s2-O7LSwWBxDpbE3!}eQVhQr#gvJ1seU)Ew+>FtFg?(V}Y z-TmxeWdH>>$unn<`lQ@TJFGX++=zG9X7+kj6WS-x?T9YQHejzq#iCt8hc4Pj-*CqC zAX;kRmLW|Oc-djTH@Q8cWp*@;dTj#Vf%+w-(IQS1?%``V^Kp(Hs-|aX{S9|}A}I*U z<^F4l*{;?B)>&|&HIVq`o2e20q5^F%JrI7YW3A#6J`3xe@snwv9hsI#Ves4 zXVPnZiW0+Ks4|k=_V4?=vI2L7&NjNh%zC=Ix`Mt>?lfJ=`B+qf%Pg1~WA%*XbY3h^1jJU`p(BKslS1LyAM%~^7}vpPYnD>@of4@e2p!VXS}0ifh!De3fHhA=cL`> zz&-^$=)080`Hnu&}sTdCYUG zsTpp{GMkz_=PM2P+)kETeZ00Ce-tRFI`!yQ%pG1AbAG2|wQ)?%qoML?<{2crJ1u4` zNb}b46ozUUjZ)x!+B3?3hwewhtCBhg!?l zVZ^IRPg>;4<5}L^6H>d;t>BZ#nNV9<8@0d$vOc-H{>3kfUjGp!5E4c8bXUBSwXt}d zIMJpBfq3p-u)unDb~ZeWfd8L?Lw|-{p38Vrm=;r<5m|+E2R$Z@JpLSea5C@clNEYc zoEM?^!{iZL!9n5YHkK}M;N;{~W07nrDCZ*5R9-T(lHqf+usslq&*{YJ2l2eNtn*EA zDpw0GVPaBVyggcoEk5~Tb~_l0x^g$x6zuX^rpJ-9S(!0C>?^gS+Tsus_#q@mDf*Q(CIV$@y!iI9`9L{GJ?)!CAcixi95$ zjj&>v4#z@W{ojUnXB&Qg57%c?%kU6*b93|ccDf`lFK@ra zD|350g6H+6=XYqz102}tB| zJG*^YYgt)z9ewqAjD`|1E#A(5Z~~7t8?dxTG#FGmZ8mD8UPq?vDqi?p4=#TxPL^9}NvnSy>qY0fCInT)BKhz1ZYdm#$s0yR2pstcLR% zl3e@saxBX%uR@p2`T&>t9q$b`p4!2w09?0EkdjkUX7KQ@hlf}&b>?Qi)WCreZt1@c zv%@0@Spn;Rp;m*#*7Si?UEq&0Lv%eRN8cdKNDYc3Vi%i-8hifUa4XKBSQ#s@Z1y&A7C&qA+Hm(d?2xi~rVbcEtk zm$}W3M{){411a2P3aZYL3}pOmCuTyQp`@6cv$MBaYLyYHOp;i{PbaBOSGoTbbz<&n z$q1#QJgH@Wb+_@-?#1=KevDbjZ9TR6_Oy`9M_!1Qb@#v*I}~Q_Fnj2v+u%O0k+fL~ zN+Czk$CTT=M-?*C(p!0!8#y^1aB8R+x_}}>Gm>=RhJ8%vcb5VQ#Yxu(W)7|%xn4E9 z84h^h+Qqzkvf9GuO2|92HRbg9U)Saz>b!~Uc`>0D>l=H;0z)>>3FU&y$) zTn{I)Kl{EOR>gurtHjvphp5lbr*6Yq?p?vT z1u$EO*-jp^sj7G<>@g3Sdni>)Q<9C3YKx=_*BOyCerU^PI*bLLj1cs^jx*Q_?&b{g zT77)?!dJv@I{ZEIsRF37& z+A#%uytI*m-IrT#MgOVli=-MOUTSi&f(K+*`%_(0L)b6n4;FB=ohnd#z1xZe76PAl zM^cOg{?;!2!CR3>^?OOW9y|agBO6db+E&d|$O!9WYP9BGm|!AIVnapK7!nAnA+>6Z zm791BRc$4Y?N|S`Q3?7H;NCNN5uGCk%*}1fADsrL>FlhissB4lxKBQSSqs#E+#W9x zsk42cGE`Mnoq?--|Bwwf9tCd$lh04fd>9o-wz#QcRe zzt=dtu}%M+%3My3S@5rsLqsi7cU-x6&u@>k#ZGWM{JNiCJoNbL5vhu(AA5ZtlhAeq zSyE^!I=I%dS}xENaO;$)kAzx`TRlqnXf&7D^{;I*fR7fxlM$}S&0j7D!IM9hL<;AG zw__jE&Q6q~FPUVh72vs^IbARL(85LN7gxRFC@jgp2)JI}+p{W4`vojx+QR^T=aI@k zZLFDldv$R=c^fTM-s&Ek1@2l&C$bmkS4jOz%5h^-&a$;nxi2ZkGZ6|s;Ns9OkZ ziQJjnd-z`zAclL*@AY(d{``2W&TeM0?E9Qea`49P&L@lY>)i`0%&uNY9hJc=o3Pg6 zo8p<9&D4oT7XvcUy0(orvMKRl+x!7ZrP8fCht6qJklrU$g=fQ^NpxMISzpaX2~(&y z07McJ;b}Eyg&nVJQG5Z*S4jJ*qLS;ZK7vyqFm`16t)#hmS;RSqcAPDh{?FlQFK2)I zFGN&q@~`e^>w|+bGpa?`QAITAEy$7v$qjX^l`i1Au{g^IYK#g-c*2I|ya@=$9SHf6`UobwpVbX})ayI)tV9W<_ehr~8sk`s0MJs%}MndATh-ze2B8 zn#gH23#J&0q_`;w6A+xZ1jpT!ToBXO>ATflJKp2`1`i{!uii%F5VK*mHDjq{s01`b;C(Gcm6$K=MW^`myx*+w1Q&qWlad_TcZ}5`fm~r?1w9TFv*i_!z1*#DIOAR( ziuB|;&l@7M76}2Mp;y zv3u3l+|HydcUY%dXyq)^sI7Kj)Rn1l_DW8iaj{K7jIB1o>|Ej2kCo&vOzH2r9;>rJ zw_0@=?UCP-j{ABg(C#9?SXl*o_(|e1*ge7YL&p~mi90Ldg~=FJ}Em(TS@;@dc32aL(7t)@EnBh$usDf|n+t8km>l~F z0QK>@lDeIH7uDRFIkO1ui>uuOwc`G@rpSy zjjoz%%S7mZPZIoe$N(15WCB|sE2RG6V3+%J2szNqZSqplCWllH{?~EJm@`VP<~e}2 z^7|Vtd?(2}w8<537Sp5d*3>RR-$&<^II$+5Y^~qyV^2pygi$*G%l4}`(NCC+3{~~{ z{5=x=m&4Z#?zw~7wcK+h1;Ov}ef-MorU9<|WV>2K!?a8PD8v))oql+)tY|?a!o~h| zESPF|ujF}{`tN;fb?G?juVSu~^xxx@=VN+bnVi z{CmF($%iI-A{^%B4hbNv4A-_Ma=yS0tFTC5_m;5m`c31cPNTc~UB*!I+ee;>Mx_DT z7Mb0;=JAV!{!xd^q`hy-j11Y5w=dI_m*bR9>KsTwSOc2lxxMRZ#BfD)yttz{^)@5D z>!_N+n;?d!X-Y4*30$9*HF=fT&Kw@sRc!DFs8l4QB|ovk#{)+t$!~vyjAFwcYN9R^ zq``0Fe_z_r4r<8UQ2*C#R&bN(x{BwsA65OBl07S#yMLPh1>ND5%#G!cpFjMG^NHt1 z%y`FDsxj)4a0xU6#J+dV8N}xK_<%4?xw6f8P+I7$Jcw5(_QuV$zbe%9D zV`WkNIO$?{?9jHGJ$|8vMwFePXWrk_m2+d3f1|N}9Q~7O1Ja;qC2B=q z=DBJB=lYDvJ0y|gD)rsJdo{+z&=uvBmA0QhKpsOqDq1*S__A@6QR*b&pUDlc68;lI ze`oMNf$;pGGpnlOc7Rfi_Ww&uT7*>5_Bt~oL>Y1@@8JZ$tsO2q=ia}D*OV8xMl}E1 zN8|td+uWZa6wFzU$e}H=o0&MA(y)igcYObrBLvEFjMS9;nmY+0+0Li41~R?NU5776 z4H^%83yBH|zX_+OzqkQ zAx)8hd>Hw;=q}v;Rny)h%V~X9oZFq;1-xs-{27jskFAfH90&NhSf+gs4G1BZqEY(V zO^8bH{lt1Hz)@ia^aVYdX2k@8HQIq3D=I^6_c|hw1%oO}(FI{zSb2RnJvjX~Q_!@? zjEcikS$-q?CHTa064~&nUwel`7Fl`izp}+oBZ}KV2OL*Te;-IoUtOe^Rn$n$OrweU zUu%*d{|z9&%Zt+|P4T;30i5`)m-9H46X=uj*3IssJA?BaTMFffRD#?e|8lpwKApF; zx)T2UFl^Q)9MH@^pMWyObR63l-@of&yS^Z^wmG@0uaDVqd;;xU6S`X$P=7l53E$F1 z_YqNFQgGD-WZeIBZ>!>hj-xRR4n+xdh*Vmw>57(?s6Umm%XTn~%Oa;u?dlz~pL{>j z$RxX9f`x9z=FJmwl_r1=b2h9=E;I`-E(y}3F&s(%d}(_WyEoT5dxAH^Z3c}VncCCM zKH6&C=(CwP@e03#$EV6t=pK(Pw}p1)FFkc_ji;0VKkxN)dS6#Y@HjPonr-e%I{vkJ zXmFr(TWIZXCoovb`SJH0nJQ8!Cc*VW7M@uPkZ(G0{;;Wtx+)pGrx+r>=?Yc~X{`T7 zed{@jB29P6gtY`-shbZ@$Z}c++fbUc&ja0*tr{#Qif)Lj>^mBa-JW-CuVL5fdVRl2 zd>xKY`EqajoXV?^0aC_K-rN?)4mFwW&)JAz$!}q{dQq#GRCaG$eH#XhY10&zNs>!* zwfnh-C3t--fl907Bdyk#8cV#9!8%_QX8(lC+W$JNXgn$RI&FPPJ`6MlZHMdJTv}1J zyrvKN`j*+q%3Eq)y0OOvHW+ouAB7xcB$X?~DoT!e_>*j7CETx-h+%SeGdFu5L!53QNy}{%f_^6&Y4z8+DYwy!9WiP{Gx5gy3AHY5#6jebQvuv-T|kAQ!U*Qex%5gbA8% z2h!!f1%cx5$nVEj`n{ZV1*6KQ(NM*Dl6fU*|2BQsIR?||d_KWXt5uZVZ#7hOPD+~R z1O<%?G}iiM5BH^Seh*S++|gxdv9)Aa;GeN1H-VkORLY`j?c~P7MbVfVjFWMx&D7E4 z|Fb|8MWb%d{jTV$*-R8n99(vxPI!I#yUpve=hF}VY+K_luvKKDi|NK&k@8Ei3dO7L zpCW|$52>L=eH34-U}|^-dgfgb>%qq&`8AcLGE%Y!2LX%HMw?PwnHv&gZ7nxP74pp< z8&>rUf(SM)^G}qE2j&@4aC9n_=ZfO=6gYjcyH(OFBIjNPU-iS*N_cLfs^?Fo-7x+* zpeitYuBV;5&+;w)H2YsQi|Uq~+)568XgQH$F_X^I4P^28R|1!X!%!_rtSAVm&#?XC ziD{!>blSO9qJQj^2R&w#SK;{wneW3Us|}g`3l!;p%|_C3=on$j&2i*I{H8ew3Dm=E9qq=t`nw=RCN=05m|2>E-}zARG>~ zNE^Q~TTTvd1hTUwBmf8oEjHh}>Ms6*&w6FybzWI_Yig4Ce*hm7rR}zah=w$NcI*oH zHU28fbo#_6iaHFX#?UkfFB-}H@jwS9djH=7M8#hGv}8t{ild?g1_gu>R#g^|J>a5Q zoaOU<97n^<{BOD-IqV_IH6Ya5db+}-{@pa#LH67xGqc$~q`?l*7zcRz0ERM>~qrm|_1B~B3>w!HukGw(kFd;a#S#)mC%2KIWj;k> zx*VLE`?-zyu;H33a*T$N{*l1SG^7u7qKWYGJPPT@pCZ1-xA4-zrXkRJztQwYYg0O8 zN&G$YM;om?x9m#-qm_5Cw|Ep8Qi#hOH^Y)#4$z{8IY+0qdsbiNB)N*t1|Gq`GV^mk zo0dFwb%+MsZEX{K>o%sP{%P9U-4?%H%aWzIzd4&$I&0gDxK=HIo&)hzk`OSnT_VQDf~a? zzB3-quIm?(NF+)kh~A<{@6n>S=mZfYLgfS!$M2{Z5_ZFQQLzHOIyD+2IVMZT} zaxS^==e+MZzxRAUAFyYxviDwl)&E|5@w`dHC?=gT#fyt;YvJDPg(2$rXH-D(M#cT& z&I0tS-N!}c+P{m|^WpS^d0_3_5*Xe`ZBX|UYyZg=nd;vvMA5ft?xpGE&1}oc-5XSE zL1L@o4!IksKsFYvi6;Z#b@Z{$o`{=-1@u1z&H_P9Yq z>h*V@rPqv$ zUlIB@FJ~i@U6z#xeV!+urT5QWB8Z54^F&OYpcbX!;IGSqox;BO66P2T)gJigL8P$4 zH?-;~HMM=HWqH9Lws1l6<22&Fir&s`gyj=4+w8dN$%C1MQow3a4h*w_72kI*-2) zGsQXt*()pFf8>M>37_RvP(GFZ%jEE~=0r2OjPO`cSZN94hUTP_SL1?JX2I4OU{v2y1{%PHKiL9>#>Yc>ny z&2U@p6o`YHW|-VmoKNulW~RjrcZ^eKaazEQhVbDOPix0FFIL=>DC|yp1cPdD`ifrH zyjNImNH1`MoPPsz?di||tJC`~D!Sc;$gpiHM*fmy@ z)+J=UG3Q8bJQij;I2-;%tq|drDf@A5R$|}0pk;VF&1l(xc5T%Dm5DCM*QU!wAK{uE zDQE9cM4FejmRfDiwMIE<#>D?x%cC0gm;zGVweBeEO^ka}L-aWDS$_-WxFX|1v);qN zehN-4aqLtY7_Bs>e#xyrHQ6BKLy;DfE+{Sfn_hO?-FqpT|M}K#V|U8$PwHFkX-@Yo zg2mHE8ba604wBPnUA$j_Cz(H*TrT$b!}rn-9v3N7Jr(oynMLvp?|aiau0ip0?>?5W z54Q|1z?p^LM$sQj*>k;3lt4H0JYM7DeNS?oA^`EKX;IEK`1|&<9ro)$Eq9C38_>!mm+bIM5WU$-U!N;p{e6a1eJZ#L0Un)pDjs>5kWHwtOFc>mL-d*7S3n z9uj-)sTndgTM-#Y%{rm$hwWibMMmgJAw6yiWhRA<@==?Zese$Y#;-Jge(+M_^%=Oq znhFpbEN!&~HtvJmd1|htY?$cWg45D$@c^|^5KZ#ew+BP%ZhC~c%{4-d@%~S%nM)7s zD=EPHr5!oaebf8YuR>= zA;H^YFKO#+{DBrWkDpC+-7$pUmfjP;B_qtnjynLgB1j#a8sFZ%4TffsG0dnsL6rz1 zetztB2qkni4Y3@hC?Ycp@l-m0PIa3#Zz#z=H^Ct{Q<=_D8e<<=!}{rs1$S)cd4ywV zF6`q<*D?2aglKq1p>GkNodSrGWG*3E_>S^>YsxFzNX#BavXt4->!a`JOSuwN{j-kqhZugMc0@??}8SOW(7M z@2?EZDma}M4emGWA`VjRAIOJ+5JX_N|HHh6OAn@Up&^>rWRn}##TZ>c?26ebh8U4N zIU%PTi=8$%yIyO#kpGLV>rZ>{yiCa9pyR@O|`*v{HgP78e zjGeb!mp^^#&{cPGI@f#si6P%;T;yQ2iP3x~2(ytN{VF-Ew+vk@`O(JdWtyB5nA#uo zYtA;?d$ly2A}6xIdca+68s$EP(waL@&TNV|qD55`m*oh!EWz$07#+^!GXI+;^I4t! z1=p>)6HK+bTt2F>cv6_FFv%7blDZKp!y8s&;{#FX5PQDx1s0VCRflqMZ!f`yk6khK zGZ9Sn!OBf|_1rY__VwRlOc0YkZr47(?g^aK_sCgGg7KmuOyLlOg~a#bl{6;qyyvnv zi30BHG=P^meBmjzI^Kmm*PVP5)!tb9Vt+*+UgWMt#v)E(e*QMhf|+59ox9F-)v?@e zx`1SSwbXV)SRD2!x%-V=YpR!9-vT1@1L0FeT{H*!{6#VGU#rE5$ZNp6hv-6F5J71mD`6#BbGw$dzdHy_Z2dJTSQXFxeu`|BD*5qETzJ8J=uiQO37AFb!Krd zm~?ZuFjRiCxCSM`P;iES#qWqEMORF<BLxlN^h$E})b+@R^YQgakV2?dcI@_IZ)WjnbU}Gr@V# zkmcovMb21YP`5`%w~rdIjfFOd!`GEvzu*`kDup+5O5h20(V<*jF*u{yXQ5!-?3B(| zhzD3Ci%3zB0|wbU@p}A`NmA9_} z%Y8^@Uz*grMw^;WiA6#{n;g3hE%|n5a#OLe56uAC!EHw7Sj$9!qB$HB&hB>|1UV_qBz+hKyvEm3I{;`Obaq|pb%e3r zESR;JC>OZ6LVwWOfc3r!Pd5OjD(sgXQ0>^KjFY}+wgUn?&4Po;Ta@{m_$4B5|AG%L zt{2Q0qL9F=8Gq&h%MnJ${>JG{8K>OIW6M$LW)m<{zzK(xabi{g-Z}$Y04#`jPI#hQ z23thJp0b$RM4u5R40_Ju2uj@`KY*p_e$5ug$bgkYo5pvy5Y1YId|S_7jyxy@G~-DR zpkZ=9t-vOaowD=ujm#J2xVu#_e_&uYU=^1ML%~+x)191wcIRNN*5mq{}k=R~VfNBt$Q1Dy?{s=c3 zLWP@Zo`^M^1z&lmTn`c3jjot03z)sOakU~>9_!iv(0T_*-{0H5ompJ}_defsr`Aq* zLBuy=a$wwgWgOj2Nt^#HE9Kv1eW@U+mIdN!c+mw{3*B{(>4fXDoj;lw>AUuOZS0u) zS7nr=12C}n&?^O@Y*hVseYqOK73bitm{`&}`Y+=8k3OZ6t{Q}bqwfEG$iAZz-W@^G(|Q<_bKW# z!AnTHO0H^a-$d6~1Im^yq^FhRM)_(I7+}flm$LI{&0O7(a(C)gw^c!qD<+NTbrCYt z-46=r;JO!=r4Qtb);mf1zHtpa*n5C&u0T1F0kpbLdLP?tu3VpKz_uj)_BCTT205zD z)-FmNZ;sdoM89aokhJIk!8EbW_uKYpmi~$!quu^;OGs(y4ts$vHn$uY9Z$`o94WwK|{+yFfOxz{!a(ZRQ^VnTI^Z#c_OwVxhngTr@Kl zk+Hi7CbOG>zImyu^Pffb_%F%-PpfXoK;D*U=P}JynJebKOjzAK+egETg97<)+rSq$ zS?i&6Z!e8A;RKS)v(^6I{k2-%zJG0k65>4)H?uhMEYo#}ywVxN^e!bq;qH}Qaq^gS zYO!|-Z1%q9zY)mrWZ0s<88TX7#kUO3v7q)*&N`^FwhmW8>NBDvH>HLrA4edwVCCpy z_$#?HWF?XPTB^uC*e*lx_~U$C1Q~40r_ga7!N*dtG84d~`{7!}8L!hUzV>W>B9{%o z3I`=A&Z#N>vuuXF>F!PD64UNd-`p~E()+)AAJGGcf3vbIo6iw1m(o-$ugyQX)s9bc zNSit5h1iqE_=bh6lUFV;*aC_C(>C=p9_x`yj2Y`D5_8HV$}yo%nlvB7nD;fR*Zi1Q zgwteFg!Z@C#lpfrDoe~kVg9%mIUQu*ITAfBfSP=evYJl#XKjOA!Hm+XFnp?M(ZRACepkYx80pxg*$tyHQ3mA#+&j^AK zt5zqc5G>@|(fnN@e4*?c&-lBnD{blkiR7IvXX?vI&ZFI>BpV`qS zg`4X$RBa*$yEWz0MZZ6N=2fE07H(RMu%!Zxn$??%V=joq?~UdAau$1#qHE%1sDjU8Ri;EtGKp}4*ZOy7E|VZ~kAKCO?H zzuIpJYb3SubGlW*5-x>{5yFL4be|1jO)(bxZXfSweb)FPR20V-%}1whOkBuEZC%0@ z7r`CWU>$@AEvsx-V%DO4^pnkAwGWR9`}U0!_QDkncSn04Y`8mRbjf0I#iEa~NI3+= z53z; z1!XoRY1zeDqs1DY6VO*-rnkmZji>hoSP>Mx=@j(>6Ww3ZK49UKm#@b+WA)`fd1nS$ zNvsYYAH$Bx$$t(7>lM6!+M+Z3k6l8eKa8MlB{U1~RPJW`loYSV%1SjX73N8_rj(P9 z^tWj}geDBp!1lfi*&oIn5kH=>{s4OAvo`FE7EstDF{c?j8Ow#u# z&?1I^BVoN>3MfL^4P$B8O^|N_esc4!G;KC`>@C4x^G%IGPWo*5SWVH^;Tk4VuN3pU z-SR{ajB#&QRhHG&CK_RM3<$GQOmTI8cLeBGHdma&p&?s9Z(2L9fNA9B7nM72CbfY| zAous`Zh(q=TPe)qU?C2$wwd9wCtk*yY34iepmVJq4S%sd`Ax&tmJqg^?cwXj^c^>&~GDByn1#Io_+{WkGu=_}!GBwq@X`x9^wd z^DEwM__EID((awwFQdhlVR02?PUK8tgQUP4iF!xoW`8_cuB<>3D zv~wI+ckkK0m1O%|zJfA*VKaef00tyBOO?8C(=RqM<$a}d1)aR+qTF}6P*TWB@&~+Z zUZhxtUF0_VDuF}%ZV`^X10?NhJ{s*#rmZ@U_Crdwp;OZ zz)`&2*5InV6${u>M=pd55fX1#OWe_qs9042=}taM*3XDX9BoP&d!foRjdIQ1mQW>$ zHI?hZu-2F9f%dBsxHOAlbW*5^`tfUuV9`QEOC(2Q_8gy@N|x2uW^EJhd59$#Xg%tA83gYfVH^ zCoEcT>I72$74D36dv_9B?6cR=M0ct)3_n5|V2G+70=#@m6_8h~o#>%e_oiEioDibe z(|Vrt*9(2Ri!QhGXt6xE{c{zPFmLUaN4;RM+jzO9vgH#r_7^tI|C(XvL{S#yfoL)D zr_q&D5&65RocEy~jrX%7zyD*k{o>)S_F8+9G^r|QL1%i`)IOfzkxcXDg9wc)l*eMf zoNm%7d1{IAUApAWpZN4dSox2S@rbaq#-U*ga(3s_gso|F!;N7C;Oh!qiUHVrn8*De zuxHR~M4nx)v(9x-2jnDJ>0hF9306NEXGKOeR}@PGVQnP9vVY(vT3p&0x=Kb$Sh@f~w+qz*addsO%l4I$n*)MLLB zwv-Dz5L`)aIH82}Tee7a?2?F-j9hx@^gGwbM;UMGaZxJO++!Wtniii+Rg$765~|u6 zp1wLiv6GN)JBM!HNAITC`yftZGVa-*6=8bQZ=8ILu$D>*8d`nNzYMH(2>)Tf8@P!q z5NZDP8>6J_M2m4kO0W2pN~1g6M37|yfz8~U?-hxhT7}-cy}WrYW`qvtZezDcQ}vrl z*4@p4Dv!O$d!zVtPU+w}JMBfH%TR2=0Td~6Nn7X4=s(YlI_yNXs0?I^nYz4V;6ccF;8iAL|F2BqznU_!-;tk zJRtaRxrv&#=t{%ZRVcQy)s-bDBNvLb6>qNa2^wM6->~WGQr1LzR@!Pd3f#AlE&3Dn zp&^0HoTGsdf%l$IjO!wy!0Hjljtg z47>^W%h0lU8(|LT=@W3>=Py2Ou8TJRlDLKIkEQzs%gRM**@DidR{Gl~>jClcVK6>i z-ffaTnUHX577`y1J{ho+`19%<;* zPTiN{t;&tEEws6}2nU~#XL=B#K^N^a>b+WoGBW)>)A?d#wI&;^8=bxP;c_Y{EIvAF zgxD6Be7x%`x~7%an{GF^&L`6L1pP;5aq!ditHtUU0dx^#R5%DLLtcLEdjMJ%;!39S zQ^j_~WGm%Q3pSMp{FanP>PxzaO`O^1s6r*)QjLsZ(}I6R2!DRwlX!UZ<`|r_RN{qT zIEOGvv5!tXJT=;B;Z2SCtLz6zPfyHXi`JuG4Tq5*Kxf>PVuMc+xGJgZ6Wy-^qr|9XlzWrtt^?~I%4T$<~-XP>)bE92|O@-#r#-)&1`VS z`eDG!+Z@}B%FsxCcH^Td`aWJmc9G{oVV)vh8&6N8K_;c&-BXPj!s+hK4VV>?*Z{>G zZf4JUgBIyA}Bfb)%q>|dOBY~=Z{eHB@!|Jr0$U1 zLm~YSRW-M-On~y6CKTH|2HkPwSR|+1p>%V2<#t0Ia*l5w{L@!0iTRX76^dQ=eGlpy zpq!~l126U%!xzu@$0pX9bRrO@(sstz&iRQeDQ_De?%G=FXxJZFX8#$;eV2BYYp7E) z9#jPsA0rx~+aowWYA>m?0w0HPO1za}_QZswFQp?l^JD?H#t3?l1@i(4?C6lM7LEty zzoAo`>pBbRJZpLphd1=?n-PKwA*^yv+$WYNSCOWsq8=*m)IG>h}#toJ2JGU)AafViBk7q?5#-ck$Vf^*$Y3@UCi37|-3to`U z#M2@WtXWSuCwX0>;}f|?Au^FvuwltS=}@VL0}#4`2GPiym& zfioO}7K2+gH$QX@{I0h+cazZRt?v_?(6CSVmG2brvaX2^*5dw$tB#bt#RU~qRS2%I z`kb!w1EKevr-q=pi)4GDLEw`4mrq3BOp{vIuC3Q_z_kbTPs*Mtktp8E`Vyz8k(aA@ zE#O`Nxsq6PItazoX0Ne5@d+9b%-HNUGf~OtX|Pi`dD3>hd079?PYKDOeW^LFh~25# z7&*)F*i=fT6JKqK6V7q@$=SD3A7r(!H_3a7{NdO*3MJ!i411=@UG#931snCBT!4oU znep()n3)L)3FGu4p3$eqfM)jlJnii5$Ir=}PevvXfs)+q6oxf=0tU{XD33_h;jNl+ z9~=r*oyWL0{^-by#UMU1AGN{p%>*G-o+4Ii`BKB+(UnfqEK0$x6Iua7ik2F@&!jsn?BMK8(PkY{uh5mTT zo<}jxhxlGv^Lbk#L0eSFY4NF|St|B})KYM|`!IEy$dE$GPhHaPsp{|v<8kS^Irz3? zlw3XT)I&!~0s(~QqlgdnRl7|3Z-Ncpb#X<#1aFS^vrpsnwBf=5$9u5#BWN)sm{uM+ zxpRIR;!bpkD!x~0=S2qWI(OZ+kudJlxO*y~$-dI99asNzL$&|aCd|6x>uT(h7TZ;r&3`p96zXOAx~f&`O?g9PO4GP4B9;pM%` z*o$Y+ldjxI--h*6eE%l!6Mk`Pg6=pd_PyTMtJKDI-q#ntlWOJ2F1U?=^`uDdRqA4P z)VGs;i#fSy(#@_NuJlCi<{aarYy>|iG{&hkT~dAC`u78#sQkS37mKYeJysUSSpK`H z`@RLr40KfY|3vqSyW7-rc!$n#9uDho9Hu~L(v)|{MTYagpU} zF8G7PnD#ez;x#P-QIv&U?M%6C4w_LC1zhC2@(wn(Faus4GlvyCU|M9vQbDojG z`^O;ipELzz-rFl2665%@!g;gQq2=jD+iFcS9M3;Fzf7N=@X#zxzeWB2kdRkR>{;nl z@vnr4_?S}hjT;D2qN;ImzkJ?-Qd}tG-tycGWIn3i(q+Nyw~gV&ycO~suBD?zfq_2$ z2ooo+;YhIf1NWg_3UAUfJgZb-=%6cPbO1nv&ha9Yy}fKH z{VHu83EYjnATBTdK6GHCV9u7?8#dFGKS|EV`P?Aq26LTOoxNC`6((ZJ@6j0BSE?qy zwUmb2IxF_6D!9p^TN>vZUk-0dPJKRAoz!Iu7I%7EttwXY%6}A8HqWi!6?EOcG%k`- z5i4F#Y0O4#?Dc({)KRe}DYD+jXjV=?{;B9%*&y~Ho>Lddr#(nxZ9nYW{@IP<@U?mD zynH`dPE=xl@g}NX(*-;}Uyjy~U_=#U-#2Qaaq#*4%K!ErR8DEG(z|P7>fx_c1y*A( z-bmrV@b5?q2jM&07D37KW(P+v&%PBjKnz426qgI{I_SqfhOGC*?mDeYtLW#_<$*Dd zho&bUkS47QUYD5B9i1Uj=$m{|{U8nz)+`F!x*NldlyO|4#I|92?u{hT$!w#Z_u!e3 z9c68w{yZ~I#1J&TD|{$)CiqRB^ViYwyWnS8MWg5K0&)P?4W}YWS-aU>A>+;G81RR7 zo-m_^hP0n&(1G%6is9VJDg|d_l75D<)3zF=b>X;ak(4SJ5m6xDfX{u4LH`eA2b2cFrov{ z9FmPXvQ|~jo7ojV|Nnq;RJ86rQ2-BI2eGKGF%pbh3R@h@`4cLbu38k(VA8EX^ORMlm64@)K*8I7 z)r%g~mYFoLNx1G9`FgYkRqtlc^*GI+uoMnbA9?X8^G^cvMgcnN(4zM$_NR*cjcT5l zECiwC_xO-mpY_%D2{m!bQMm3O@@b$ZS1;Z70g)(YdRO|c*4YG&!-KDQKRgYj_?kUa zeG1ifE+S|)--Z8zGpnpzoCZMK7HjDS0HGgQ^=bABC1oZiz@dd|4YE> z$R=`)-2b%@{GD)VpCK0cBi<%VeUeowxGo;Md;^sv|7GdrJLR!Ye6bFbstayg<6vWm zeY!Wl!vo5aY|0XF1yepdq^jFRJR^x-=~v|xe{_+emFo5Q0+wtJ7RB@DrPoJp)um*l zc)ToY5e?e}>x=5$6X6(v>)urb8@^Gn2l!AMYlr+FOl3l)dh9rJK;cQolv)&(^pjG{ zSBD%At(7jh)+|4CjI#5Y`QAuU#LDT4ykS70lyo0MOF#U-p`etgj{X#R$>U8sC;rQo z8QMqYO$Lx>UX8}Md`x_#{tX1!Ba6|wgrKP3lpO))r5woadN%W4sL)%p zuMCa$H-MnHBIhh!CLP2%clwV-({EdkaBKkVk`Kf9J^&Zt+NKciJ^*I#b9V>`beV&m zEVIh}n>^RXh=H=gkWpo9TlxRw{5(|fL4ZN-tHZpz%Oav|SBB9v6l78A>&uQ;&|lAF zeMBmD^r#c4d{}8$1l9#ElRv)+V2aW%^nI2~JhK9Dq2)~^>{cOIS5(?Kf%o_%n_3@k zsV#^k`6ON6wC6e;>0u6qX_LwwKS2WS!WM4;ryE(Rdeu;c+3P@qqAK$u%TE9};{&yr z5I0=n6w{g52q6SesUzBzyjK!^hrUZgagggUT+tr?wjbW>Zi-)_GX;f~mBm}zvNx*> z-{*JgI;574QiLp7bhU1(5#}QXFFs%ogN@UnSpCzm5aC-4RqTH@;)WVb9>!h4LIt}v zAz6jPx(3>w+NAohdk)>wDE!pHkYB`%1x}=>PKjAX;aa%}1fLYHpDblSMAxFAt!-9( zHRk9Z42lg(>NskAdi@vAQz!=sH7}d<2)*(EN%ENeAKLbnM@T!x;1jNWQwhIynHCj$ zfmk}J4R#YG+5e3e0X}W^)Ad^59|eW=eo?1}p^l5jrrEmw z(#sJ260&lex_;7#xrhhG0g=PL8zW|h2l)}vAIuQvZl zjY|5E2>mDZjR|9bO}}#Fpn-37z8n72?!AwJX8t1-%dIfkTrdXmN+K+RrIAIek|X;( zWb@GBa}(WXgAJrwPmlc=6G^?E(3rGh>dx!S580-%$vELtv9Qu1fJa&_1`TrSXL3%} zuyRGaV%xvL(*zhOR}>mjnwr|fU36P}*O6TT!172w-to@vgJOqxdXsX=_-b%|k#a+D z-B)KrM=N~xd`P}{AojT{_}y+oy)-zT^qO(i5R6~*xuk=m+nhF|!zbZ=3QtTJ1D@Fi zOCSnq&ON;5QrZCwuU2 z--e;`wRvDB`d^zwE?GIqN6T_0z+zI?5=9g_mxez@aIOm>aN(*|mH00fYPa<#oh8CK z9@S~Fdt%%pLw$6xNb5i;>Ucg(f;P4}#mPbCgyu#`Xwx-SOnB1afF=UWszO!~goadF zlvqQtr@vfZPtST&KS}by7|J{)PS3vUty9+E#Cqi9_DuJ!oFTUP3(2S64P?PLOCUUJ zO{q@>D9W!lA~}Ph4$N(sIm;|8f zJ!sjUdW8~fur5T{VuW~RTYn6$yD8-@FtcDm4K&aH!!e?B-+=%gip}~`tdUXER!OBk zISBLv*zPN?mIH8`O>ckTlOW!Rf9%FOXBrw3r;D+C6b0;51SgGs5Ar~suV81=bP%}D zo|s`==<_jnh2nKAuYbEH*Em`PcCLQ0iJW;asbg--KySWVppllZ zG5=OlZsLIE@6h4DfoTgUy$28fGAGNq1^c8zx@-N(MD1!kSV3SsNWnO=RSg6fnXvNi zGZ4qYTB5Z^asXrTx(9|=2%b9}Hy(@!Xu$6Hwb1$V#%*Ax9#X(Q0P?tXGcaF351S4^ zi%ny2HE{r1ELH{98kj6D8-05dX}y&@&o!PAScO^)zQlpLg4YH~&v8~Q9$soLP5Z?H=jZuz7b_;m z^|bzEmna)ig3CRDORp2GKiUsQOTA}RS4vw*B0d=V=L+>JqO>`spAA zk>A0ond$LO_uwBp(LcL8LPt@YKEPV8A(hDR6LF{V5bII+0w zRY&sotuHSB)R!((48q9HKll#LMLJ!K?qV+2PlwIBm`)3}b3l=Emj`ux*huH{D5vJ4 zlS!xAE56Qtx9gC9)9L7tAu-^Jr#VmCN_run+=?0HLb&GkXV zX-8t+Vq?k$y7>Kvjg3no=(cm`r(v(!7ivSKpCL@|8z0DN@kdoS%U=l8X*N4dl^HBh z7giYj@Yxn8_G9v4(cj1c_Dxm&aX5#V8Ul{yJPYL?T^!q+&2Bkv-P7Sg1!{=8O3Fxw zq6?3fC`&i#odB5+AY5P$Fz+acjmPcu2QX*g_sqFnj(Li|71V3ZcxGoLe|mpryw|5# zimgI3*Xe7_oq*FHA`MI7Tq7iK!|cyXro`BDhrI|E`Mi>kAw=r^wUsORjJKx6auzmd z*}jJx2Jnp!?xJs>bij1Cn3!;#>j|(fjNhV`_Q-k3F6t7^ljxDrw42B2^Z;?uE%~FB zE(rHb0laqZtHkGQbt|Ykxzcn!B;*DJ8G2powK_su@-31z$b!{t2QAIMIrSrR$myl) zYNyXvOm$1AcEL`{2EW;0SQb!}kTgp^aPQk;>x<2IWhp`l&qf2ed_=sQjn74&BthK# zcF}btIp%1_x%0KM2iS_vjAlrU6g)h!4&CG+ZTUwM{^ucboNVQDj$6Bw(s`yp-R&D; zFV)l5p9#?@ryNI4@!u62&Aa88Z7mo3S#&PWrI)3y-F%~uTjm2RDCzC%9H!W$r#){# z3sNciOy&jRigKhsf_<;L9S!aRU7oB@w9vN{Q7$>PYnfo0df5>OiROcKrYOrx__xEp zETp)ko~Edwa@^=fifHP>BdRt=M>8g_*U$C5X;~fav5t-Ydd?j9TWgaaqC|MkeflXH zV-53`u}^O%7wL>~!b!gUGDJ*wlq9DN^f)o9R)4Y5fD@gJaLs72^^msoSqvK9ej9`C zo{7|GO0mxENhrTTLud!FX@7=d_&F3}Vz0<5eh}q`Rtc1wn1SLPIQv=bM3U8@+&q0r zE#ZrZW9(P27Ws>V?Huz=zs1eLL1}c;vFH! zJ0R?^WO4feVP>WwJ}tuo#8H{6b1rV3Bxe#9&2RaqVZS(KXQX@C91T`J{V*wAaJN>6 zM;x+~@={n^p*7=PSr6+SwV_JYNC%I0(pV4IVDGt6nPC1IC=ZN{@qGNmO{8(-;Mrl> zg8H8)9NGyrAte0|YJ-}dhy)=WIgn&MCbu^Q*__cCVRH)+m9n1Rh@l$tF(IGKhMFL(OxMLCSSLD zoCs4!r+`)4?#A&NECrP_bMfXZgw7)uc1lgbv0HvJ6w`NAMmvu9q|6Rk?dE%kq^_6$ zJPx*Mx&WKPvA$4#MAdn#i!F( z@7f2#iE%6R@zmosG&NAgDbng{@AC5yvtPP*$XnU2$ZJF{AOBm_^x)NyAfmU+guvyG zFOKC6M$cx@ddm#&0hnseKfLoQN9Jp}cRl*2s~}jL;p6DpUt!IgnhF zTijP5Iq|*Pko`~-q!osq-RtdAksf)^D0vk-eZ0y`v6Lown=*o}{7vP+w6DW;^lYPw zvPpvOJQ)!*H0ydAbo;_#Py1a+Yg}^r66ygmqjcH1GEp^2(cRvgc5cTbqKG0-!v0ZP z9LS>2GN(y&E2uHuId#_Ish!1*hWaEvTr~q<)n_CIW!8Z$>5&L}Y9l!{a_lsxyRoM` zIY`n^Y22e2?)(9|D*iNCuCDUy>;G#DzSnhA->>mp!sF)(ioDh3naDh`tk7_GBpT^6 zMrpe|6cTzQDO=1iZJ^P`i}Iw2<|H)MluIWWR)de`|s!f-pJD zp)^2iA&ev~|J8Ni%x&2+lUB`ybb;p*$_C}sJ!oxsG?V5eI=ChIz*`2$+}Zy~oMuP5 z(lY;2&)Igs#E64{pC`7N)dGH7gr+;+#dlT5P@Y-K=hNxw@;-e>Q(SIV3*}N*OgU)v zXCg;UTk-)tE9a60zJ+t4|4lri3d5Vq(DVQw)lu$uZHy{dk^(a;rMQPv*}D`;T5}m? zbaOHz+9t19(;UAn$had~Pe37g59*P3F_H3l*{ez01Gb){!Nr?;z5W&+D}gi5GWuS7 z8+|f~Uhf>-zh^)vzwxK$sfNU%n@syo^4D;X%?D~cmmT~SEgAA~*@}OGMR7)C1F@vFi{ziMyO|j>pYp}{jcKD?4AdZChCAv9wHKSK6daaSsYW2B{PKl>xH9KnEXAbT7 z_W=)N7}F%ZTg@ObXS%x{apkN%bs6C<7F$kSfyV6RImF&u<9N9*gE+?Vc>8lu!|qEA~yXkBIvE?53WE1he~|)VLU3j zkDniq;~{aLY!9u)7ZCG8fAbc;%B>(&q*|DDMLVpO_(bCjG{we3uKU(7>pc1zbf3IX z0sq(&!lK=T0y6ghPT{4W{v&=x0ut`HI6UTgxjAD!0>!M=8?}cNJS3QBPq9ei20ks8 zgskaXNQ^Q~X0C(!lcJV06cMIzUk8uL_hD`fUNa8i3={%o*p3T}FlsW#2cjy%B;1Kp zE*g?V2lNB@xSp8m4n-wCahJ;gGJ=N7Rw8HIABNvSW4qU7_R^f|icEO$v1ZQ1NY7yu z6l>=3*)N}X6Pd_InuC@t1ZM~;oxfK{fFWIa1_%g_VeWWB0$=7}N8;)w{2K%f3klM+ z#Mi!V`JESn$;$4)^4Et_USt?=Ns10L7OzA>vpfHc!3RC=IM|W~0eH&_5P|5Q0(l_00@D~9S?vWDj(wPoJ5<0*xUu>JTW4N&iokCvDY^Gc*htkn2n`^ zM&3i_tT@GM8{YM_P%P!Xm_<=N9v;b#hO&ZDlO0yo9EPdj}0G9B@h%YO4s16S!oMkXMl(pGwV z`aat$3k{LzB=W?Jc1Fss-4kee`Sx-qGA4UC+xYsp-Zg?kg2tG(CaVX9R^Cs&6o3j`oG2c48#xLy7r}_&EFU~G}Us)LOJl4)+_$$tCR$;yGyEF3Fu3bn(>d!zUFs5cF^VEYv*Kk;?-K4T=5u7mJulPw48OHY?8jTeQ zzRT?V=9R0aJO*TFfu-e*2M-=sKgER34db*98iVR@lneddt9h&wWi9Jd!xAg^*g;xw z)WGp_U$n#&!>w%p%ofxJ1rI|wF`mI2hH7ulPk9_i#`rxgw2$-s5`Vnu51LObne;6^ zufKz(1V2z9ryV3exOZw5;vnd(fyzntFu$!`>vI@1gt40gCu(bwD<=uLFOwwdDFr+~ zuTW+;HHmMMTfiCj4=|GEA;%r%Rt+lX_Mlyk6X`1#r^reryoplTg2UZ1Pt?G5mv?VQ znO96aft4JkS9EI>=3)iADatpPUTL3;Moo=={cWD|U2 zpV<>I%^*b@H*+?Y-P()ns=J5x<_(gnP$Q%kHISU-Jp&w zj+w=;GCj2%G8oL)BRQ&%a!BKuW>2BypPxoO%KXmKP!gw1-V^&k?4aU zY)8p6`mnd#`L>-^1xvi>L#vW2r&t+YYLXYJPgV;AQl&M`oU}!KzOTuBSyhrJiY}=a z86}E`$=x2g>>V2Ungg$Us>1}K&}?x3?c{;FP;r-zyfO5`OxAtbbMOcIfie3=W3(lS zuYi)_RZbmcerqbkuk1XZKMv&H^=6C5X3=7<+$6&5YiYtr_r%=9qZ$K#vvPC))`RHt zek&Eb+&P*(E$*nNaM#XmPQ+|xGWhlT2aU(wV~%gNze?m1FvmUjU$s^9Kh#twk!70c z$_j~J2LB`+Zg~s4o_$&~^RVc%Z?l#cKc&`qx$Z-ZrWo0i%({#4ef&FQ8K8q5fn>8= z3vwOCZoA#l=j|v70!iUoO!rtbuuKj1kx$_)E3A0fiu$G?yBpwkb$7+%9ax11cL5So zE2|=Nh~`Ce8}t@|tfXv~V^*=4vnH06F==@#U_{%_f0*FFXz)cJE?InDcO1HPaEppA z>_oKwqf7kt*)#_Dpuw=IPcv$wV80_egpy9@@pkV5S-u^aj4uIRf>%upLza_Bq?1~E zYYB13B!ivL0VUy&8Wz=Hv?6ThnI@74pyn5Dz&`i?uK)!I`u8vV{x$C$+LJNq`gyRq zlxm42n?Jp|@4y#+{~Gbd4{&@Mzx*+d&veAQ3kwbar9}J8n!6&Z&88kDgP1z0hCw{; z-?6!qay#oz5ClOGaX9_d(*exS&u1U+%3!D|AeKHV)vk{hKHl|*!woGXdWzJutkUJ+ zvbd;)GP)x35(GgI#yIWtllSfYQTC)Of}|Tpee$%^R_=TKMc~unygN8Jgr;(W2%*d+ z>QpsNc_OL?B9zMYysoH=KoA5$^af-n-wBC^kjh779lZPU%i~VnSzK&VV?#F$6L2t=hfKoudHyDDaW zSV?a{?XC*brz8l1Ac)ey_vUTu5wAe4CYE@2aB%sG<&p93s?$$hIB7-mU0Og&xwP$+ za;dRdln9wF_DC-H8P}_eB$X01@4g;Q9l+4lRSdNWf*^=evaV91^SP=J!d>Akgb=OW zGzMy7a9|*kcUP=fxqSJGrI&o0ZzZ*QMXjH`6;y(0+>kaP)xu!{rx_h0du zt+O-xXbLuKH$_P0-7BMwhBu~dZoM4Pz33GfBbKX1lReU-&XQz0l5(H5d_w4tcw&*sLXrpK^m@GA~hjM&Wn*M3lvJ@e(cKxNtj=mbtyP;UU z=3`A(e(zo1H}4&L$30lH_MDFXvF_ZNnP0lcYu9Z&HZ#fFo*;+*D~dFOR~A)_xc z4&~JLPqD-qnk*Qk1`CQJa+9L_wpj});?q}LzV3`mg5P)Q0Jfgw%7(j;SprZErGT~T zK6Y$oiEd|R-WI4Gn|arLF1u#!S;wXitsOq+*z}<$%MPE@To$dCw(3wywbn4J!07xgR*IzJmbU&1ASE`*)dzVXYj71PcsnC`v zO${$Aw`sMVt(Rz1)XkT<_xtI?uXkU0!aNkNiROkAKmF;?0Qu=FHUs$SPk#=`&7b~F zE$_A{b7tmk0PEJB4b@PsH*VWA#?9f_x^s`sOu7;3y5aM~mUVT!U!**5_o}5GI6COo z-HyYvlsYU=f*^=4d}M@IkwJ$uefZTt0;x$KmYe_kcAmoHV_$UNo{<^C+U$ep9!#CDghzE}c32ihDe~;ZxIx|4kF`s-*)Vr>EaqJABT}^jod? zRk@Tnynf^K(Mfn@?SbYyNUB3>SSqEakL(*>|MBS~Z+c%wa!+(;o8A3B8qM0O&Y0ef z*BJ*B1YyZ}O6m1=;odLs<@z%(JNm0vLX)YmcUOWZh9=fjqkSAq z#*wLg!|N|tI=8WKWa^FKGcNRev-CD_LpGxNhd16;kvnn_1VLE9Vq+0N!xJHlob?+n zKTW;!^Qm`!zW&V10C_Q1m@0PhU1^v0d7IJ%u- z@Crj1^z3s!_4c8EYu8D69`CjS*$&->rR}tuDapG8L0H3^Z@&43-@oRaLwjfnHfuLU z2oDdw_Uapey!4Wb0lfO!8-Tpz(u)E4+N=8jdC4W81aS5ZpTzNLy!B&zG~?5~cK|3Q z+S^*ypp<8iD0Q18Bvi}Ox+qQH*Los{b(e}W(g3poAM(*exS&(joa)-H?a5El^m z*m+kR-2ak$eAc<1JCf%OmxV+Z=c?2vt9-8^$955-nEq2#xhP2=$f?KYSF9?ip1o+>Eb82z^6Y2` zRgUWw1=&hr{?||vVgSG(8k5ek51eCIdgqtjuFS>eY^NAb>cRxwI7iWgH=f1bVt)Bu z8M!D|pnB~l>091Sc)tr(hVE5duO0v-8uI`KA*XTtL(TyZ1VIo)4*37xh71(C7z4ck O0000#d05)K#j-5Nfa4{82R|4Bs>m~4gn~NKfw8+mkSFA7x&ctEE825qSnNWfP{&&Q_@7l zD{lJfh|AiJV)UJawH;BJkHD_Aw}u?_j@*UT8(;wG|Ff&68!&{xm4yHVAvpnm*hKW@ z_S>SLKnTuj8sOzie^@|UPaY;bq;L)*Q6ftYY4odBTI~?1Dp0Lx*>g3eXPj6tfLV9*4J!S*3Y>q>#pp06`I&c zb!$FBilx0ZKO2#P=^+zQkxs2J9&Ly&DZ?bQUdSVc^NxdiBM+Xw}$2-vL|Z|yKi zDj5G_#V}ejXaH2`1S>2IUq=qDwMp{1msPguE5YCNt{ZCX&Nx^le^q7MsWTOvszz3+ zQfgbB41#zRmEegGm@O3u^d)q=^5KL@?6?qI0e&MXEFiBbznbJLNfq84b<-%pE?VAx zv8!D%9c7U!W1mGj7d8+9+XboG)f~7JR0oJ__b9LQW!X7lup{?6ADf5N`yZMG<&p8{ z((&&|WdLMS0eM(J9Tg>nFcJhAR32CK9?>GS@FMOKzz9+(g(Sz4``qY*8ikp5g*%KI zvKVXFdC>=9AjS`YUXFPwDsn0AqPZ*q6P#pPe(D)*>DIypCH}aPa%k|ESg}GZVGZ~Ix=Q>$-6k0?^C}4>TV0Q*;?W_(` z)|Y4fCfnUu0N8OqSB-~wXPAf|lhi-z#7ps_0wAeMhu$9jIkZ7YHH(y%)7>_Sdm{rn z{Y_r|V8M+X_yk@EOX{-ULgSl)(t4 zVv54h6c7~RqH00KaSFi-edBs^Q@z$pU$_4h6C5>=e+()YoeSCzY>>iaOq9d{!X(K> z$bJeVgeq|w%$#N81bPFT_uUQTk$ETL?gBJdB9~uqYF}AZAJima5Wl?~Pd;~EQvtpG zrxU)PoekH+L|}U1_SH~FD`x@)ZJjHZ7PF@i(#nAYL~{f1O~RbM_RclNAz%FeW|PrLNk@XNzQ2< z+F9wJ==iYdu<6uV)KZzUP-N^Vi{PJ2T-f4DYCs+U+tFP0R#OsZt>P z1!Av(s9sfZ%ZN#AOGL&@-#eUKii=)9$2G9-7~xUl_KNy&lp$ugG#tR=W3wA-n&QE0 znQFspQ6i)SL5B$^V3T`iNa7AbaX_89WwBTA8c~`O)RmD$NLP&o)8vw7dA^+G`XCjP z%LP`V%O+N$7ZP3Fc*)7=mu3p3QX+_BXm9gw5F}wf_|yWHisFSI^3fq5x3@b5Ngu{x z+$NfTep_u~kiH5*9VJ!I5OOwrTfFM|6-xRO@rPe^Sj@K_QrKAf8EN0zijLrjYw@+j zy{UmrSDk{I3fPOS8fgfk+iUGqke|=Ee+6j4z6>=sAqubZ#mfBh(CMDIOImnBz2SbI zxg7H1Ku!FEJQ6CcYOdarzwa=p~qa(>|_#AbOZ#oZ+P$NBl-u!13kk?xzP^vb)1-9}=}M;ZT~1e+lXa$rU$ zr3YD#_%M>!_c~f3fRqujX`bo!#~e#D|GO1dz=G`R#~WDCM0yEs78g0*gYzXs4I<2* z6Vfnfzq5VwmKUm8uxc|+=1t(Wl171$1y?Vp|1LdpeF4I|_2y$5`MJj4Ma*`7dB9ck zxWc17%O-c0(GwBD`@p-)zMt?QWp9vCSA*e_=~6A_5@rfzrXfbUa?pFd5f&v`IDCG) zuWJ+~)vx#lhLSi=WJG+^46kpG9Zq%I@qRsxWOj=wA2R`4A$!I`CP~QYrHuvrpMk_t zL~cY?^*EOBxDjOMdEkymR#g!aBiaz^>N@0LT$#j&Il{0Znu7N zt^`*$NAc~v$+{$l2q1fMe~e&ql?vXmb4-;(-QcfsynAUH!;paZbCJdmSie@E8GhG} z>0F(11zfAO+b>IzVD+EGFY5c=@)1p5==6;>>!_g(`bxk`x&_JG*rbiNXH1YoGQX# z1hwySAaxB5#QwQAAXLakkK)yDG>)v~>9ET>AaGDZ0X$tN>ltoUXdd9O>Fp~K^aMJs zWPWF{i^8xvKKLtj`{ed=8`rXz%R;dphSeosK)BzO_f#m1KwXq@Yx_NDy3gQwy2d%} z&wlg<>m1a@Q`TFF9Q=t*LgxKqDf=nfeYVTq2o#3cal=R= z)lP8@XpH|8Pr2+$!%B;%@67bX=o7B(vR%&0T)g&art2dH$@y}++s!56IM@~1ogP8Y zkCVzkM5p`_mIojP7looz3Uf)qOZo56P>6>JaCSUM0!@;@A|x?|(x&ZSid)<{c#%0_ zGCC>6xyoyL5>JG#xRQ03Zw*fUn&RXX2*T(=wg#|7z!RM?dOqL}=|_$&^dbU}(+I14 z{Tz<@tE%%&>TNywu{8yBuB)wi{Y`0v2Idu;_BEeF-11{jixiLnl--U+%=zcjt?+LpLY-E1}>z45+Q3gvQi=>As4o=(YRyxs`nLBs)(E z??^L@H(kAnZu9C?d3Yf-*pGgA9U!%Rh${t;-DS>#-gK(^4O4;1*nS97eeY_q@b&>Y^Q)le3b%Xo5E^E0yRa7 zoVXZb1yTwfA-|k72ftZnj!FVPIEYMK5~h(%CJx35%3mQ+!T$v?{M5V9xnr44pBElL z@!L5Htw$;kQe2dtv}5JZ_NGJU)8nrojvxSnVp~DQr}2=J3D=)0cd205`vcJeTGy!? zqu|~xL-x*|y$^Zd>lVX7+OMs(Ggt4cr4I&=sQxO&q$dWQ7qgMfuov4S$K&r$MnZl^ zYe=#9cQ2hyt2eJxG})}%?e|GYu?WD!2N$p<6O z{lXdQ2Z&0oN2}u`B#10W+oBfx@aNw-N)U{%QC|&yT`uKf=Q#FUP}Mt3tyV?8X<#E@ zNcE4ZTmh>dGc&GxyGU>9XYVH_Mel}M?A}8bcTAwILaeX+*Sol07nUq;r=xu3F9{{| z-~U-#;yu&eT1howQFI7MMKW4OFETPpGH5ADskmA@hyZa&K$S@lvx^B6Xk2E)1TLV+ zW|C5VmeNBbP{79pM1;N*OIi1EoQt+W%xd5(Ftcgdqznk)Kf6?9G*IU!BV? zsTTRY9G=OwMvZiGz>HItKz#Y=F*Q&2`&}v+suy(RCaMH5J{%wAzCJ7>#b6hpDt{2X z9GBZ5MG>}JnM?saSyoa+z?b~AYt%g4TzCt~!=T^_}JCV?SN|RZUE%gQd z8)%^auTw9(B{49{ zQAl*eAm~DWz!p8Io~SUXrx>-sWhx%{77x@09iWHrhl&G($nh8y;y4*!(Zy8X4BeHA z);JVsGdm%>L==2AUtgs}$?NRM$r;Od1Zg@+u^|I!YYic!g`t45V3jh2(l?b8rpMfI zjIM;8cU+YYne{7~dl`zpaM-vTQYukrQ;81?ya?mF6j_>1rghAk6WiW5QY$xzKP|vM# zXyE$`d>a_(&!buHKMg?yOYhFGN(A;xxIEQ-$vm6zyT4_CV0&8+4EQebDt_la9E4$z_=fjfzCrU&U~6gSa?>n-`Y=5%apg zKU-1dVV&WTCLHFOp^QTnFLWarv1dntty@qrq-fhsWZMIP^=(EZK)BBC>JL-!p(U+& zcr5hzf|J;I8ZiRA1s4ngBt%@k2_?V@;m;U2if%;!O_p>e)P|QLw~z%nnZwZGIEnR+ z@%W0S-O&8>f*2QMhqOXHVr%meO4y4dPh_U&j8TSc15FtIx6AOWC|S)#x&lc}yXD+a zr{@KUoWq^o59&NH3lOC6!$=A!EE9Go;nOO$LE!UR_uf(Q+Pt8$ak!OQY;)Oo3yD+v z%)W0U81a<&`33t7nMpfXrz7M;t^w6`Pp|UuI?K6_+PYW#m7h?Cy1;Ib7xUzPr`h`p zFFxt%M$H`933=Kf^=l#Y7x-Svb~u`}@VOz&BTXqL6NcO!ENYYl(lEj14ricA`fFGex|N`? zD*sbC)^)Xw{0A{I$kP31EZA2M6#s4(bu~Xbe`6g}DV_qCH((I@zd&!`!4{fR zf{RX+=QDGSu&l@B_Lp(~jf9)y59$cyh=CmmqJCEIZGjP2!x2~gXmqeZZmb~$nMyEP zKqXZ!SOqm3jgg`SO%6Q~3?El?O!eajBa^d4WxTzYjf_4Fnw$@U7Zk=%&rT!CL01d? zeDys<^_Xje$Hr6Ym%UT+TdIfOW%$!^W zo)tDqOM(OMKh3ni+rI6|MUMT%+Q}Vk-bvm_=Xd+#r}De)G&R!a))y2r;X?^}2SB-e zXCS}#noqTidp>;UF#*9?y*F%w#tIxWOM)~9u$;-;sm0E~%MMe|P z(J)kJsJ$yI4M*lJ4DX8m6-*zEKw=9=7A7n=-eq5H_w8$t0PBrZue)t@F%wcaV5uw@ zRxU_ zl1QL7ay>MVo*;Q^u}ttx^OiyOoVU7-g&7FlS2w;17=@Vn{^EZdOe+OepV(hbro31L zeq(oC{Oo&wo~RVkGj99iKGSZ~KVXoV<9PK9*xGfa$69t&yp_+|QW|wRv*uuK<+n@G4lX1W`oqzc#!B|D`W}q0 zhdRR&xvIo&XYWYaUSG^HmeG&^aKLkmU+*RH`^-n-FW9+sPP{8Rc=35fO6tjje*mKg z{31GfEsiE6b&v>aA*(Go$_te3O^HTXY>inL(0j!&BMtvE3M-5>cRPSx7W|srCc1?N zuZ9)jk1X+VP`MCc1w94Af&+J^7TL+KLU$twi93O(2?3BrdX~dGu6<2h6d{l*)Z|hf z)50R6pZ}DFe)pBmfv}s$ml4!3&zuu9&m_3?XLrJRVm7+wHNUP<)3&_NB+{n3(;Ff= z$t;~8)XINKBhbch@r>%{nn-cn(e4!K1p>z-R*Gsg3{Tv%Cvf=ikE(Ly^~;Zzm%P-K-~$x8{ygq7hjDPflAZ5NB< zxR#1*8S89E3SX(k9&05jl|IwWc7veRumtBE_`tNAB2GYl2&lR#I$Y(M9ieuI3v{e+ z7d2Jx)2O@F%*D^j?H=@L@5FZ73AT^Ovn98fTL9@_z*P0;Nb)sfXH;gta;dpQ=^7>| z4zZ9D{--E>W)MnWNL-=hN+T7eYTc+2)R^C@+in5FHOaF*>xd+Y2OrOSAen3iFO&1c zr9qq98r8Gg>CH1IrYItea(M*0Kba1dj-(E`)e7dcx)cG|P@NGC|5GgQh{U)-aZjOZ z?o1;Z(Vl9+Hlze^cVnJ)c`P9OfF9>>ptk%s4pUu$iz-e+jDE7w5xe(>!Zs5$4W=p! ze<%!&#IV0PoB3*MsGTOdb>y+UOxhO;R2q703e6g5?Ph+<1EpL}P z&s~7GsDji>g^3psXyiIY& z!bJ09Bt#oX!R}OGm_-;zI||pltbK1tW|4ZqTQn~|7MW*q&LDe|Cpr_#WY(Gn{Es*# zXJ@M~a%(X#9$DA_;^baus<%!59$%>7ixw*Mcw6gLq`Z;pBR>aVF|d3s?(1|>0URnx z;=IXumHvd;#6R*|wgvl+&@!W?fr*ZZBHUF$=r?Ji6C=|KJF zEm!mk!&bK{A8GvDoOUPfNfN?Jk0O`|^lC`1wd`WQrE9U>Xg z=;5j7p=P~zvu?6CQ@sqskHO1vTCR64px$9_7it)&;7g+?p?WA{Vsr1kj{mss!FF%v zm{uXs;E!rp*DTF}JY$iRxbqetV{J9Vrc_`R&*CE1nik%CG|$^KFz_$78m}Nao`!D!oRy8?x6`j7@q05iH)zmMYhId zecn3;QLj1tRpUKuZK`?wKJfG|mi^=+8|Tnlw!elX*zaV5Mi(7RR?IdiwGzjkp!-|6 zy@tvur<8&4Fesr&$4u}T2kfn!0r8ZWVzb@HSWTn;PNG)N?9BV+71e*d7i)(v!UzZB zMb0#QF1q1>{Z-ciJ-2ldg!c_KQlHn=dXws_;wq zP$%17u-nAz-U)9L)WaGnNkkSh+67g&9IuoXRG#D2B&AJz+?u6oRNjzaHZKO&P!5|$nImcYQHI66W*9zNb)U>!(B&V{7mMAmqGl;4 zxOyt+V9A6V2Z`BT*R6b*|CVV?2?)nIQ5Hp2$`duyf92w}$P&*C%BO4{ZeCbzJ$pDk zCs}QEWAXn11*iL-NXn;Qo>sw6SCXA6r1sivIE8-Tf&g{$ZO*Oz^;^gK?zCmmoTIxf zeCr<`tYVH#Ep`N!s7@J+UH$4CIWCf4^@S)wbX#_X%qC_3#>Ib^6u{)z$R_ z3gTp~^}ccC+_`gDj`y@`WxdlDZ!)6z30g=8UiP)fqq5MMifukJ+c%3AS-*lb+!^SIY@>(||r;{AOj_YpN074WnX-BT?w zSyP7~+bV}%C+u_%7Imf^BA6O{WX#Nsnn~|%{VQZrt&BseP?zSEhHw_U^XrCBN6lG3 z$3h*Y<)r)H%Fxz>R&%=5B#3!$d*7=aofAGznNK|SO-T?RI))2B9(8rYY!UmBvVRn^ zbw3pQSvsKWKqF|7eX`B1!C0l;x%0(i56$-?kbF;sxsf?lYijUDyC`$$|kHXhR$C=v58#o zC!Y5uE+I#VNJtP2>0V?lGTA;@3D-P)eCGG9?rj?Kx~O{BQR!>d*WUDJ>y=P{c--%$ z{sG|*G1FHAaasljLav>S^R{dGIvhBnud&R0XMc8vhlg+WiS;ItosZnLKA5`oyB%hT zi=l1y-rXde{!IU8uI1t=aUzxvD33IQ7Cxd|I-$iU>G|Pc!>BXp?(>4-7M!#wtE{Xn zD;wHVLPA2y_Bp;WXLbYg86igO-Ho!!gIZog@vP(T5a{5rTNEG*u*)pAa(z|9STzs( zfQ=nR@F^lP@n7q-@jyue>bvU&vt;Gbw+_idh=C1>aq zvKIh`KT06XI}-4?k9KvNfUn?!u>R{pmJ>mv+w}kbL|N?3N-VZn=^4lyk@|W2%F2@q z3HGw$=b1TOn%G+dwj&9}R-vNiw5GwLuCzDT6<-V6T)WRdpRBk%-ddfr{JI%a;1A*7 z`y1}_lQEU?9Z#4H9UeBY+i((e4T0w+X~pHBJ}%#OxN_I3lC;oI+1eLf*4?oT4T^*< zRDy8C^QeQnd8^eozDToTCgR+|2fXzEP&T35Ck-Rw(}eS%8qk&wH~^`3Ks^k=fO`xE?dpt)^mp?x%vhM=VhFsXtBI1y1Fk<$2F-*NkrflRaI3? z|CM;Y;^ZDbV#nEEXm7a0O`80oaH~kWYYXA9&O2bPbtZi|2;Km&vy#Sq%e&?{MJpADnSib&!@YjF%>wf7 zZB&|`_D8@v^EF*Nu|bt`f1HVp$@bVW9yyq#0)KDgv0(e#zfQ`@Adn;X#wqWEKzzz{ z+FTg%Rv8mQ@7^LJBJz&IY^GbVx0NO>4_A0Z1w=Jj85tQt=qpY38^3Kn_y+_8fZi|F zrKG}5A~`-9%yC7n;5=SWy6iErs_5gmAC)~MzNK@Jd&eP>LBP}66;Z>mu6QLl;yvEA z3e{u@+(|U$yzTsO<7JP8hKA@0^a9PkG=3^77z`&bdKvEDn$>R#&5mcdbe@c|uw2B~ z`l_s=l6X>5TwMHM0EfmuC_|Z1+`Q@_>0w6T$U#=QKiKp)U+$C9b&ddN)d$U=kEQvb z=WqtM%KLm$_z6=?NuGBPdteiuoXd6*FdR)|t6}tg&#I5X5S7gp6u@+UeYzc@Nay!( z+?_~f(D=M>3~q9~P_w{k_wsNVufwReIJLLQ{3_6Z$cl5T<*l-0B@{rpj6;G!=q=aQtnc)#@JyHX5P#7bm(RGcDiFjl&ELa8Xso3yGJ* zIjniKt`d-|+lubjP;YFTGr09ol4rU^wA~+7<|VCHd~Qt-$(hTjXpUZu7kqCyUjO1F zfdD}vY#4aC<>#k%taN6|(#c=<^fr`eFLt**6fakCp8Jw)U^`4rveIbc$p}`N(uxYc zr-OnfyOn*mgomeQyOqX*Siz@2G{MDMquz_H-hyZGDYu&dA=<+A#p?91tg13v?DhPY z@{x|F^Tb%+%hCD?6ozqO-rtRlt(3&E7#PV(NnqiBz1$fH75$lJuoJKR6%IVmB17Z` z3msiJ&v=3TPg?wOSr^WkzfKB_BqzB(n(Mtt9qcz(u9uuoJpmB|{q8FCR|uU3IrA3{oG)I8M8?8+7`{ z1SKfbM;Na(8sUwNjeYv`DLFYgeJLX>$;0gOIh53w2LpwOCoU|kG%v4|Il0LxE(%X)rlO+a>+9QcDKW7| zH}#Sk?ehLj_r`U^29WmdSW|*XunHh%8xKk6kQjL!FI7Lhz3yzYG5_KN=cB?&7QMU2 z?hzATd)J`l<4a2G8#~-ep&Hl}%t%8k`|S%5m@<1u?;x->+*t^w_XHt~Gf~TD zJ%Ep~6(;lNPAsghg7Ne2WC`n6k0^ZZ#0SLSh=>UGGJ^WQ4t;^be_Xp(ldIkza({XI zvjD>A#C#w!^!C=yezUXj(ioKQdndorsE(*l;1t;_ED!9i>m7P2qr5kQUIAG57=H7N z$9MB_{*#}N_Y>Mk0NPZl+gQ{T(Kn~X-s`Nt^-Xrs@dl?VdDFQdY=LZ~Ot46Vq$ubd zhUiegJ&`2oU1a=zL0BAtXgbvW80zyucoC{Nr!c!AJ0#nomkG=7+2K0p)X1WL@Z49! zTorwQgo8T&8EiC33y#ws?mr)&vMGma59b5*|oN`XfNC%S85%aRRrK9 zs;}~R@91BL)|@cm6XEevUVsc<9(vS%J0AqcFUdoKX^0%hI;I(F888zTX}DBdc+FCl zVJ?k_%P18w0or!LoIROAw|+HvZVN0842!P6VG^7h1Ib;yQ}H#^M<|36;3Cb8tG~@Mv`Vszb>`~x#+=~`}bPJF0IUx zg;(aJ?q1ilahDTfKyVFzIko0f3Uqav+bmX-DBs~H8xM?17~!i!-761TXvl^U;w9(4 zwgN7-L%zEVKDUrp?v7HzrOupe5jxIKpTtd7TCFdiiO(Z7k`rlPcrAkaRAA@ug!6>q z>&c%+_uEl6+_%+04@C^)s5X~BUhnrym`GIBqLDwzXK)T(dUJDg^HB_?mo^ypMSP6m zF&>B^p3439m$rnZ^Tly6j+{Zgl9rARpTj)rVvbZ&fiVgF4_M|h!r8~0A)i*TE{tGe~M=(Vzwd$#-S^qh5bY|k>!5kpEpDTyS zedikL>M5zI=c~<5&v&O&3*d<(_!nD&jraLIUw!k8@l_CXqN&h}rHpLsOJ_w>j?0r$ z`W&(Zx-Q3YYLj{nzN)Cmr%5h3Xrv0RB8E)$SUq>q&3lxOpDyrT(f*0ZOX`!0>q zyjR|6#BRI~Fxa=@cJ181U)E3h`Kox?nAairyAG0<74d!*k%jW7l%p?;ALga^tT{L3 zuH&E&vs}Wy6y4j~10wBgC^KGZ)dW%@6Rj?n97qXM+DjQc`KAswq>-%&Vgn*UMz8{0;HJ0&dyeX*B zj?aMZGc~hz*6C6`jo#iaPnNIaQ`gFymP*rG=WnEv6cQJ^xl!&pr$JwFo;s@|sy+sZ z(<HYJHrTn_&crlc~AsIB}We$l1KZcU|bpc8*I6}ji7?U9N!3G;em7Hmi zm>8ei+3GJ7iI?9h#j;>;-?vi;9o{rf6y$V(7lMp`)nu^|Hfl{zPd_{{@$NU#rmm@( zwv;*=Lzc#UydgyVnfU~h^0Mph_u+7HU+9ZZQ!^CsW8K=rEbtP>|5}>CAmg_H;eWf@ zuoT!a^S*w%pUUxeJ}q&sSNnZqCw5$)?Q~wmpJ#twEY*&E0u zu&+e%sXbeNiXyGuiey=S$0Pdon*I6yZxv~TUCpO9_1~RasP~e0+$=VHy7L#yqi+^% zcYmvR{N^#@OO3xJy?rn*t*(xV7aIp5!N93Svj6%Myqu*EwR z7Us2Mb}m+FdYwY_Tl2lA4TZ>7)S*($pEfqj%L&*Zqobq8Rb?#p!4h9y{`q>3Mm|du zZ28%>n`{=CEe3tTaan;xtZT>hcfqd?=1yO~eK<9_8$UPLsL=2^K^}dy=qStiQcpkd zLPAJSLg+W_1~Y04eotR{Sm)9CXG2^yi4`yC*{UB8D%*C5Ak*BQJ)`pYu?F$=j@5xWmV z0fDCIbMeb&Aewwx7Uo?&j<^G7ZhfO@%h2_sH`r)>Z)uFDaWVhPSFr<6{&au-zGRUL zb`C0k{v_Xd+JX;&Gp}kj`6~wBVsf3~Y&P>tJaB*h<-tpwTR3lc^-h0AdWy^7{?E3^ z`Dpo&EWg?~3Ey_VuUFJ0iW&#^#s-hq8F6ZguBXxv43s%eJ9mxw-{@Cpqg|9&U5fKU zt9|>?r-8k_0$RC=tW<1BbjW~=~yUW>*QiCRT()T~Q)IKK(PCRKS}Mzn~X zvX8>T34x<%H=#y&KPjE^K1IK4o6Ln|bz`^46L0zka0q=#^ z^DZ-BPxRE(IhI+!IUh~Oa^7aOk7RB)Oj)z4!n1=v0J_<-(fQlBkfnwY0sF#fMtSMB zdJT!1aXA`VldUA^`Msy|V!ZX7M!&%FXtr#8mdN7Iu$J0Opju{P6?qP;cirGj1|`X$ zhJ0&D@3g~+FUJc*;uR5`wfi#W6)xwoer20N}^Mt2y|u^ zqyd!(c-_gSv+sdpHporqp+?&!%ngmv2OkI1nf+d&=UH!;=rebUKDa9TS)KlV@v)Qd z#%bd>yi2Zw#TS3STX;Yste{pyw+2L+P+&3O)q$ys8J9Q(^b0tG7jQjB zXyT4hIhZZ1taP5AjC?C(=Fq9P-{=U+r}1Q$02@*@wPY`ami&B*eR_b@_rWNo4;LAB zr?nP*>8Ii#uaMNBlPE&8sj8hOKS!8qz_NNT7>Zi$xW_n zoKCSP%bLXTa!a+KV3~hw&z!Y2ah@y3ACJ>s;FBv)==XG3()spu9E0pQj}>dcz@HV` z8wwSMM%u3HF8i{62?BfH8=Ah43z63`25`dom5-?Ey@Ad_7xXufKW;j!oK6%xJRZB@ zNEw4HEiJzbQY>A%*giX*Hg&^ax8g}_Z1j3@wGcY(25Q0{+ZYUjz?5n;(YrpPTSkhz#~*P$p`o7I;s${$xh-$3V3V)>LPi zp9NYdk4DPD$ z<27o>QE1UA&bPc`HOu(1afE3HA+yGu!~zh}fU@Zpl|`w;*n7FLppP7$)aZvgaL_)* zvCVC}sHmib@yi7N28#Hy5IfcxTN#W%HGH5YQjHj`i$&adS>zeD;i1MH-xo8We4=Cz z=GEg-TR(?|WkN{?ZQYd`AnUWZ>!tBszj|AwQ;C&7)sEW#Yqt*8 zrKN`^y$c@GIEFIp-uOf;=Zyus(#NNTPLi4I*X48rDekMF88+?x3GRKfoK4&n?U{^` z(^UqGSfbZSK4Vil^`8pi; zq(|zaxY!9d7vp!mtr7%=`I+9cZ+)9CXJ5Jao!+@tQ{?!;0NIJRF@CZvKU6_UU&3)D zn=(bMGsQREWxv+)={H4GMmQd^U_E}sFM)Q3l*YF`Y+>{e_#SL>?fC|u?qlzW?E~9@ zHi}cGEozdpyB~uXJ0tC4j?)Md&SoVH6gi8A?6M1VB}DAj!ysLN*Yt$EsF^NRfR{N{ z_jGw4-@zPTVf?z>BK|C59l=3MpPweEqdqD6OPl+)tYKP|5)ab<5(1jMMdrJu4nDlW zJ};M#Y`noQ56Hcy!U0n)pm)LC>)?M$13cL78_%)gw1$A8HKzXJ9XN%ptYq*_^8GpO4R8yOas?`Fw>;G>=&oJ;rI@ zm@^k?T^s}@Vs3`Xx*Nu4&A?~s2AXCkYwrnOAd)=>zHY@?Lx26wRb6J{S0*(|0#O}QLo6_n*K zqdjTx{{(Tn96~jRo@-fMTMn-NPKwMnPSfA_HZGWjv5IU~lBU9T+QH=cJe`vqIR$BS&c(Wjc(7y8n2zz zEo1l2z3c|AtZhaC_CRdt z`NQ3~AW5eH+defxj^oOA!&zk9vE+E_JzcESgrG z<(A&)#Y)ySbZt&b^Nr73(gNeOzrsyCbM-JSKIJvTuB?kVRn33NB{vH#TPbE*YX*C+ zwMxbXe_7W;ZIfppJi6QbN;gnu=J7k8NK{?Hsl5{@!lE2w#KpgCYbfiNssEGS0AJu%NcD=Fs%K}Hx!XF@Mg7S%4_B--_|?iHW@RN8xcGH3X4 zw@q{+XZvETcbGSog_gyk8-Scj)=QPf`1*AaRV%Ks!Okd?mCY(Nmq`%|+UxqN0mGRI$lQEN#5Ev|uqqC*U0z`$$Atz_8`wemkb7%6pL%&Pi5NyjN zjx@0(Ig)xzh;hUDzGfNaeVi zR6L~)q?j0bL>ibm1>P<;1?tV$D9N!KDyT-}^RvW0-$zPuE;N$Beb92N&Cx|%dpX@K zZphsAyDRE4Th3fg)$OxiHeEtThx~KA?nMD2^*rdX@%2um{OM1L0I1(^(m=!s-(6=J z9~p}|ex^yhCC3bL;MZg(Pai*{{kvN~Qma>Z;u*ccwxr@-Sxr*mN!d!#LAe7}&Kn39+cgtUr zq&72BDR9p5?2c+^5x0luL~7;c#H^fXromOr`?HmshV6d-% z3AOi8Lxu_aUsxIM-*W44VL-$UF>8FTv36Zq#AA*RItTsmEM3hwWPawab<=Z(SzmM1I_ERihzM!uHEaR;e+*A>a9<;w$VJQpLMq zSF9ovXTatQ=ak^9Hb!co_2;09rQ-frj>&Yn*a$&HSrkC0I0?A28ust$qN360S_Oem zop62nj`JUI7N;s{CY?(hoD9JzJ|Vz~s|EQh;)wHPmeWRrNtQl+c2|}MJGWWQ|AFbv z=e?vrNle<3{e9eV-T!bCPht3Q&}2O9?Ru{7+d{4nE{Oa;KS991#YZhWKg)R1Wt6A0 zH`h+W-Gx`*{a0_ze?76bK{jN)7c$*u3z^A@9HOaBiehbYTTlX(`CJnp^GIm-*MbAv z{{LA3#J@Lx-PU;rAI4%E32a|m705r+VBv;({Tz5d+LImT>koAiM-l=x+>2%D)8XgHdhmIhUtdQ!x&4JShwf0>tC z){8|w2|9HitMN8`zdiL4Yg#E}(yAOfij;TgT42HV7&_ zru7iZ>wn~%2Q}P5OyAC%vh#l}A2>LESl)jNp={%SBYWyW{+x~M#iCoT>pd5tdi7AA zS*J6!t6OFM@dJD7@u$kdmUj2<~UXZDIX{T?@N zxzz>Ptc9r-y;LO%4V9p$ARJo#rNX3Zgo%NBN#%LMSkatNjWkmxl{$KmBeho1_LHk{ z1dG>$HT(E)Q}@{7)8MX4ratRQJoXd{ zmc;JI-%qtXbOa1c*~IGMeiKR?zY`@cmBc%@Gt&OT#rywgd+VsSzOGxC8ZIsF6fbTC zic_Sx2G`=nA;BR?u@-j?P>Q<;hvLPHYoI`YV!@%1(%#VD^W68j^4{_N^NqpCNOJbs zIXQ#5=2~;Ey<=a}*-VW9io-BGG&Bh6qeQgo_S&w2+ASy-veBEDMYZ>Fd)O|%LA;iF zRV-TV4ZjSenQi}*;Fh{YK}0 z(W%q=bMm=m^@xuQN3tG0%h(C-j!03=_-LlJ=a~P)4&j8o!Swn4Z`D2FWRoh;!b@E@ z+e^skXB>8@g6xKiXvYHfHUIcx+%~T`nTs89^-w}*mmBhJa+Z+pK>|x@|_3y-oL3!jUO?Q4@>cZyf6Nu|ysMi9|p6AovGIrf@iDA;$n?zQCN2EGBF2$7)tkY|)h& zV;+W@E4B)zjz$pD3fslBGFd2p_7;x9C;CG?)eKs)VSqJmr+sB)>S!Mt|K8ygu(KVL zE)#=wX!^T2`)!&UF6c`N(Z!#jO;5sIQzK3!Oc~N zWX@q_*)*>UTOP1dUX_;~tD${ju1{)MKQzhW-%u%K#t^eU!wVx{rOUilwZ>PBY*=U> zpbb#3tGB;A=TV)oK-GVq>PwcV&}r2{mQM{$ao60hCl1_t^%;Nnz>ZhcvfwFgLMm1{ z)p$z2Lmtg%@{rvmWQeMFK~2+uS$EaU3e#*~5aic5#j%Z5j@6q@fYGkU&}DlG*v>Bj z>uX?^miqL!ak>sM>y&nikLngOrWw=0)~HTg#1H1)cS3CG{%lia2vA-lJ?g9V&(0V6S%`F$74fTe}y&6j$;PID`)A1A@z;WasT`w!|SDBxno9JR;e z#;$D31c`1QuYQkvcQXmtZ(Ev++V4aSVZ?iR_D3GOG&qQleEaG95JOX_mAtJ{N3hRB z)=$m2(ieAu@}?F)IF2gt_M+SDPS18;#1MZl8|Kl+cq1-Isu43JEV6{_m>vZuWZ4dL z=gA9gy@q$Jk`0%rGH1JQ^UthqiEZaXtJzF=@-kX}LN@)!_%bukVpPHuU*^v+pROI{ zkA`VQ?9Gx@#WxP*+J0#EGMU_q$df#+(XaVhDLAqw+MfNE=ZIS6am4Uq&`bln_8@wH zw4A!ij_p&6wq_L-kigi3!}nKM+r(hrgXPF{Zsap#y9g1@+soh%nl)AyARDS5yWKq{ zc}4Lit*X2A?CeSkHOR2pS%1;tzK2|u=LdrqK&~AKEC3V{{>8H@0Yeke&$DiHb z_v_!vh@(WvgGOND_{47InVD%Enc3k9$3KI4SYj_B-`t@s4Q(?Q_CB}r6L0>;f!oJs z3!o9>3=HY`7sYR8VREBpgZ1eT-Y$*$1U#@~`Fk?h4As&4&2!dtISOjSOXEQU+6{j+ z)|v`R+SB#e-wf&Cr@!an3tNE1`W+aZ9 zKnd=5F-z^C2fp4fQQ15dWy`z89&&gR0(&Lv%^bj6VqoA_ed*JE~fcD$p?ehilIJYX4 z<=DI@T5Cjhhpy#KY)`edxXo1g?~%IH-}bqJCr?E7M3rfumAe0qyA-Jc2YYl18io?z z2g?o?*CR@xfO6 za|F$YpJ|-i>J_+KW>U#>(&++gjw~}}0}GdR+nUsN6uR*hR%TwIh@J3*BHxiuZvLA- zj&%0X60!4pq9bH1mm=Vo@q}^n%+wek$wm>GUvrg;voDJ9eVA0$mop|#(2C}GnN+2F zQC$r;%bee@m^aC*lFd3z%rxJdFLm*`M)^8iFK%gt-=N zW1sB4l{SQl*4DFi(ThK)x$`)XHQMku-0jN#OS0%#w&tD$dg^U)dNho#Bu9b8^Z1e_ zsX+zS1)d^%Z~DV_MP~)kKWyM0s%>wAuiVp9f#?F`NF%`VIL<X~gwfO%aBE)sU4WtJs2!Y0@g?H2BTpxpYy=j2@rIt?yn zEwr+>fR?rBb~}pc+zNQ-E#!TVpD7RGQzqfhjD1k@3$JJYRPM1#RS>KyN{ma#e!dn4DYB41kq&!AYa+NYhB z^oTqC_|tZB(ezFn)3l;E^JL2E3ajgHmszm&Pu7Mxz|@m!w$;M}GnYOAn7oL{tf}&p z47Rjmj4;CFSfe8FypBje%wJYt|Ohkd6K=gPgo(k06!j@sUNbM-!le4%;v2{jqkm~hL zhnocVO~&cfmBc%x;jVd7f10WlPYPzBpnU1%p|eKu0TCi`uX>0m!oqjL`mj@R3Cb+s zW>zYc)W|cYL$?u` zX(aX&qW3#CDRzFlkm?zcvy;!5=6|l`7B&!#+O# z&>B?~ut03ti|c(;-#=R7hGlh*Dl}+DzbM-BBHM-4zN%d3@6l+N`DmZZ2>f{ zo2jSbezFUzZ3!|?uYlY9!Zc~g(Q0W`GqZIzArLI=H2+_6j#$=fg& zk9ab_Y)i43`T`)~CLSTycAF zs?eD78`IM28k0|&hAO+57=NFY9}}S9Af;c)#C}l{ymTbWUWhhpOiH9brmQXh9{ecE zAz~4dn!m1g^iklBJ;r?6aQSv?7LJ9~89qvf;_nD45X3s-m{is|QDrC8BOxih`w9|c zkJq;(OJoTS77-j%_-wx%{UK3lv@4|YWdu*($melhr|ir9=uCKpmSi?(t&~P=rA^zE z#Ute1XSveCTcJp3RtL1 z19s-9{&Oe8%z(#A;NVZZ3WPE;n>IS*y3NH`8}tA;NfzTqn(`Y^ zqpx>3RkQ468~gYG+SNcGnnzZ!E;iMb0azWw+a9$;i90n@nJVliTi0aeF{wYN_H2Vr z4Fi4n1z(cF74^8hp8KI!wHzHwERl&ek5((I{|zVI5bUzQrR6{EXeZRwq% zDNZ5hus4Sa*yyW2Xjt*oQG8I^%*j%nky;o<-2Ra;yCLbKz1JDWgv?Qj!$bn}XT21e zSGb|6X=fX2G-pSIW&B|ifg@K6gM0pYM{~eOETXoa6E012RH!#w- zc9KE)(>Om*?M|WKD5aP5dDcM;NWcCO!J#a~9W(eA$MwL*YJ)?6&{9HvUx=nv_&q1; zlEFqmS68}m$dzli7?)k1u)EoL-v0{BHpv^z&H3XCv!q_sM-cvaWyulCSt`LtXKf7M zc`AE!K@D3|UKm8H^SFHBYySM_9Jf`d*V; zy^q~$2>4N+0W8mZ5M0n~&(xuoNN{;op+LWZwPzH%7RM9jp)QolE;MZeYB@047)NwX)%-7<=||kb8)ZrpN=dIK=b_0z}wlyi5CC>+t}{uLA7zZ>&G?t6vCO}Rz6lbhIWNET(pJ4 zBWzFQ)t89rsz9pS&~b<$DT}WTr!3*ph^pdv+HAVb>I_+Z8fZHI{SmaFBZM#wyIHLv zckScJOBdD{4&0?UcaEtgytn3%YRH>6J1ItUpEGeKi(6&1WeJGx!Bk!aDK=XMFVJ)b z^gc(u#w?2g`nhZd+WtL?8EkX~SbLmnGk6cvuo1RY`EK_oCp>@7gMQ=e(A-Z@3Nb0Y zr7OEN`hNT8bf>-BupYQ`Aw1cA!pYlgoAc*tuiL-`9_DgCk)}wdLFJ#J zx+d8f1xnO8-Bt3+7~3@+TXg_vfZn--tLm1vv@Z z;J6}nf&DOaN?BXw+&<}Ec&c3S=**IhKvSN$f=>;JB(9F4ND;^dQBkmq_XzL%LxSTx z3Ef8#zc0G}T+P+|rV&U?kSvB*RECQgEebtTaS7h~aT2rP+^rnfZ~d;^X(T0BXNgJ4 z%-6b&H^)>6fE-pC_o4}@FRMwJ5p!LY3h2S){j-wScJeUB6t$Vh_sv-04rKhFS}_2K z6fkd*QFuGSG)Hqfvn3Cdda&!`luB&myQF^SAdaYhHb}Xv=ui$QY;GEBG0&Dg-(EZ6 zST{tBDnYm1?JBKUo60#kO%4%!;n_+V9hFPDbCtTTyvRx(QnnJ1tJGmW`Z~tR@F|Jo zd|Zd?_(Reltjfh3j7iB~CsOc0sI(>BUIv0x`LeK482!22+HV%&$7&KuM(+w_-$LKk zSvuiT1db;vTE&8xbbpJ(&I5%#8E<8-l*TEQ;v@^c+?j-`=znGvlC<4b_ua4^$?C`` z_6|FKq|5gXT&F0~DR8GiRz>?7`~c77Jh5THIr24Q#%e3_5tZ z6LL-2^1TB?>Q6IjOo9%uf7m_jWHj`TjgYK zA;MsGWRK+{nQY5M_bR<%HUisj=5@RKuG3(3SGrq*3O)1STamFxg1_qdg7#`U!Ucjc zDqlSUZzwd6-NDu+AzQC`9hbN)!fW)_Csp6(l4a<$?zX`1>YS5Y>$mqlI_=8=49lxw zuU=}=3fQQb&1(;(wGyPx^o}w1$u{Mm2S7w3Nxm>}Bj-}{mT$|tgAhPYG)jYvzLO}a zU*3~}j@Qvi7*B@WT&FRzMa3bMvc)sQXoOq>2*b~DYzcfd5nRv{R*Tx%gu$Ixl+zN` ziA{kN8f?BK0;v5^@s2ZiwuNHhiuK5sr0mx(bXEDj9vQ1!71=sXj;ApC_MRAy8?|~h z@gO&ew=X6VYfNi9_Vd-=y4%(Y^7^i6>%mKr zVn^Ieh=YT8lK297(3$S!gLKTX$Ho({qKe!_-y=B{$^_IiQERqM9huVASyoK9oJ77W zs@hj%xD0?pl^%&;2Q&2n1eOvr5(jM46U zAAodpMXGKugZ$t;e{NlWua`xy=~GdbKQO4XbpLuj_baL>b?EY|Z|p)mUOf1_tn&y9 zHj9h__;03y^@Ya#CrqsCqrtOMQ!9(1;1rSDp=^A(r~1A@g$4 zA1`841zeC=wPnLUXcJ49*_pueWOkbBJpsjw-*Zl%(~~f?7WtA@&z)xbU~QxUvj%P2CY#l8j2L-P*jnzLGb&PZ8>6P~C=4_>OT2(II2 zx~_kHuoej&cX6tU;By1gy)eqM2EKhYl2mumhOyP#5F=|Fr(#|8DoHe{k}QsLw@Z`4 z!NkFC=84VT+NmaxH!Y-Wjiq@j|MS|1+J(|;cTh_YQ(G(H8|u=oSLfoaTi8zsqP%Bt zg=>@$oHTcH&(>(Nk1(G+P^vnIO2DX#RJzET>KbC?Gb$g(^^inz7fv9 z+LARwq*zM`dzxEVgq^)^6CyHU&jXaVl%=@?l37>n4S;)R@76>1qZ`=nKSyYZ7$m&l3mN_d}t>w zdXq6`ok1NYbSzJYyQ=8%MmHu~2N!xGH2$o;y3mthTUY&Ts%@6x1!wzR^ALYowPX3o zXL61;3nDge8WJ_jH%5`{#^=K>Fn_Z0sS=MTxI7&O5nQ=<8nVhmc zj}qSdtfZN9g0D7P$%~9C$d~qJ#MQ*&ENr8JrMQ_O_R$>Ku8ull0F&C4n#tH}OW)ff z$)q%a^{3?d2VNq$&78s5YSF^H7IOjNn-^tlH|icbpI6PDh3Asr=d{DVJ~J*);bfQb zb-7lvITqL=^%qNhr-*DK7^#HBa1awW}-fkL-U%e7Y{tML_ z2-=HqH2_8^L3T;pL(O3A#a0|oG;D&y7X#yN7XI3M^(m{u#8r+|^*%)NuVftcq(#b# zC-=(R-piP>kx(!3OCZP4H69q32=Zc7@VOA4ByLF3 zA-?fjl~5uWUOq0q>d(BN03ZYXA`esNhfdfdCP;i%y!cRYAP(N@?LBTpu4tG7_>{&X z?4qg6Hs+i;ui<)v=9Dw<)OMSInVj z^C$rT|sKDE-?j^T&N^qytL&DuUTo6R@rEBzXC!|ogEgf4>< z7Z}Bh@Q-+AG>iOI*DepU;I5yE}*Wvfmtwnai=Wki?G7luKA!!0;#yN=+cxN}I0_ zohOS9P=B*Tj58+!Tki8g0rqKc*Q;z`R^SnbH!P9Tp%5AP>_%4nzMK&4K`9P*rQ3SMwXlivlPeN zD#H8M8}ZioCB=Jo4v}tS@A;9dg~qO!eQDQ`o{)9J|(Hu8Kb*jD&j@eanEj+TPA{abtk z66b;EW@zaNYgaA*2mpUz#^dls%T?&`+v2nD2H%!CqiU+~h;wtr0?uqlTf5YyGTB;* z-prp2k}D3R0KOc0(U54P?Q>OFvfDD3F}xPj)miBms@5l!OB)|WmH3M_NsRbUo{LL( z|AddH0k*F*Gn0;_=TF`gsg&=6w6QDbE_sOp;*k)1iApP!fG<{fQlnKqg#Fn$lr>vN zICpd{y7AAUqyOql7fKSz@?~X49J>-E%sL$%xkG;AR}cUNVG?g}(`8ypyBh<%0m!T7 z%z86EZ-`B4=%eXXC53}HSg~4laYAdQ4RhIrRkw1X->y&(%cB*Hk~C@5>K?;wH#6^B zn5x(`nYKFr@Tuw}hj8z{x$@v`;p7#yR3*`ikXiD^E`$HGxQ01AbF&Jgpi!v;$y_VRfTkEMudtfWl(eYX?m>_C$}c+t zyuJ>9XR39h;w)Fb#=vB1SlH--+gyZwJhmL~#@neTAq=R)VgZ*zQe;dw%4yc>^UBsX zL0JLHD{l_4eV@jJ@A?cqZ>}Aa)@~Vw14jL)>DtZtMu~H6_uprRT>&HQ90B0%$7rwG zR5;ovm43RI&f42Uymo!0W=vz?^jII8G;77?n77$+tsrTR=X1#}%fb$?SE7BUPRe-t zSh=X;DvM}`i7g!LUv|~MUvG!K%qcwa_tq4-FZivWmK8<314rU_dt=c0LvG&Ok6~vG3A>$VY`FwQQ7E8e zOr9^BB$Sn2LPk2ci5Dsv!f-L)!}JLcM2-Tj;q#N@5~uL;au0uS1GC^>;OURw>e`4V zJOB~tO7kjtt93}1BubGA%W?X0LuRH^QT3w|s6A49yDdy-=6SFiCv^(Ynnx#sF3F6Fx9Za&A6w>Nlp>t%j6IGStJU{V{9(=<)Led7y(>a(;^8Bpna!2gr z?W*O8HwS{fwjYz^F$M0@MCPrvD@{X4)?Y&T%=DapFgLz!n2DxpO7_Gck8mr7JfBHfY0i@{2I({4ixIEW<6!7x| z?PX&L7*G1f!0FvP*HUyep6;8q*zT;pUE*{#fW~oW{uh_BoO#0*DQK-#ffK_IxT>8M z1`h=Zdxrs~px)Uaz%Dqo$E-}d?4&$L5c(PYE6^!uR6%Zf+rc1J9lGIy4s6?<2|TBE)5?nSSO@?6&7<9_sjzLF7xUrLF@f=^dOr|%TL@q5?z$&%B` zRO!j$Wj5DQ-zJVj?V@qUbecopdUH7cNWwlRoOP#G zGboyMUuL*L>mq;s)wZzfu>d)`N zdt|JDnQvdS1-OXi24Lr{sLS4`6@?Ey0&)ShOg*#3J>LOmbTvJTcqPG3n}(|5 zIA}zZn{`9>IQN&9lJld>Q#jCv9PQ=92Sou8W4Q+fp2`+8vpwJYcFGD2mIqySxo01| zK)HF>6g?!IN^{Z4?pA3(Zeuw&!UW^KrAR1<8VNW3ze@!U-wQ{I`DQ%AZ>@NP$Qn~n zWy+Dk3zOd!ynza`yNhbfo|B=oCvUR#zK$S1n*p~_(&l&yzLiZUm?2eCB9Kby5*XE4td!0vei9QTiL>8 zv@y^x6yxndBYrcQUb#yp?o>B)sO+76tuue>)`RyFPucpJ8H09+(vD_}1-zn;8ct*e zDW^1CzFQtMm^&dP$Don=^Jd>j*E+ZCbRA5zDV}fX3BiP`d3_C|70A0}1RH^1caPlU zf5(~VC9uu;hE>l(8+OEQmSo9oJ(6v5CSPrVO1PJ}t$=MTcWAXc3 z2-l3?@f#jZr4{^x+p~8th???B?r6Bf>>XUrSx)rG)-Ar|>!??VWN@`?_M^0>7K$E35%3m)6Bmat2I2FJyF z`XjrMyj=nWpPJM7TwXVu-Q|z!7f1Y>Sns}+ zGV#_rYkAjLU0v&45LvX*D*Xx;XmH%o^T=&7dRfRQeUDGZKsp&1$V*p`{GIt}jABu} zjN{u=L@9dz=1qXOBGvUFFsmU8_%=4X?_fp*_0M58UvI?4pF$zam0JM!)RYljAZ=mw zYd6MIP?}g?{mPMO#rbJcys0kJp)B)z*WK(QlS0xnZ2#9Ep8&QdJ>)5y!CREsnBF$& z1?f-|2Fry0CXsxf@dxzbBS!z^;GzoK?&-s9DM!Q`sTRAVTnOJ7IfBuY}RYo!U@o1HN z_Z1T!lxZMIe~Q|ck1@<6azkB?(s&@%cr;P@qQ!LabN=qACJ?E`7_V(Dujb}m;-<$-^a{FJF5EYy8a z+krC=O2|?93L%;#K5%8|L$AQ?*}X345@7gApL5+XZq(+o*g8pBH^75UZr!^_wJhQ* zrP<~O_Miq4O|bipulgVfcG&TJ_~gZu5I4(B0m0qi$>1V9ov~kUH@TgM`TB8F>e}r5 zDm2vZrHn!%sUD<|AEZEz{`vUM-^W<_2{OACvpwFmS>{)UZYyH28>nMb7&)yQuaZXLmJD+e&M>yT7EQEZ!#HD zTJ)1iO1|v2qT<0!AdYvC)7bu(53RcDT@Oj4zr9$eiDTZV(p49tIPMg;1(M4sJf*DO z$1g$2Bq$;B=AEg-9&s9$!q3`w+ER)9;`&XD%e|*8R*CAJ9`g>V?GdCt`MDQEb*o;h zZ@onur~?yc`Gc`1Y)7*QP-RX?#6foCBudkC%$fN1naKh8IYP5FxhH_-hthdsJ2=JP zqTSZUTPO8}x(ujALAO3`44Nr!EQ_%O-`tl>E?m>`9h-g9r>kX;r(-U@x()H13{ov; z7#_`wyUEw}WlK+a4QRtr+F-mGKC@T(h@6fC<_eCVQSP4vq&ScyRVK~m{4{VH#!aMt z#xm(+S-euF`6wf+&PD)G7ct8B&3uQ&rz%$i;xFty_?gYS08`;Uf+ zg2qW(G`-V~jz5#MuozQjQvz7qSm)u${n89(&T}aB*V*rlOW0T{(c&F&ukz`aHk~yt zS!Hg0x}Cd}U%Fm30QsvmHD~?QJ)Zq-C#Xpwx?>2dy&#nN`lT2APi0eBh=g1rKzD6N zwmbCq=|d@m^Gva9n}7(VAxK8C-s2M&d#}JVUngp~`1>(5`xFisd-M10$9s|`Z4ZOX z)UqEm+3$aY7gv1RSGEYaUF>hj@F7KG$sMqY7ZAA5I`~gUuuwwbOHbaPwZ8i=(4M>q z&uQ1h_;m6Ge}`$0!>^v*6c{PkSluzSaII{^BZHZmtSj^&W7$L3^mTr93U-`RW-iz^ zv?RD{hBD)k9)F8xCcM_W}jQT4)^l}4|GOX!%KGy!CTES|l(?>ac;vXRn0>2+P zrB&>LuxF>?gLukp;jLUVw|jWBsEan@Vq+=VAKc-*UAQ79;d&8w6cS@IWpHbCR0ao9 zKc$D-(cEl(s&y)Xme&EC@&r;Hwzw`7wBnlt%KYQ|jSAI;w-LEKnS@FjdzxW&n4onh zSL9bOW!nu~LKdFpeB>ue{I}+ummNXwpfPrFaVEJ8k>Z$}%~+NW@IrlEapUE)TPCP*Ppbu8vN1+W7q%y$$%$B{(#$S5(9G zF;m+n*?rWam4kz_9yob|q7#+tsuiFr#wd|f_WXuUiE(inMC0RB+h_i0naGrK6{tuu zpk#{JAPJ^bH=@`kY)o`4WSMyx*}q^wzr@tN#GO$#^IN<*GNP#^X+()_mgLIiqV}aY z8D_}}!9k9&4;sQ(3nh2J3ErR8r_SyivWrd$JySr3o@*L>qF>dT+U%u%I`JBz9%$QS zPiJ801L))j%)@QCJP~A=<(8|j52B0CA)o&zcf&IsiFAk8zS5WxcAo%KhzrLFx97Fv zded~nhEd#|@z%{O!cEl@6qeqBO_m+|tj$+Do{6!sGf(gpo{qy{T94|W*B8?Q8Ub(S zQ~d=5c%4i|;lL7E{g@8nJ0)(k>qF6VuQ&?gSm26uU3Fr9B22PYaVnHGvjvg~St$xxdzj-4JtJ=i#;JC{G4&omvHYl~s z6ZcDsr-t1#uAj;ca?@k`<=wJAqK#2-RuSut0TQc@!v96u?}O->)O&qo=H#A#=^3^? zzPDGKHwQ-e-m8gE*-MyHdZF3IUEJW_kli|O^U<2WlkABdK*7(Ya7XM1m56b7AIkCat^BDQT_sB1*Gy*C*u zD87f#jHyqXHx(q;3;^$NWDM98Jrk?xCI5CGjT4lYeMWVfe4(yoH^N9Tn6FxuL5#C$i?UA6TShZ~f1i0~@AgSTG)NMNcVgo2z1^TdQj9abwd*Y{2eIY-#u zdbP)4v!Pw4>GF}FJcUHdW@Ag^dE*<7!~6C>5r)H25bI=}R6MWmc19dQls9)J1rd(A)i{lbQn$g?Z{C5d|hx@1H%0fgclGTi4GL zE%#GAi!-c@Ie~cb@=6)mhU8T`>m_&ccYg)fpWF7YEOB$SnvQG55w3Q#N?To7(SOI7 z^ZG!ksK9f`Wrjr`@YQ6V;T@5*mcZA`Cf=mkhdCY8Pku`evnXMCP$#ByXy^APH0{19 zr*jY}FDHiTlo*gPpPp@V~YG-Bf;`klSdGcVIfKR@5>p zHItW#+ArCr{X`85+HW0vOfHt|MXi$Rc)>(4xc#zPO}ORm!&xP-=##~QR8x_;NwhCh zD=!a`zgZLx&XgdtC;6<>X2GA=WYUDR--hOHg~Sk+>j(*E72v?MOGag-E-MX>i$({J z0`&kwy0Ri{;cdOTVjVV8fX;#4mp3UWOMv8z{27jGfIRa|!`HWI;`73`&&PK)8_QgB z<5<`nAM&fo{6H!%aBQ{JtOVMz#^j}F|7YJ3St`$9t1BNf96!(RV@4a$e2S00^Tqlj zHoF;WsKSl%TXGiMr(zXfZbq5rJ`h&4N_?wZsvJfo*wn)y)-U9#RwKoX0YNWKpnHRH z*RVEM6NNArD;qp>^}n|-W4Cb3q0Cc1t!-tF_(+GE9spYUIY;vmdHLA;*Bw(v=`W_G zBqOw#@S)S!J|x;sOA|T=G!dg@LAy!mHO~$j^eV&$xrBUEg%IB_3bp??y)sM2nypjr z9!z_gz$`y|)UNM3!#qi1NnPo~sCO09k*B{8l>Px{!;5=thJ8qx2{~>Hgxym7o6*xW zu~%GNZrU!eFz#!9uI|6~;03)IXt9n(OMQ4!Suh<$+5JodVdZsy$Qt#7H4#)W0c`2; zs6AZU<2fQEUmYD9%hguhP-f=+#ZdTc>*#A@H>@1IGmV#KJ6xT^J^2!+y{hW*phVrN zx%bi-BQkC|>&Zt{li+`v1dDOq3f@oJYbyEKGc4s}+;3(-jVuYt5m&eDS2xFfjisVW z#%@|DvyolfY+y<$Tu-f}=l-MH^1QwvKbe)MH3}SeGRGc^ptK&{pVjScw^~(=wy_he zF8EcO!`2SO&VW@HpcVmi+VHv0H4(EOWVp?&dtsaG@9c6akrWwhj3#~iPZ)=5ivivP zm}PYLpVvD{r5lHlIGSwi9g!~>1R88tZ2WgdLi~_&wsSPY;`N16E`q#Dz-;sfl|ZpT zQ`_t@MrIkdu ze+{8Upx00fkR*GhMG25LgR+I9|HEDgc+y+U9^-F40#+&8;Tv=km+&<;W}Xywu!>nv z;}x}U|MtEl?Tb!LNq=#nn3^wrXsw}t+(R+?55l~pk~^t@pT*FXfi<0tK~H2eFg=+) zt{GpEhvokSJX;!oS$&}c=g54)hjdrwGLx)aKQV#&uI^~K4B0tHG_>q|kRj;n3F!o&N>KptwxYyEokSfK8ndhW^%uT7v z?^~;b_tXOYD!B;W5Z`XQ?M3)4`EfdQ`f{YD*G%arWELKs zIZ4`$j2aXHJyi`#lgq7HDucKua~1kCXr;$GI(@P5l^T?Pz0!g!V4oN{;GgF z#v*E+jmT;-znie05<5}=3bls=>;;hA?3O(Fko!0g8jIocUp#H7go+FauU|K^_x!(j zntS)fz9T8Uo_kbjeOQA_5JBui(+ zwS9E=iTC3c6DN_qQqy-HD8hc%9;m0@g9-aV%X1+#;Pp$QjbjmPld9E2%wZWb+8}y0 z5C)RhZ#|+(1PQN~FWk)5)4K{95RS}vwR^X@k(<{4s^dey*ZJCc1q0$9>sP#Nb4=i> zP_euZ1XOA~_V1InLylCJQvb_CjQ&_rU9?!|-0~}Bm2CW!gH2!n+dM67ZNz-&nXgpN ztzw#|#>+^Z`Xl8P_4feKCy3`$LuekyNB8g&u`JACkbb>*?TCKgZXvOr)V>AFPugn{ z8b5;}FY}LHiW}wywDGAzL$uORyzHbBu{Q@X3;ef(F?*_2)zF4j!32(yt&}@-G&H(d zCArr+`kx8BoRmq@s1=kxeQf`BDH`XYgKS&DFt&8+EM_`QA}wP#b*d~;gxMF050Y@- zEKXcq{VOQ+|2IM5O5lG61qp|~x?Jt1?`6!qa|iaE0x#V?ab#Wn<0}1c^{Qi(mX9o5 z%iXp{FrtxjDWUWIAKx6L^hQYN<<0b%F26FeqsCB*+Sd6vBX}%>T<{b(tRFq3;`!V3 zkCXV&zp_#yvcHufU<{Pf{I|cjfOSwURc(+fGL(1lG1U-gDO5-G-^~Aii2&wajZY-M zYs;X7gBF4Sp}V__yi4vjr&ZM&7Hc(L@EnPrx^jNC+Z?{@(xi^-sfe0nk#m7(xcD1l zUFmHN++Nn~+4gAkWK~*D-A8g6A$QJQl|-E?b1-~G`?1|G2U+gnUc_B*q;qD?Q7iu3 zJks^N@{&(rqSwKl{#hmP91Vq=xSXUI5pm1&Pf%a)!bUZL!(7luwF2fLAHDFM{i~2? z&I(Bz%r(6OV`PpT)C#M^qaI>swhcVlG%Jp>Mf@)OzJn)mv|NtfZ#;FqwuwJ5lsHAj z&x@?RsvU=rj4-ZLkk)Dlj9nXrowk*wCk)w(7ZnJG%&DT*0q~5r#AY->lJQfIRGU^z z!$JM)t?;I${>u;>6&n+auU;`L+b*BM0(jrrJrP42iHRabdQITKpnty)O8SNCTa1P=TpKwwl7xu@5Wf}S^p`Ttk3!%$$*WhRJxY$tN#1Rbbd%- z*A`Jy%VWva+p6KZ8v^n_zg_e0q+g!QG75vQYJ~3wCxaq`Zqon#*Q^utXMw9C!l7^6 z{z}aucbEQW^tSm!-GbSrsj2Hb*lfkRn1=}ITHoq{fzM=LL|NkHuDQq7V!J@Y^<4#H z(An`Hc~ueTF3{O`#OcW~TzF{cI2RJ|F5p+!Fh(FKV0T@Oc2$BFPgPL){!7)L9vyUf zY##^M4V)+wNLN9bApepn9ob91r+-grT}rOtX+6}S{j-A6eU8=PjXe_-f2}^JUE?vy zIwZU<;(NlgS#Q7DQ|uH~UgTEuJQsp6MUvqXN0??P=f}A|MbAE*4x3q z5W}v&#;dlj)er%;jI&(zPJsbMv{!Duy7`c7t1bXZ07{r98&7|6n0 zM@C<0M7+JK6x8f;t&*Hf5F5WPaT9Cj0(;Mj_!A`A{$z6XuHUYCGgIu(j9T;e@RC21 zr^den2+0YONg6Hl8QHIzO0N<@<%$~;F0b-xnw6rM3l^C!f1!&dnnI0nj=LGuAzCAg3R_2WOvoi(dQtp);E8s66RaJCnQga%Dw zaFAcMm}CiSoa+6jjou|+OPwwiJKgTXkN)fxOAAT(4&i771pb;=U=6v{(lso{M=N7Znj6Q4L?`a=U0zQuu7+!3A+B=vzN0^svyvIt19sY>L!*ve1(vbNoXb%!m(k!F*D(L4&%6xI6}IM>~hJ~*r)Ct9i`>ZMs%>ehNB7e zs{7V!*^???_1pEY&mb_QyUE2#H~Nh0+mC5i7F^ZM5@s7^;h0*4kW#)KQT$&nxTAV8afOfq0-efaru~L4>;<(-x+U9g{Xf-r} zUkBRH2~Wc{w*gmV5OGNM6Ea9>Tz3tZ7J4b(pxeS1!}I#S@Oz@b;BObPCy&%43h^`= zewcy}+v@YlF~i#8-y?==H`2peZ`vUynZh)eyX{TFs>_*T;*vY|8m#DgtQ@F#OfQt7 zoz4>EA+@$Z#dk?H3OFBb-c@Mk|F4N>{=}B4-Yh;+t@jl}>DE-`@ER ze;L0e|CGskU*gYv8pnuQeT#9=mOrotvEIJ+2$PY~)N9r_mV!rUrLFxU^&11yvm2$`?AY|B=~q(!tE@;ZP)c2W<`}f^Qw_Uf)Wp zn9;;sGuD?WD@to)%-j%tk%xQsbja_kdDjG&4k~NM^E3`(`_Jh8Bzr=mb`eN9r;IKW<`qx7^Go7TI$btKXO_J zZ8{?dvqDi%-Hk)9oJg*28Q5vm0Q)9Q!YyuMd;OxTWUgC=NruBc1Fd4$nm@k(e!c%X z;QuTJ^k$=*n5HpZZOxFP$X2g#+ry~+8y&qHzyj&=yx_Yy+>62QK)m*E0pK3;V*EvW zY)iZ`VGyRgjSz9*?Q{OFUt}=vWg*|r0I?TDeyn8JV{bllWguQJyChdVw^>l@PZBt; zb5&1==f8x1&qOmhG}%ujbn=IVLN$0gjdT#f2E>9SSfM#q2GdeWTJel)_0_wWJuH)RFSN@Io7T1-a( zeH)PSi8STB@g;xr(cL}xiwC^RFV8EY*KS+jC0n5&hGkld>;>!xyE)~>GSkT>9)@~v zICF{-+V9q<>Zmk#CV$lzx*N>QZ-j*he9!zn+ykMv5;Qu7HmyoFx_Pc0_e->F+)uia zBN|z#u$bAWF2>TIjJ*$(PHIa;HHG!0Fx*s_R{T$ynQBa;G;=10AwWgE7M@-vAP>N= zzZ$oqdCxetE%>!JB?koFiuekTbLhb9zbbq3LTD*R>FmTyRRjg^ZAQm5Yq@#`tlgy6 zRmjz{%_y0Gdixp|R+bc9d%Xy2F+%bpjT-H)Brr+;Q)MRbW=Ev%lfH4k;a`!REh)0Y zlcC1LEz6_gH_cB>Ed8d<@clR}42|_Rg3S~kjGN(iciA8&_1HSkpTb2AJhd*;IMb10 zW3ZASXbuD@44JLWWXsusU2&vwK^KTJUTE|M&F+G6jas_K+D$~m9+}UY zv03d}k$20xh$xf)WwHJXpbE#3{lGlx(Wy<`lp}^`h*;lfOw`Ydl&Gyb845izbfy!MFQr6slWp=*0O+ ztx-OYHse)&<6Hg2UdBuHFY#;EwRcYc0kQKOSC)coFtEc$2o!(WM^un+J(r&k^e=duJof#L z8WjqM?GPfqe9-BuzS{Dpg?5qJt}b?7&IO-;Vfwr=3G7Zwc5Cwaf%@gNF|9Rv$IXUq zgna3do9>Z1>w!gt`gIZlww(~~gY|~)ejX^0lwg$)2?5R0q1}KM9B0iEHcvynUoWJ& zQAlPO_%y<3ZuZ+|JRL1*Uv-tP(qL0vo1{_sq!8iqsI2yeG9t^1@my@>R7!{g%}V|P z$7|zgn|ei0uUk1o=XFXAr@Vvzuv;qGFE(Fg_)XnQRg!IB;-F=|J-d>6G9b6_d(1}X zi`_V4WsQ($VpF6%su(=GiOKjkW$s0RtBG_^$0_SM%&1qExt$Oe+@^O!Yl|2iO{yye z%!1UGSoaj}(+(5cvZ-cI33K&3tm7l&R6e$a{R(~yIagL`AnUlq)EV`i226-z-Evt8R$|#7x2?>c8`E5vSU2h_dpX7$gFN=pTAoP%GlUo$mHhCiQba*wl}pmTFh+mP0tV16aQ;!PeI_x!5UR^`BJ&48Y%PbS_WQPW`WI zM9E#FHqgeWNU6Bp2g;0&9;F3iaVv$hIo0KVWWgD=iX_?1zl(zJQ@5?F^Z%BZAFZUR@=BAq#P8@`)~SSvKlh>FgXqHrZ?CLUQS>rm zd>^ZPw87Yd(hxQ|kTDi+X`Vm;Ww1G+39O6NVYMsF9iH62#5!R4%&Lzckza8b*99VK zBO9Lhw7mclP$1_uX3ZoS@b8ZzTxzTrF6%)eG$y`D_?R6vP@4Xs$goh$!l8wCC5BAS zxweKg3PLiee44+e7ooAbpP^<32Gk9QQ6a_0xrn~f~<+y)7k0zro@Ke9aYw-#g2we5#@O$s<}Lb zKyS&z_tC`73Hp3gF$$uj`zpBk$L!butDEN^jsZiB8mw2N=*I#TSDle-1>s2#8z*bo zEui!I69iR#X3Q|c&}YOq%s8Pq%{2evEPC=f!ck&ok0k21eYPJd2Y>WDRlwugwl2<} zLSu6bfwO>Zqxkc&*erv|#LH4Ib?!ItI{O)AV^@+Hx~M|C-^z7+8cllrde+dElW|^n+g>s;9p#7a#%S2dD zf6ao%SJQp$AfMS@lCoayoZWgZ*M0Z7{I8sVQlfS0LRl=k)wewmp@Fjm|1fl*o7>Jv zB%e>6R*1s3%fzMQaK33csSZpu4hae11qN+i^F`U1+o?L`Lzz2r+4$u=^Uo|wh0ywG zxX<2trNMW=D?dn=-WpV(XW`J;FzYa1zS)DfQjbBU)sZTg*w9enu}(#nE-%U9-^o(@+0f1=n%tmvL#d~j&$vyp9b?LXSs&%r zdBsCuJ$AV87zoQXu7zd$FQDTT8%4(27#Fm)BU}bbSu{0TB83K%d_ecyS83@aXWCOy zNl58k6;Z~OI7vu)CW51JC1pgCsDUv-*e^GP1KM%-gt<)WYlt%FMIU7l}VU9by zJCJ0!4(uE?gbrfVd>sLOgB4NqT*ycH3UHya(IPe9Zt8iM@^RU!3pi zgNi<2h9?K1ZG}t5K&eg#8Pd-DH)NyEa}i=wPk()Pp1B%FnwN#g<=~Q)f?z=@Mb*m3 zc84*?m5hQ;}!CH!}d>R%Q*O3mzRvmdSGvdPnb zr<^jW^f?ZJ0Uw-83}Iwzpq#a<-zZztKABSuxuVh#f{Y48^}1(KUq4go5qAkaRtU?p zF)TV`(K+(m>uYDn$PP$$2xIES7*JX&2p9}Q@msy;Z;IRbZ+#Erwp_bQe$V-L0z*5L z#n{vR(&G10 z8DuV9$;sdSPOHnk){9%SP4*t-f3+CI}x5@oSgi3c3)E@aEfGErN%cWz0lgpPclR7R{D9@?x%P< zdr*Q;<$q?{Z`~KV%?~p2#-^am9X&sV-tflf2tybA-aPPg;y|Ybn6Su9i z#q1~3A9C9xqO-;@(?cL)gfOe`Lf=kfdv~WD9DX*{o7|g{RQ}4X$62m7k-V3`ZL;$* zKnVs;@Wzb-tyc<{XU#0Oe43+tzn(Cc^Z83_YhINdp<&P0o|*KU3)Gyl#rkZl_J?ov zzZ#UfEFcF4qnqi9So)-<7xYILU>N{^wk1!G&d^f2M3<<(V- zjq+WFXjtA48BZW?_@WG1y})!5>YRCR$`r7{)GGmw1LLp^vv~v*SCO%Vm>xJxR+4mr z+y3|r6wFY86tNpZ@dedwiu``f=Lt+5c|GXWC+ASzK{Qq=Hm;gNwW*(wz+b!cG}$_w z<1O(DafX^%Z98=bokY=Q{g$qEt|GF^a5_fgO!PX`M%&GWkpiISJKXrYB^MR69pg+) z6n@__%Im{ndMw8C{zeORWzOJM;qMS*MosRUwRMX%lnsxog!~(xzLrX=#^RqR&tM|Q)B(DDe(DqMGi4cqLZjQHV(3XoLD zk*`zm!y$ zK>hj{Ut$O<37RAe_;mb04dzeNEb^I_Ep88r z7Zgx!37_Svy>5NMOnW2ltLaP0<5~R+Z{a9s3wU7JJy`|JN zQo1`riKH;4_qliyV%9=eF`8|`PtEd>?aW)=7H8$b#GNi3mS2&X*;E!O3R8hH!yH|5 zQ;6CsVJysa=f)Q@3GkY3yZ?JPebg-gcvtf28DD&sPij@KVfo&%5F`){_&#m{8a}Vk z)^E=Ci_7Dsf;L(W(iI!4x_mJTN6)jH;m!4yRR;F~EkX*=mZzx5?peG zm=JgZ(9U(fOuV2*nHmM5i4ICmjPdmm58xush6bPyEKj=&(i0!{7U(*G3~Kj)POAS# zu6u6-<3nz6)HIl%McZN%otk1>Wc$Gvt=G1a!cZJpc$ARBAflRdms;yW+wUMoS+<^`)lbo|X_`=g^O>Vm zAGWE==I`qH?jFgolblVP`8eJJvHj4}Tve>Ow?kAheSG_Y_wOnh+%2%-(Fy@>R}r^U{~Rx3u>1^iEgWBR?l&e57L zNxd&`18)aQHNaQym(@u>YjGN-aT{97DTFxypr}A*Yuk+gmH8~smIX8uf25_;32rnE z;N*|(g0hjXi<<Y=u6jcy zGAb@LD)OSk^P_g%?m!%QKi_n^y2@~NI@8h;S>5g;HaOTdkU)mRuz?K?lIi5n?8FC| z8yz_{H2khMH841XPb)s^`Bap$UM!ufCif`EV>sO9ILYMnn%6M%tM4Z&%R zR52VQnL~6}rZitTLsKYtJ<4E=nwtC>q){{>Hbjth_x6ha%Sg`i8ddb{;!Xs?e)u2f zo0hu3R}Xv^oY;@Y_KmMxy!$xnD;R)v+ov;9j{AQO3P36z-yg88(spgVv@BX|J!F+S z{->~5@Z9w|#-I~io;C%10k;pj?T-OOf=EhSXVy}2^^xU0nb#u?z$zTDdT$!InAw=A zh`$}dWg1~363gC&|B~18IaV#jx!@18-|hVf^jHe}Lf) zoSe|H8;L=uOfe%OMrf}=t_Qtnk^SJ_4C9VTK2jcl2AsTWaV39#aJkKK{0^!-VrO-o zxOG>59$Xo&K?i@C{>2sf^^0d^=0=aZx8A2Z&fIFq$jdJ`%>!;dkg?m)go(osOsZAN zY}yLv+$UhK7X8nyx3H0mMz(#EJ}#1uT9Eu;pxx;+mdQ9m^EuGN(E##9K>ukdKD%XE zZ$g7{V99PnErqotkw)%ool-zdn{2>yg7`geN|J-T&J%UY#gR&#q7wRU3JY3p`YXU;U6j z-~p|o9YQ(I z@B`{oG2x(14tO)8mfqT;Z0MMD#0W(~Ev58lE`0|gF(*h)Q-6z=i!?ID;;#}t1qH=a zyEF$p;JEeC5*x60a)bt=?5@IFs}X@Z`C1?)&X`eh;gcld^IgYdCmbrcBP93D*bVV6 zTnhccZVmclF_Ubes7C;7mXl&AQJyTsjsoU!KMyjQ6DJ>C0zn_owx|KzV>%Ld$!^s` zB!D(Ry6ElzHV+9vKbZouuQ0D_32bveHGscp*VDuHx+O4=hsS{cgjoDkIi`T%;NZS5 zK}tEc6W8mvV=wV*x}UK+-w)!7<`3b)UuAdLq%(bm%pJR^vwEstWj87vZdnc!OeitV ze7@=YFu`_(8U0j@WJv{}-G)up`E4;38MD>$15(YA>GFrFuhcCRGNnsbGji$X`a&!Z zbtB*2&p>&FYj&tAGGQk1_7W=D#K6aImp{d~1oQI*>~PKJMQ&%-svoxaB)=*IKWxqS z0-bkE0n!~y+V?lTVYarOYE&VT=0xTP%D5?l00e>gVL(@H6B(!E7@7!*ug|*Lr>y?> z((pD_nSflXwy2x~uU|KkiZR&#JSXfvr6BmkC2B_x+^@&Wvu2$Mh!kQhEhREkNMd8h z*HbGV6?x{|G|=_Z_@or(R>s*7WASDa_X)_OM+G5w;uiRyJI?e#JH&XNScYBo&&e)9mqkN&_;F~fkHk-iq71N`0*23rUZp+Ui6y9vW~CCP zfqI5zFueVjno^_*Y6un+G!zt0@lNFdp|~6x7OBWtpYai#ECEI=T+D#*0GUl?yh4T@ zwM{jr;@ocQL0el&35qhYLNtONb-dC6Zt^Bjx-pRyBg`i$WDaN!I9clG+(#ltj6~cA zpzA!yBw$~>MBIFn<1zaohf~}4fboT~2^y~PE$=4B;T$1buj$$-P43wojbVszh0fME zt32LN2k+S({WuxM?$LFAC?!4LL|Gz6cc&=%0G5AE>Q-S=-3D3Bg}{WgMZ5*6H`pY; zKPOGf-@d2XSlir*9$B5^lvPlxO(8-%&WEG;lHZ{ioccM37MV|tU%o{#R54V%P<(|_ z5+NLwGzoH;1P4-4#{=jAzzQ1ZC#R{PzIa?@%VK+dei*qS&uTrmnu1JSh&3`dTp_4Y z{*nQek2%gwQbIx^cSf8~Wm%>)Z~!w^0`VAkE+;Mj7%|N}1u?A;i53AN{8Kvaz;`0K zq@i2`zUw+}Jtj83(4l4!3;s4Cfd6gcD7xV{$5;M% zU(v?TXNXk zZN8fbN!~wuw(U%?yMNM(c%3)hlzeY&V)6R=EGeeHlz3x1ex8&Rf6v zSBtkm8HAbi)DP7gJJ<5dE8=%kbMi;M=u{(;Y)HZ4KmWRns7LgmQnG?Yde5&HwsogjAZo z6Yd_@8 z7S2BRvbjOhmtzy%W%o7e<ZC~nS`@8+Oha(a|#2ePv$txD*@Q81inUP!pcy3fi*?;Rr*qB+r zA>z}9skW{XcmogS!k0lifgQzY-cyMH$UM6x`Nka>rFAMA6kC_|} z?WBx_!Bg^$pcEe3NillZp{;x;P76TwJTr)!${CSnM8}loyxm=qnv#cPTXKCN%^ZE_!01L zaPHt%;k)s>@SM8Zl9q@vUTxJe@mS~UD^BK2!s}pMvBIHK4b4_K_Gx$L`SUiHp6qie z3adH~6Kn`nu^3s0xlN{J2y4bcl|y8k|Af`UO^)FO8lF`uG9|NV_DO zSp`bp>Cvbh$*A*AkN@kZkDd=v%AK2(CAPj7@dAfw1nfEWRmdC3VqW7ZPZ{Lv{sADJ z@=dFwChK0G@y&u*_(SM)UUnu=&oV9^r}xp?Pa6vzj#W^Z44z3i?XrC28){)@I~N^q zp=RIg*X7IX!ajUapd^Mw&k5qX_^t`+aD4<=T>xA(Wi$-@0MtNukPCE}1qY_Q>8G2G zz6U9P^$4K)--8s;h2f7Hl-814YTOsz^$A(_t+t2N=I^_GW!n`uCf5E(cKdGVZCb!l zi~vDm@)dChnEbSe`P?M^$kdAPyj4f*m{#Dz`$MKyKFq*%k)h&_L2<1|Dzi+CJNPkG}vBAc7fNAa| zUD&D1MT})=#FA-kMa<$KJs{gev0(-fG2usE1o#i2pMScf7h({pLi}Wavuja@aMm(J z&jPLNldrOPYv1Kza?}JIkYk0!`#gJMk53Dqd*&C~^o*B~EdJ;S5>dNgrh`|~z4+z( zdeaqND=K>pwS#A&*@Mm&A0|)TLd;wO_Mi+#3q~tO=1vSQgc``kgh_!OfEw=tP+(~_ z7o5kLBe^gHaiCObpu5bOS+T}25`dprv?B76!`wf*!iyg!;`&t+QCR79UwHj{z`P`H zXP$+aI{4ehv|7Q1yZ1popD+bzZ-jH1Cu1mt)q5{~@JiR6?_oz` zsamI5FF)RkHLqQueZ1kLu7mm?7eS9Yk|-{hecu3NGemzJsH0_}gVH*VYQHtG5V6(9 zf`~MGB{xP-P9mQ!Nj5eYyP&UN)kq{R(D~NelIG{yjaLW%kMDB*<*2{ax7u;xr{Sc8 zNf5NCrIG>8O;*akUZ!Yo*8BH|&=TN|ye8Aj83rwF+EgDH{-dD7pL{ z-dYC^dfLel*+jBw7;haH>z#aeT{>mgovdiCjQ7P+dRE(S9VDR+8F$xs=}Hg1p+Ef@ zNG)GXU{aCU?}iO@BA^D=u%J1hFAqr2qPQd{wQkHYz?7KRFcHCVKM7JC5iqGRf$=RI z@f~hvPB+e;d~0JsE%NbiYs6d^NX87l4QowqECDRz;vIu zA@GTo%peM(Q(UBOv0>s~5k$x5H$C^qc3sO zOq1NtU3bH>2 zl!g8L;ar$7NQIHK&|Mqha#9+>R|?-!ZrH6w{S$@nQe~RA5V#1j!hzDavxPvg7|i5( z!BubaohEaFJh}ALrQ8EN0dQ^mmn>DRMuQPW4hmSXc0T0~s-TZX+ zrKV<=g{X1ry_wqlSj+9KbK9{4c5y{rpw6QN!Mao)d2H*`UG)RG>J+!?Uho>q zL|gm-3LuilQ3l3XX+RzWBG&~DL~6bWZDvj_hqYWGg$102jPe@UjFbHlhD21A6z&rF z=c5RlVi(P|n>eX_ua~z+>uczbNuuIlpTtKhihty)7wh*>#=cqme|((YZEojBh`v`< z*0Hwhtf&LLN9lyI&)>uD8HL2m6NRjXe$O3#Xo`ovh(+Vi+n=(nd}8unwii7gUoQ0d zD*Q4g4Hh;`A>iYhj>LfYatb16+U08`vE#C*t|?~KH|fVXW#KI6u z(o$q-14mn&E`F-D7 zf0va?xSsq)h!wg07|vCr9*ycqS_n15|MCa>fP#~yR=$=Qdrv3}zBgD&oNHqnAduxX zl_B2&=Y$OhLWOXo)vNy?_@^SWuE>%)_G8Assh95W39g&Rgb4jffV39h>XpqM6QA)J zVfmBHc6L;9$V79k8;=lUyJlPO(|7aCxkQp}a@&>x^+pN3AS zDvwf1>)zxaS#kS8%9WkQM4ExglputiJGG&pSWTYt>6U1Pz2p+%1Dr!ZFwFTVsO2KfKa(i#Pm-H?V&dLsvaQh z6Kb)%oG8yajeRhVX4**aNu%2%VGF7mOr>Q@@*^6m>9?F zCSzj@BZ%FqdvOzCV!h^VP-|9$g z`MbEiWyC*ikN3LEL!QxU0#qFHY%-+$f?!O{N-n86J8NVawO18i)r^d|EV}Z)A0;i! zp+A1nTP2FGZ#fSKMP@(uz;fdiE(ote?|-;t6Z~>%az)Tb+g}AYboAbQ;-N!KKp$ozmd8(mIVPjQn#m)K*8%hB4z=DEMk} zp7CP>?N60=W?f5hF+Clfw6EEJqBASZ0Pa>&=@S9Wev$&&meBwuE@cX6bGXJ#1JoY` z)lS#}$BdJ*?9(J)lVvr#2#3hUD|~ zRE;ie#jO%yaM+mCS51ox~X(>+V^!`>!L0 zrvOFM8jHlF1Nv!fS&R?CSOu72kK>uf{iecOk+&lu9<+roWgrx_L0PVjVB;b;qgmuG-elexYhtIBk~j7P_}_ahxa z>HS(m8fKkoQ^ZtrAJww&N0D`oKgjfaOe`Sxeb{WjXRbY8@tPM&pv@HUTT3@rQH|Fu zzUoRsLumBbXu7Rt8Y=Eqe?8+9?MI;s^G-)Nw+TC)X4aF>ZzuAbKbGnvb~ArJ_=}$* z`w-7aO`ZD)9*u~A<1zpirXc2aGmIQs+jB72`>bOI z{e5aMYcz{*5RXY@S}-tZS@b~Y<+!&<1RAhJ)O|5wOuWxIxa(ZkX>(g`iRlrWj@hzGuqfb%nl5)&&T410N=YEu?26Y@bWfDn#OHOeX+DnnKto-1LM3=Gk zr+~eLOO`f(cP^M)Oq$qD6Db0{OXPly962Q2Bd~je&Ckg;3hTV}UaOI<4X2Cz?IzrZ z%Tz@^$C@UMeZq^!KLAITDzic=aJjYr}yftLn(6luT~|Zi2-W2f0Kpv8^s{#vA4`E#;A- zDbVK>gSwHvOpLftqaRIk7T&KduM*#n?X~JXk-PrBIl;rj13cXv`dllBK?`36=62cH zi_Zwwd)FOdz+c0EbRFgTWZ_c0mEln*iB?h9PR+YCZas0y4Av8-%*4WR5x|n>tI|6LDEc46UOjL^9vDHERcEQ!!$ofYO}bf|9Z zAZ?)KSF3Yx+v6%mCZ;23vwi%*k*yLgZM|O=ck!PQl*$iKOFtF%TO}*anf!HE3{lOs z4Qc`z8v|yIbffy6=WDH48Na&;{vAY+*JuMN+JvZ)XP?UGWl?HKyk2+q$YCJ(F#yh* zuC?x0T^gA*b@OLQYzR2_NB~40@A$bI%!V@yK)9%_X#L!LNm>Z!%befh{qn+A+=mHX~@qfx9OKBx)w<>Cr$?go`dQS$v>?~?TtLaOr{w;)?1;mqWHKp z3zv5x9txtis*&`l{ls-o`!|@xd!nWb7!94AKNybw9iI&(6DNRtuTSSk8cA2W-j7pl zD+!fJeq~j_Ozt9VsP_Kkj5{#CIrPw7tqGD>AylKZ!3I5u7t3EV{&s76a$LM{0tA`y zTl2|&%r3N|D@e!N=t79&d82CEW8K;1s1dKBdu3(iV9^kpu5|fm3Fd3b7a19u{Gj}N z4Rv+ygDbq_xe7Vn41?_Q@`JYPaVADaWFE3#)51;%R|d^Hj0_|Z35bgN6oWBeVr=n$ zpN!iTg!7+2XglSDk_HzI1Ox=O2V>b78EverWG+jao10C~yOr}^&afe^h?;rkV@O{r zV>j8BA3(4T^m*M$RWtXpN5{m@))vxu+AdU^T)D_XuE*5`(`oh7Se&G+YpG%1Y99fh za7|JA;JB4!4I9{O>gFgtVDr0vCnx5=aaWX?^>W@WCeJ+EAsd)bD$cvS@mw@Mh>=RM{hj&JnTp~ZRcxTR z40Y}Fu3QIVE!`_j@2lL;G`}9ge=4J;S7E*msu9*N{$fc;APJfm$XC5*{w1Nh}dc83_qJSenEXmZ;!~UzizjgF=`Bj8GqS zIh$eA7KHK{c&UHL#GI@c1$S>3FjU%m-6%{A43V&m(HLJ<`i{E~>#Hi@0#UIzzp*~V zvC}k&B$bY<(Ej-oaz_8fw^G6zKTMTJc79B|5eG#QH%?NWee}1U6f<)Nc*_*-0uV9* zsWw5JaByDKvlN+iI7iOR=*BqUu% zybUG5qH=cX98yPR%B29EQ3lDdPF;bvrNSs;;sqihQ)(zKweYlP1I=L?jTMzdfz7RH zi3#fAqHN`Mr)^NqCG1}d*b1fQxcr>pS_mB%$1=vo*BO`n7weM~+s2zI^W#t6D|aK` zw?dK9LaR;E^|?#&j7uGT6Eo)+8A(KD=NY^KGM&Z5J}MXhb-BZHFwy(wmD0$+zuxFG zQp<;UY7z!&0eGiM#7asK^=8urZt?c}){NSgHlLyWaznWXqngColryN*BfmpMYK$@& zDKO>a`?J_SCfZD2OG_+h|#}fp%*TrP0}>d;IK@f5ZJFF|6D-QPcS3j6eo#4Vjh?fq{a z($D#sVv(S>0&=yeQ!ydqogW~j@szp`kvE&+H?MIwNFUGNq+jeC^S+SjXrgy+myXdkE@CZuX+f%T8@C7$921UWyXub*-C}*yB{lb**{dTIW&4 zCsLnxRNC;Cw)EK{?JL%A{4)cWox5kPmHVhg=Dk?wvjr$XN%-gWwvd=d{FBl7MDyD| zSzEt8uUFWsj><2cI!mZY?lBX!A2c>P`2LAZS_7f5l{H*7#e-w+UH#WWF753u-@7sQ z%^cI}&E~+#S`jH>#yUNdfgBjEbs5>ce4e|B>yCT(FV}1XBy{GTS;^>_T01gLTU(}D z8h@fK$sSPqtaEIlwC2ehA5EUK3nf zE35mO?;QefTwYBm*dYnwkReji^+lmM*uk*L6AX+#>%~k@qdqSOW$PZkg$G5neOgQy z7L?*i?fW8|#BL!qw_eMv8>kykg!{s7xSiSA#{H#kb!?*ZJiOROeWxE}FLDYmej*Mq z($g1LR=U?iCt=Q2XmxU$k2d?giC_!!pf0HBI31pP01J0J>jc&2Ln&UZV&IykGuI7v zEi!W79m8T>Jv|iTJ&+n;w^BcNdo$`JNpemWw?K!~O&d*$YP@?)4D9Uhw`MA4@(Ua0 zM7EdBh)Ws1+0pn}Rh|1fo-8t8d6?zea_@~rIpB^?MHJj@e-n_^QD54@W&jECf@xwk ziVmm|z#z+*%%Aa0qhEL`44&P;zB?bUjC5fA&WM8*>vSfdb3|9HjyReFvAx=CYO$cS zryg;*pJZTkzLn{<-=-CjkLx%dJFAIpv^8(c?JB+U4&q%c>8X|&MRUw>3+$Jc3Szi5 zyz`)LPf3%L3e;AB#aaArd7hu*1(MCle7y8>2mi&~lD8Nd>9^f2MWV1aZ5&MH{rU4} z3pm*w(YifdzAyiaqZfx_b`prfTJ6{IdbfPohdpT7nwXYLsiA>EE_z~0I-sp$l7$mz zXVPi-M)p?1y%kB#})@)FoMh)bHEdPw~^NET1^&fc{w9TRm&ZXXC3thTy zps?4~i24G3z)59ks`q*jaMp1&%rq|W{CGbXi)gO-n6cVFSD^>>D>1P`_c~ysVzW1F zS;^yMA&xnt&$!HRU0GAJ!DU|&$ou@GHp}!uG+=litefHkaS{<6Uh0RZ=efrsG0wxiPyHL1^W1OC@n=H-VbQ?D@URcvb6J z%kA+zxKAlrUvLnl)f#Hl#p3r>z+aA4AHDg#G4}tBCfDcr4i6U>^H1%*x`xKQ+YEOsiGZq}UYaLS z8eOpJvDB9@f1l4gF^rG?m6Y5YomHDN`FS@TB>7gYT_0n0)KLyI_PYD@N@I|eynNLV zoPmdPuukQ5Jy1^WsqwzI@7DfmmrhKc%D$;tpV0_w_Vv3}&#zYZKkXy@`{^!g-skOi zyDZ(>kmK=CG-A#l#~7Ssf@FD2%k`Kst{>)&o-^{&M4ONO-fw%dQDx#dXazBg#zMod zuCKK!9;Mm)|tGL%QF zt&JZmPEJk`-P&7T;^kOl3ilg!q^5N`TI%b6aqwDALXrqtab2t<-Hz{fG#_BJYrgXU zfrMam%v2%1t$*Lq0qIyW1zZ&~GcynXb`b$?qwn0FufJAEA^`auY*R1 zvY`=i<6WoHWq_2elEUsMa7yMQN@Rx$C4uc&Lt*&zWLY0N`_;mmlpHC?$n7xscLFu& z7%~x?>$xVUZGF?&h2a4Vg?eAVS|<=swyDaa?rP{}#N zSukt*6WDtrdYdx$8l1NFf6JSJ7ail#KyZk0;n%N?Uq))ne-N)0At|PEALhl1mX?>F ztatjEc5jUbQv!~H`bJ746*#si&QNme1ICgFiYpxlfBFaOn zpk|@;C#)7IFgyLTI$TWwbfm)Z=t$Cm;oc@Y_EI{wMyS zF0}<#FE?{aIx~7yf=Tz*0gqMNN5&vx6C7GP4Y|}Pr64x`Ew;`~kL%p_5<=S*pUxCjb32 z*TLU!%g@i(sxp+S|Ndyxt(OS_;%!#|%wRO3%gI8Gi1!_RWNxXAySuxlW|EA~*8+Qn{>*JFTwvNg&(xHi?Q6 zvo`xvTtCKY6C6O6^Lo!*TtXj17kY)OTKiSBzrVkyUPDh$PesK>2-kXmlWLs~c!C(NU=K4ak9ko>;rhV-gjWpsM7*TgjJVQ`efUr=Kd) z@M{wl#9J1h!JVo{jgnU^?3WL;?%vrlQso)jm{dqf$IW7EsU1C~K!@)to+_ePd4Y@a z_}H56YiSj$1Q(u=HbRBN5koHKd$PdMt;%Z_fs*rWes-225}UzmbeBMDIghTXPyLz0 zY+%8VBgYKMtlqQqxW#jrVXt>*Jj6M!nFZo|AkFQ2I`IroeQg!I&BX?Y1f*Ed?fg(wNJRX@!O6N+VL=4E~%1CzD&%fwXt)+nQ?@sev6*SKt=)_GS~FdP;Joa-u}3kmO!iE+>D3vgd4Po zvunnfS{HUWUzKHCZqggd!^amUk+ZjlSP^*=iGo0_xfDK1f-L?qj3aN2(9%QURVyp{ zA=9Xt)pV15t_ZBayNwkm1V#gZ{Vm1(&$Y#AD`aiR&k8OsT>B*cp7%;(uj;7VFTP@Q z_vVzJckZ9z^3E6Qq}xi^3FsqL_4UiGQ`gVe+q~+OhX~B7`<~+Xo3W(h$B-`O?h3=! zN>=aRz5(8Ucy<%AZZiUg&&6cYk;%z5+(F|`BbZ}Y3||?wC8L;1j0nXa*O{NA=*#N0p?q zHH#2MABv)V_H>bt!R5S>Ow#GEuo)2?7~2k>jFWwMDG3EBC@6@0yU}j6&j9NMitYb zv$|>F^ZCC){Fce*R&qGGfpzY>2~xSz*ssqA2XzVGlwQOi1Nml~%~{NVNHQ^>Ese)> zv@*gb8WaQcONcfnvNSx7K1VLL2MUVWtTrK_jSlCFl1J~wKIvB<18Ywza0=jN!LuU% zCP_O3qM?0@Q}I!I5FIRlqMsI;PS@;>M^aXwmDK@ph3z+g{_6OeU{bl@K$>swxDI6y zo*L}?ogtOpTo?@9Qi%W!rJ?{~WN?-bukD=c776M`3Xkp6aH0c0d@O#Or46pXk@~kf2Vn__YDx)d`OKIkQ`Fmjm3>R2>7;!$ng&-?n9^KDF$^nn|!>& zP1f41<&rx}taT?cMd;*HKFWh{Z*QOPPSeCZh$5bTjcX5%K%?)?0T_LbM}6DqS70-QR^k@KDILW^I~5+KDd=J zr&SIw@#}o00VKD?p_PBwiel@NO3BTo6bHRV)tQwY<(cBJmMPPlBV@9h^bGufh#yNl z#$7-WHvU*;;~>0M-`BxNcD831olJ-8B&xy#gFO+PnuE%=O3&|NVqJOYIQBdKSakQ6 z4qHZNrIF(t_GV^z8^lxP+zM*AptiSgEUJ$XY9u1=WFI)cPb(BK?F&C$ZaiQ5V++YX z(_J>5J{&IFeQ+|D5;?7mOC0&jaxtjElXImMD=LKb@%=xbx^8#PyoH~FVzWfIk9-^N zeJpS8GQ*6fnL6J??$w#`9gLkve#alm8a``zozV5i_g@c>+tyV)tkz9W)uW%T5nWot zLI34pp|b0)H%6}9GS?p6!pg1XKg4H_!4+lk14`$X$$@eo5?Y->af(Fo+uhG#Xz?af zo>_TO&Y;p#(+8>(&&uwY*D=o7`o5LSPmnu4>c*TD5!Ynf&BMYWQI_Rc%VgdXJ8ih8 zyvA^`UBtdiQgZT#4;qd4rP3DKXX^ktHOAlGE_{{X%QBG7allOc5&*wTDnJ3B%5^;ND84a$BX^@d2 z%p7i=>r(VbVgo^>6oFu~K$^GChl$CEzDgKVt6|NMDL+^<+ERb#9xruT~1b3N<_(3U*Hr!R}r0r|EG)Z!6b#k z3}0$5{oLH#(&snx)TBb|9&Qwp~}_9&M72;HLxnb z1yOPE<8n)dbD0*N4L=W{i=sv9{>*?ID+)sFAo)n=+tu5b1bQ>37m{ldY_g^LJQXQ5 zYi(yo!eu!+qa-HccJ%K{0xcYLK;ycv5FOnh`aqseEBt1k*JvAYg$P6ofOt71Sm;1q zTKSY}=UrkhumX&SJycY&o?L!9{}-ib3>J{8<@c zRUEwGP8E9CCPc)<{XQBRAa5%>J5*R`r{;t(6t#_B3_c-0#dQA5?O3sfb{>ddd)rB< z7zc0$Vqt-S)i?1$64-Gs6O$arV8mUA^$wp*d-Zdz7{3lbKl6rV$a0j080?(a{bV6i z#2cbZkFi`oD40fAd5-z+5m?@LR^am0=9wJ>Hys>RH!=OYor~l}idY^KyQcLfy~!*x zhcg-D!1f?IO;VFciP<10CD0pt@$`+<6<4L<~Sp3RQ1Y5>gsrD+CmeKeQg~rI)c^hG5KPK=hv^N{amyx z-lqmrJQ$>c+$50s`K~Q*NGj&8Z0du9ZlIwd9YeCXvZAk|qGD+13!#x_mvNofr$Gt0 z4-^xEF53V8>}}3Cdk!Fd`l#3Z(A^Z0>G0xy@#|72E@R!)_D#o_Zo7swf>iW(uxJR0 z%Vb%Z8B73VbM=xE!jX_f%^f|JK_wu2ND6g|XOXJ{B9ZD>bRDAS2e*S6#t#pYK3{H4 z9qBKL>|Kuy*k*+UXO4;585-Cg31vByYhQ%4Ui%N8A$>7WzKk?m!L|#-h^;wz+g@u8 zZ=E(p!Vt#gk*&P?Ggf4wV-iJq&DOW#fj$z6nV1r1f~D=OAcy8(;u9ne8%V>k$}yEV zzJc-YIjH2juIUifXpmZw;^}&4Cjri40{mAEW}km^bAq=)i0kFwUG_$;dGB%Y@H8|v z$I}nn^=3zZ8)2DfR(u;lud|ue1F*p}4dWYU>ET%DVZ_A55yjcrpFI70HyuCzJj)&K zGoWK_ImqR)odY2LSJS}2AkxXT?G0-xD~Z)R!)0w{#m>7LWX*MZFO|@a*)?rp8-_;g zzGPj5)N7`ure`7DguWO*@IlYVsq{>T#}! z-&kH=Zq(^3aSYknrJ}4^yW1kffpef)=cQqISw!tJvS)c)dwD6pZiH5TvhH}Z>0`7~ z5;sOP=k)&RQb`|a%rJ!)en^p+mB-aT(#Vk%{1%y>Z_R!|d%-b{$WU!YkKg+uG|T{!$Fo z=~!w>#qTIHIkI#e_~;bXTiZ8BV4T|UI^xsuVo*9!L~Zm-&{_6&&=&bc+-^0Fcu)mt zX%cdK+7CqT?H>N&`CNr@e-hLJJ)T z5rvxMuhXg-AJ+Z}f=9y^WpOGhEgjxF7Y~AG(QDux)+UptzUyjEW+hfwSUlF&!m7O9W|o=03dJ%bxu%v#srJ%p@V2YD?)Cj;A+CY} z8i#z`QJ@ICmNrg>C}GUKWn1djqX}cEit3vFe5FiKajr6@w8a9_-R21N?04MeVw*fJ z`}d)$!6x~NOH^F;E%BNBPU@zdZ0-6S;Bjt<1kYe*^sU)+ZuAY1GK)_G?X-#YhrMkK6pp%6Et` z#Q$32_iiyVXDGNI_z=@I#luc?aZQnDKk{DH7It^|EVWhjuk%62s*HZJc=<}!m-k=; zhC_(BKP`bXF@9#is*~&fiBj=5fnJu_%hjwfrvrTh2gR0$r<`u=iV)Ps#mM^E{jA@D zPThei>Ynxn$?9mvAgTODHLZr0)KLSGGGIdj#e8)geXaI&mg~DGLt6((?nkTK=K8zgX1%^e3x_->f+tfn zZ^U?odpE?i`X4HK=Zxlkan@}NR&Xe2KA?Agzl|s+(_r%}W0?ZWXKi@-jh~cMRd^cd z*QdyQH}*(KciIe=Ph;pjyWQ)Y00>L~s`S6wGvKM;gSg9~VOS4tRYh4ReV0Mlc49R& z6K0?BzPUZxqmusXtz*jM_-faBFB8}}iI&}uRc$8a@LbQYGukcNw}QIcT)-VC;u!N7 z`P;V0GOSk3eNOy*;{4+9(lexYSHa@TVEKjc)+~=cjlEM9EP?)Vs`sgOx@iig(RoJi z*Q->-u`M|!=Y8`YFZVi^3cje4=;X1ixC8X)ALcmD+bhm1)Bw(eFbkEzBv0YpK@O{c znBZ`f%eZq*0=CDJ1OZh96HpzhbKwH zAZq+9T#xmg7%JBcrfdVePsJZ_8?lr6e|_?BAKiX1%gyJR5vBfEs~}{iqA^+nBe+-) zZtJ9|&uPoK1twOx5;RA!bQ)3L?#1?!O*p|BAQ6{bH#~j#xU-shqUsXMO5Ke-?Hiu; z7stcO85^$mPY$+I)XLZO?NtKDgBAr`J$h2TyOB0^e2?27Y)U4;36X&L#PY#5nYF7_f| zAZ8`uWr)+`Qhm0M%J)vlP!B?kT@@q{p02({oo8p_z#6o%kO+*JX38I|UQp`=TbB|a zE>Y{%lTekk2}i{<{x~qGvaZe4M7z>tW%$iYXoUI8)Bf~-wE)g!l?f8>cftVUU$8`* z1WD1!H`I~%HvP8JO@4t0l@ZVv0bj){9fqKVzkP9<9WuFk`9?pcD}#R{QH%4+EVle) z$6Ll@9Xmw2a}+sCs7pA)m0`KVt%<+K+nK%mMi8_@S531=n3gx`+`9Y-4C z(qPs4MRoeAPXP#d=Ydw3UASgVE#2m38Hpr3{+cznS-Kh#J(XKU-Qblt(jXB* z1u85g9n{LvUMEU+=0wo5fk^<1?TG$gRo@xb#P_s~Vxy^aX(GLYbm?6Py(lddrH3lL z35W<1kQM?+2_*&)=@>w|bderz<1_rJCMzeZ zT8si@iR`f4vLI`%yu~B2{@3;Pfy|TkhQ5hyzCPKm$Na;AGub)s%;yEm%U7_(LIb9$ zui;s)c1vf%va14YJo;aRfA_ppM+pmR?5Z`I=vUVW2fcdw>o)p!O4(v~(xiK@8zV$q zlDU>JN7#Lx?oZd|^og0d$ISeCY-*R>rUOkaF4^UcqE+ua_a6gGE!zPqoDpY=*vy~b zn=P0U(+$H+vy;S_?t=`^!Wa}RG^0(&q(zF{Yj@pogwOh^O5TUegs(X|g@XR3%K+Ku)TiDx>uI%i%ffrwkij)wFa28G@l8{A`LG76qB zPe~%kb&_Qwe7`VqT&k+S1F8F{V!<^7V$W7>UhR{*WPNG)IB@^?`@O41<+D80&U^kz zm#F%sR;bZ!_5_xUBo5FNYy;UxZ#spbph^qPW+(3l}Ue+!V4BNZX^YCb4GQ< zN*Efv|IfBzHH}{T)?KlcDM?Bp3kz7hT*V)6I6w?fTwz6x(L66|fAZ;n8+=e>($}3x z+aFs|kYsoA`W3B2Dt!OX0+oQ4QG}Rblt=i?rD*?p`aigdSxfTI07b z?H!0IUN3%vIX;%8)tI`Rn1+v_tkIT^Ilw#y&HcAQgeo{W6%7MvpvkQ-maZ@V)~n$m zg4WdXJc1V7{LLWLmm~s9bP`|5Omx#!p6{sUky^C8oaj7U2@i_RW*)jrmEp$9DqzR32-p-kN1RPqrEreWbGo2ZX>B=y?d&4z?>?hP z#WO8E|1PAVDd9@W$fgHcSEDQTqJ5_hr>JiuUUp3CoT9ru%L>Z~vcoMQ^gZ6SPZ7i1{I&(w~tG;up`8O$z8tv?cgEYO|ymvS`)gcwKi-T7lI!OP{l7* ztq_3KyBAnlSf=5s{)%8waq_c_acZ`H)3Wq$8?abcSBff~9tn^Jm1_6F(V~9B0{0_`}8{7wEhDv zG81Bc^DN4ruZW}B!#`P3{bx;bnsI258Hin)!W_J&xj)AQ>^EVa8IGJ*;R=*-EYfvK zlJ2>^LE7nbNr%o3A31flEGMrvA=9%KF+At`T<-GemF_!N(V5_(=Whj%DrKg%eC<9- z`zow}JsP)DR!3yqEMa}4#Ael&HbDQ{rkv=#>H3#t#k`ZF0`8m)a)D9gLExA~#7m8N zUJ$WN-kG1j~vM3;q5zyl^%grDp!&v*r4;Y@w`kre%Eo=7991VNwZu z8J;Sq5l51vJPJK3*d?MMVw)PIf(9Ijm%UikVhhP5>XIHlHg;yQd-hu_k|!m?j;u7! zIUNq%F*lw6U9C2U8u>1|q1f2UdQm+l`w`jTq4iN)#qVK?L}eeMVy4jOM-AFkZ?VDB zP`BTd={uMyQMVRhKlG9}9v&7Gl@nx_?r<+mxh2;Rsg^j9yQ-R~zFc&pu;bg4mN#Nl@QQ1{Cer|uh-r~aN=MPf(S ziV}sk7f%(JHJck-KvDZ=8+)rXoz7fk7A~eHV$2Ylo}NA*^&fIrWHpK_D?vZiu7cy} zqf(HOBdG2Q5I)L3R3818Zdf70U8u$@3EgWLn-Ad{J6DKOb>srbHQ!F$`OVn_uVOrM z7iRpS@&>!d6;!j>QMGJQFL+or>S0$=zYnFR`l_!jS36!R^(qfIssG^Fy0Q%@40H9s zGSF@9WV_Nti81__)kHAnXzrWoz$O3D$o>_$fq)L9=}GClk}FIsNJ*+$Amtz9zsh!g z;aSmFNr&bCvW_zBKU-@f$D4Z)N9~6w?WmP|M(C3=QLQo_0h_=L96`~y??}kGdJ5JQMak&(hp$sqJ z7KT9&Ape}`pEy)q^NK0t(jd_;;6^J4Yv49w;%B5t zt23P&R!j}COq?6;C`eJpnvYA}i?Q)9a`HpWMU;#9LEzs{<>yigPpz z4|~wDo(D#y#S7URd}_;13LB*Tnwnsw94OZN?#R1Wkn{q_2knoasd9GIR*FGW=Z#Ht zfSfJ#Xi7i%F_dpc;ydo67f_Lzg9|VB~%CLo^?e3t3K5M%EnTU>7BF!BhU8weG zgPgeMV4+~Od8h)El6bH_t?w1WsoqmgM_T|P14X=WP6NfP8@6P?{c2%;69g*TT`vs$ z2EUT56(`^%f|rq7{XX(Dz|Vcakpz`IisxtdvwC{%x=@CwDQ;&gX4Q>R4)D(n;49Ju zw>{+G4{{#E4eF^Gi61n_cCFEfmA19D@d;imt&J5=eb+L2k0LC;^skHahB4$gKR)Z~ zTo6BW9Rl1?jAN3isi>#`mK;PTS|9lVzm=Q%XZ78E)G6S}%j!FpLJf?8q)bZvT?*Xd z&;tF3?(3)&@`W3+SFoeJ9e4+IrEvm-mbZFMLk`{Wj1>$qdw8Aa5{|-o_D^HUSV8C>>;;Z?3CZ0(48YaaBWda~L3yx+QUdnnr1rS!)zdxt0!T)|?6N}X_Mx@xVekRM*UPI>b>iWY3^T_qt=HIknQWYe^vxe)ud51qYV49R z^7;8VIUtg*HgRYT91S~y2%n!4clw|IY4NrOzH+d8U8nesSI?;?6x)wRyzeK?$M0%Q z56dM3=cu;K&a>Kb5(?zc2h3_mc)s$z<|B5kouUF(4Eda&TujSMPdWE2Px9Kanxf?cPr^GD z;L!~(b)7%CO5`k{xXEX4-x<4tK4=)Q>wq{D{Mjwl*b^G31CL+&9UdHP9LxlGTrfv3 zZub4!{Pk=7bU8g8cRL@Km5)0&a`8peplRhc!Jel?pA19(K_tUMef z2VXd>#(fgMSeT97$j#WS2}>#75DACb>bHtAKGr&??iRDk!! z-*Te!ln(Ln!Zl+*wTncUWc;9|@wji(X1UiE8~osDs^3YhF>8{B+|hWQ_wthHu6x&G zgO8)1e^=UW=jG**NnltcfLe*ey!ug;KeDq`S%=wiF9{?{3i2Kz(Mpt1npPrq0)jUM zEZX3UD*Q+$YlA{{4eYExm?jLL*HA2liwp~0?`WC1m`cd*q5->BcG65c*PPu`&{Dk! zp2Ny~YT&L_zVJtQ@x473^5Lp=4QBV_YuX!|1=cPO=9D}|-&K(O5D!@JW-aidS{=Hw zC>i?q(1WRPQ7mNdp+I3n^yh^~+eIFYswL&zAqRRFZQVo*_y{5S;3Ki0^aKQo;*IkE zSciiL{$jk%3!Aqw2=!*ChuMK=)w3tK*+Z}EM4dpdSipHoum)IW*VJoyMv9p z<0M|8VELxI23P?DY^gis=3k4(X59>c(&kLmtf;!gAl#Psx4Vd8_H?{>@M0`YxbP-c zrSdIWX~1q^@~1LyvqjHlZvWG51qIE9GtGuE{?eUg^vCpZ?}_d%KjssdBhtD>1>_?I!kL*)Tc(^~EgW1fw> zRp>U$mq_w*F)UZkyV`h-RF_IFtF1s?GxPH%24+IKHx5Iku;*wyTA6_T8i}VVI4XgV zuspPqfPerG$KviW^55$jaUH=l5{7cquE|GEgqrblqZMQvvj%Jv1J#2SDK1MPB1UG* zxN$NyNUc7^KPun;2{+5)^Ij$S97!V^T@s(SOvddJ=n{#hhiSXgEz;<+eYYAqA-Lar zGxN6}ixyyqHp4&b&KJF;MD4ZsXvT-%I=HAbtw&S|(xPk{ve*84w=de1zip9P{Zg0JDxw%5$EhVWQYfW*SyUE|6a3$ zj13Si{0Ym_V1Ia0JMuVGDRa&`$6(q3oBQzDzfC2PEX5h?nDFrM?Cgj8HQbj-0^n2{ zibr*1(EtjD6kWZ|S>Sg7sL&|hzqwtgrpo5{(7|Cp=+^@DV#o735zuKg0fQ9xTAE|C zKCKJYuMyUbp%6*Bn=N_jMUGNSIIZ`j&3OVe~*vxpBUjVsxK6PX#GKIrg zmTq&s3;KGCpg$^XQFTlW5>aqpz@cEh7-jVbwfmFSim|rfXh4f-govG(3a#@A)YaQ# z@#$^1F^%E&;;HDC>vlxeY^q+l3fxZ%?w1*x3WvGR7FdM-o1U$?aX~`9=vDVxK4)-Q z(gXYY#ZgMHM>FgB0xmrK8rnZMuHk5$+fl^P)t-ggS};0};uN2Yo-RkrsGw6#qGm%+ zhL;ugw8c(**De~u!sbRC0h&+X4$9?y+wq^GAlvEgt=k!9m3@lkcdPVV&%9QW^~x3T zINHU_BxVsY3S9J9J}JXo=@$W z1oFcDg42Ki3a}>N{cA1i68H=UUte)$_I$h6l;>;&88I;1C)JjmzeSxFuyqG?HD3LV zdJeq!#_3yA`dEQy*wSBV3*S>|hU>jFy-sSQ*hW#E&g%0tx7&~fQZ0&715O3_bQEFOB}^V& zHj4fCf0D4Pk^pb{1%QSCdGmjbBKq=k^d%s!nxPJ4By9yDP-fEa<4edj;8k4fQtpit z@SfoQrSw(vpNcDKpA0AA)(CN+4`)>RjngY3sVgBTqI%bEp_XkzDxmc68=Cv2gh|kK zXNjDN(L7ELEhwE3pp7Bo5sPx(D^up1zt9jP_Nw%iZw*dze}|TMOjhS+kSseLWWfp_`rDbIr{v9Kj zdfSunU#adoBMSWaV!G_ml(LmH3RK|In;sSu*Pe7c8Wv3Tz$iOyaD4iUg=++gU`?8@ z_tgX%@4q$s!bFZ~N_eM&a>PcS5Ht-^XY|0%#TITEDmk3DygoE z7C+-xuqcsMliG#x*#=a+A~KL|dl1X~164L!(TIeeI0q{O`CF37z2~l2?dQk0xT2$d z_bb7ceSSinn}d*z$)xoSor43;jkzY7emBY)>d$uw#CGFW8$oBbO3Qal|4s^;befxI z81dHHs(V2o;~&h;8==>45!~QPu1Ajk7|Ys8xQSpfvoJ1+brKNh4-5%a-_p$o|C}^D zX$on0wm#oRO1^)vA$+&+({Ph2Ix*dlC1f}xNJmGHX1`|saAj`ykLoC`Lhjv>UE4B* z$XBmv<47iTTQ7ogbwEs0Mu#yPucS#xQ>S`g_0DovJQ!In(=;vp^DfH%XG|mx18Xev zv)Pt&_$XFKVyiJ4P*bHoOIvAumm7e;R81mP8@W0E7_jN@7+KiO_v$o};_&#asUN&?VA= z$$!;cQQ71z-m%6QvHgdos963|3qdW_zP3}l=*eS65wMjfm{qSNW#HQ%w|AXE&$Il2 zn6~i=95m7#g7;%J?=4T-)>RVxMm%g=I;q<09t~;svZ*XS<%l^O$Ys}mXR(;b0tSMC zd(88S$Qrkc(SPML+e2h^Zs5UxD+$o}Z?VQE6Py_9B0h_~f?OF!Ue&K7KX&v5=e|Uo zBk$0{0a3aiHkJ2bVk}by*VT}|=ckWlX)ohJr&e!aAo`N!5f64Q1w6dk zIeDjtcfwm3Z+>&I6R=m}Sy^K#{eBC4dA{x1Wd}u-ItgLVy?;hp>Dvy6Fc zfx=32+llO&WN8l%Hq0zO0+mH=T89J(6qg^czKyo?Zgd`4+bXJ=#jrlWbgxmwA8LJ* z2^TvIdF=w^j?eF1>v(U|$%_`l?-!OU<-p}3Ya17?3$(P+3&Zd4O}D9(6{V#v(a}dt^$;1ur?E@|e zt6Z7UUSg}BrNuecKL*5q$MB1@%>O~+9FnE-2ds}88JmNTGRs_~7^RN&#e`Q#{SPhp z#j9QQDUx<9e$nFU5_z0bb}Skb>x!0;K_`9!D92-)`ehr|wb+eeS{ARlKnDj2W74Wm zDlG72n@l%;jdnNGj=vO83^#ayH?If!|y>Cy_k`Hm0sMpZD z-P_Y)llArXA$3KV13|kqyM* zr)za5R4+MQArPV@i0RPpR?AM`YRvlgE8Hg=svL3i=rR^r`$K*!zUjrT2Tgkf@6xm8z+5KD9~fzIbWd7rSvo<T8JNYF0MjzIUC-C%!&j+?W zgQ#Wsy-M`A3N|}wIUMbDGDwdhHF=Xnie@$~JBPJc4o#>K0Xp43!BRe*I*SW$gbkkW(;<19icuGce=dEY1yy7foUyu1Y zS&J48zna)UgZWt^3!BA?0z+ON_%cCh?_DR5j%l1L!;!Ae?&o4MVS?CFW}nT^b^{6j zRF7mnmUW$>SL;lh0(vS;pZM;kJ^eFS#6bH?eljdirp|tvZ69!t;6cZ-!PgppEl3Fn zu03F22)0>CXAs@0-S$TZ2{yl8B~FqR3rLI>v}{&pzkQF19hN2(N7>WbdJ^q)n6~+8 zQB0>ri!VLyuSJ&iV9;dhl^!*2>n1!Nzi}oWJ0s2KwETUz2YNVqUe=U)7CxwJ6*6($ zS|2R7#-gy9b&Ll)q2i#ZPtSIu1*uc=kjIfoWU6^8S<(l6=ze7Vm|XKC?o~(|zuR zsD*@@xd)uNk2Dm7c!0~g6TpS@U#2a;hGv?=?ob-gLX4&&!BaPRWv9oKC7);3P{(=v zig2tg8P^o6KbR<{A1(TZ-O+Wj9sXhzD`38K{sl~aKN89g!K;p{iRkpUMC}6?WVuI2 ZVLgN~_ytL=K)_G}keaS)nevOb{|}ML^sN8@ literal 0 HcmV?d00001 From 1fd9730a26c1bde739901478ee736743fbc2ca4b Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Wed, 23 Jul 2008 14:18:42 +0000 Subject: [PATCH 032/168] PATCH: [ 2025762 ] replace links with xrefs Submitted by Denis Bradford --HG-- branch : R2_10 --- Docs/Users/Manual/About_Doc.xml | 58 ++++--- Docs/Users/Manual/Command_line.xml | 105 ++++++------ Docs/Users/Manual/Compare_files.xml | 237 +++++++++++++-------------- Docs/Users/Manual/Faq.xml | 180 ++++++++++---------- Docs/Users/Manual/Install.xml | 242 ++++++++++++++++++++------- Docs/Users/Manual/Intro_diffs.xml | 245 +++++++++++++++++++++------- Docs/Users/Manual/Open_paths.xml | 22 ++- Docs/Users/Manual/Plugins.xml | 155 ++++++++---------- Docs/Users/Manual/Quick_start.xml | 13 +- 9 files changed, 748 insertions(+), 509 deletions(-) diff --git a/Docs/Users/Manual/About_Doc.xml b/Docs/Users/Manual/About_Doc.xml index 4e26aafe6ed..203424e17a7 100644 --- a/Docs/Users/Manual/About_Doc.xml +++ b/Docs/Users/Manual/About_Doc.xml @@ -2,40 +2,47 @@