From 6fb04e9343f2b7b55c27c8b025e2c7246be1f17b Mon Sep 17 00:00:00 2001 From: sdottaka Date: Thu, 25 Jul 2024 09:19:20 +0900 Subject: [PATCH] Update Manual --- Docs/Manual/English/Configuration.xml | 2270 +++++++++++++++--------- Docs/Manual/Japanese/Configuration.xml | 1034 +++++++---- Translations/Docs/Manual/English.pot | 1056 ++++++----- Translations/Docs/Manual/Japanese.po | 1176 ++++++------ 4 files changed, 3421 insertions(+), 2115 deletions(-) diff --git a/Docs/Manual/English/Configuration.xml b/Docs/Manual/English/Configuration.xml index 4bb928dac98..cdcc7fafa28 100644 --- a/Docs/Manual/English/Configuration.xml +++ b/Docs/Manual/English/Configuration.xml @@ -1,15 +1,20 @@
- Options and configuration<indexterm> + <title> + Options and configuration<indexterm> <primary>options</primary> - </indexterm> + + - The Options dialog enables you to customize many WinMerge features. To - set WinMerge options: + + The Options dialog enables you to customize many WinMerge features. To + set WinMerge options: + - Click + + Click Edit Options @@ -22,17 +27,22 @@ WinMerge Options button Options button in the - toolbar. + 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. + + 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: + + Configure the options you want to change using one or both of these + methods: + @@ -40,47 +50,61 @@ - Importing an options .ini file that you - exported previously (see - for details). + + 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. + + 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. + + This topic describes the options in detail. There is a section for each + page in the Options dialog. +
- Importing and Exporting options<indexterm> + <title> + 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. + + 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 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. + + 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. + + The values in your imported options file replace all existing + settings. + @@ -88,14 +112,18 @@ 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. + + 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. + + In the generated text ini file, each line + contains a name-value pair that defines a single option. + @@ -107,30 +135,40 @@ The General page has these options:
- Automatically scroll to first difference<indexterm> + <title> + 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. + + (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. + + : 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 folder compare, selects the first different file or + folders. + - For a file compare, selects the first difference block in - the files. + + For a file compare, selects the first difference block in + the files. + @@ -138,49 +176,64 @@
- Automatically scroll to first inline difference<indexterm> + <title> + Automatically scroll to first inline difference<indexterm> <primary>autoscrolling to first inline difference</primary> - </indexterm> + + - (default): TBD + + (default): When moving to a difference block, does not automatically scroll to the first inline difference within the lines of text. + - : TBD - + + : When moving to a difference block, automatically scrolls to the first inline difference within the lines of text. +
- Close Windows with '<keycap>Esc</keycap>'<indexterm> + <title> + Close Windows with '<keycap>Esc</keycap>'<indexterm> <primary>closing windows using Esc key</primary> - </indexterm> + + - (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. + + (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. + + Note that in the WinMerge command line, the + -e parameter enables you to close WinMerge by + pressing Esc just once. + - : Pressing Esc - closes a child window, but not the last remaining main window. + + : Pressing Esc + closes a child window, but not the last remaining main window. + - : Pressing Esc does - not close any WinMerge windows. + + : Pressing Esc does + not close any WinMerge windows. +
@@ -190,56 +243,76 @@ - (default): The Select Files or Folders - dialog checks both or all three paths as you enter them. The - Compare button remains disabled until both or - all three paths are validated. Note that this checking can cause some - delay. + + (default): The Select Files or Folders + dialog checks both or all three paths as you enter them. The + Compare button remains disabled until both or + all three paths are validated. Note that this checking can cause some + delay. + - : The Compare 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. + + : The Compare 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. +
- Allow only one instance to run<indexterm> + <title> + Single instance mode<indexterm> <primary>WinMerge window</primary> <secondary>limiting instances</secondary> - </indexterm> + + - (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. + + (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: + + : 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 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. + + 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. + + + + + : Similar to the "Allow only one instance to run" option, this setting restricts WinMerge to a single application window. However, it also ensures that the WinMerge process does not terminate until the application window is closed. This is useful for situations where external applications, like SourceTree, need to wait for WinMerge to finish before they can safely delete temporary files. + +
@@ -248,197 +321,227 @@ - (default): If you exit WinMerge while - multiple Compare windows are open, WinMerge prompts you to confirm - whether to close all the windows. + + (default): If you exit WinMerge while + multiple Compare windows are open, WinMerge prompts you to confirm + whether to close all the windows. + - : If you click - Exit and there are no pending file changes, - WinMerge closes immediately. + + : If you click + Exit and there are no pending file changes, + WinMerge closes immediately. +
- Preserve file time in file compare<indexterm> + <title> + 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. + + (default): If you save changes to a + file in WinMerge, the timestamp of the file is updated. + - : If you save changes to a file in - WinMerge, the timestamp of the file is not changed in your file - system. + + : If you save changes to a file in + WinMerge, the timestamp of the file is not changed in your file + system. +
- Show "Select Files or Folders" dialog on startup<indexterm> + <title> + Show "Select Files or Folders" dialog on startup<indexterm> <primary>Select Files or Folders dialog</primary> <secondary>opening automatically</secondary> - </indexterm> + + - (default): The WinMerge window opens - when you launch WinMerge. You must then click + + (default): The WinMerge window opens + when you launch WinMerge. You must then click File Open - to open Select Files or Folders. + to open Select Files or Folders. + - : The Select Files or Folders dialog - opens along with the WinMerge window when you launch WinMerge. + + : The Select Files or Folders dialog + opens along with the WinMerge window when you launch WinMerge. +
- Close "Select Files or Folders" dialog on clicking Compare button<indexterm> + <title> + Close "Select Files or Folders" dialog on clicking Compare button<indexterm> <primary>Select Files or Folders dialog</primary> - </indexterm> + + - (default): When you click Compare button, the Select File or Folders dialog will remain open instead of closing. + + (default): When you click Compare button, the Select File or Folders dialog will remain open instead of closing. + - : Clicking Compare button closes the Select Files or Folders dialog. + + : Clicking Compare button closes the Select Files or Folders dialog. +
- Open-dialog Auto-Completion<indexterm> + <title> + Open-dialog Auto-Completion<indexterm> <primary>MRU list</primary> - </indexterm> + + Choose one of these options: - Disabled (default): No autocompletion is - performed when you enter paths in the Select Files or Folders - dialog. + + Disabled (default): No autocompletion is + performed when you enter paths in the Select Files or Folders + dialog. + - 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 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 Most Recent Used list: Checks paths only from the - most recently used (MRU) list. This is handy when you have a limited - set of paths to compare. + + From Most Recent Used list: Checks paths only from the + most recently used (MRU) list. This is handy when you have a limited + set of paths to compare. +
- Auto-reload modified files<indexterm> + <title> + Auto-reload modified files<indexterm> <primary>Auto-reload</primary> - </indexterm> + + Choose one of these options: - Disabled (default): Disables automatic reloading. + + Disabled (default): Disables automatic reloading. - Only on window activated: When the WinMerge window is activated, - if the file has been modified, it will reload the file. - However, a message box asking if you want to reload the file will be displayed at this time. - If you do not want to see this message box, - check "Don't ask this question again" and press the Yes button. + + Only on window activated: When the WinMerge window is activated, + if the file has been modified, it will reload the file. + However, a message box asking if you want to reload the file will be displayed at this time. + If you do not want to see this message box, + check "Don't ask this question again" and press the Yes button. + - Immediately: Reloads the file immediately when it has been modified. - However, a message box asking if you want to reload the file will be displayed at this time. - If you do not want to see this message box, - check "Don't ask this question again" and press the Yes button. + + Immediately: Reloads the file immediately when it has been modified. + However, a message box asking if you want to reload the file will be displayed at this time. + If you do not want to see this message box, + check "Don't ask this question again" and press the Yes button. +
- Language<indexterm> + <title> + Language<indexterm> <primary>Language</primary> - </indexterm> + + - See . - -
- -
- Reset - - 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. - - 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. + + See . + - - 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 General page - 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. + + 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. + - 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. + + 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. +
- About ignore options<indexterm> + <title> + About ignore options<indexterm> <primary>ignored differences</primary> - </indexterm> + + - 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: + + 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: + @@ -454,57 +557,77 @@ - Files containing only ignored differences are marked as - identical in a folder comparison. + + Files containing only ignored differences are marked as + identical in a folder comparison. +
- Whitespaces<indexterm> + <title> + Whitespaces<indexterm> <primary>whitespaces</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - Whitespace is the space between words and lines. It is represented - in text files by special, nonprinting characters like spaces, tabs, and - linefeeds. The significance of whitespace depends on how you want to read - or process differences. It might be important to detect all changes in - whitespace. Conversely, you might prefer to treat all whitespace the same - whether one space, two spaces, an indent, or a tab. And in some structured - documents (like comma-separated lists), you might want to disregard all - whitespace. + + Whitespace is the space between words and lines. It is represented + in text files by special, nonprinting characters like spaces, tabs, and + linefeeds. The significance of whitespace depends on how you want to read + or process differences. It might be important to detect all changes in + whitespace. Conversely, you might prefer to treat all whitespace the same + whether one space, two spaces, an indent, or a tab. And in some structured + documents (like comma-separated lists), you might want to disregard all + whitespace. + - The effects of whitespace on changes within lines are visible only - when is enabled. This is in - contrast to difference blocks, which are always highlighted. + + The effects of whitespace on changes within lines are visible only + when is enabled. This is in + contrast to difference blocks, which are always highlighted. + Lines with different whitespace - One space between words:Two Words + + One space between words:Two Words + - Two spaces between words:Two Words + + Two spaces between words:Two Words + - Tab between words:Two Words + + Tab between words:Two Words + - No spaces between words:TwoWords + + No spaces between words:TwoWords + - You can control whitespace detection by choosing one of these - options: + + You can control whitespace detection by choosing one of these + options: + Compare - All whitespace is compared (default). If you are not sure - which option your document requires, this is probably the safest - choice. In the example, all lines are detected as different. + + All whitespace is compared (default). If you are not sure + which option your document requires, this is probably the safest + choice. In the example, all lines are detected as different. + @@ -512,12 +635,14 @@ Ignore change - Compares differences in whitespace. In the 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): + + Compares differences in whitespace. In the 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): + @@ -525,9 +650,11 @@ Ignore all - Ignores all whitespace characters, except linefeeds (so lines - are detected and preserved in a merge). All lines in the example are - detected as identical. + + Ignores all whitespace characters, except linefeeds (so lines + are detected and preserved in a merge). All lines in the example are + detected as identical. + @@ -535,267 +662,370 @@ Related topics - The effects of whitespace settings on line differences is - described in . + + The effects of whitespace settings on line differences is + described in . + - The Options dialog Editor page contains related options that - control how whitespace is used to detect breaks between words. See for details. + + The Options dialog Editor page contains related options that + control how whitespace is used to detect breaks between words. See for details. +
- Ignore blank lines<indexterm> + <title> + Ignore blank lines<indexterm> <primary>blank lines</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - (default): Empty lines in the source - files are detected and represented in the File Compare window as blank - lines with the Deleted Difference colors. + + (default): Empty lines in the source + files are detected and represented in the File Compare window as blank + lines with the Deleted Difference colors. + - : 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. + + : 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 case<indexterm> + <title> + Ignore case<indexterm> <primary>case (letter), detecting and ignoring differences</primary> - </indexterm> + + - (default): Comparisons are - case-sensitive. For example, LowerCase, - LOWERCASE, and lowercase are all - different. + + (default): Comparisons are + case-sensitive. For example, LowerCase, + LOWERCASE, and lowercase are all + different. + - : Differences between lowercase and - uppercase letters are ignored. + + : Differences between lowercase and + uppercase letters are ignored. +
- Ignore carriage return differences (Windows/Unix/Mac)<indexterm> + <title> + Ignore carriage return differences (Windows/Unix/Mac)<indexterm> <primary>EOL</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + + + + + + (default): End of line (EOL) style + differences are detected. 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 numbers<indexterm> + <primary>numbers</primary> + + <secondary>detecting and ignoring differences</secondary> + </indexterm> + - (default): End of line (EOL) style - differences are detected. 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. + + (default): Numeric differences are detected. + - : EOL differences are ignored. + + : Numeric differences are ignored. +
- Ignore codepage differences<indexterm> + <title> + Ignore codepage differences<indexterm> <primary>codepage</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - (default): File encoding differences are detected. Also, differences between the presence and absence of BOM are detected. + + (default): File encoding differences are detected. Also, differences between the presence and absence of BOM are detected. + - : File encoding differences are ignored. + + : File encoding differences are ignored. +
- Ignore comment differences<indexterm> + <title> + Ignore comment differences<indexterm> <primary>filters</primary> <secondary>comments</secondary> - </indexterm> - - + + - (default): WinMerge compares comments - in code, along with other content. + + (default): WinMerge compares comments + in code, along with other content. + - : This option optimizes comparisons by - detecting comments in certain programming language file types (such as - C++ and Java), and ignoring them. + + : This option optimizes comparisons by + detecting comments in certain programming language file types (such as + C++ and Java), and ignoring them. + The detection is based on syntax highlighting, so it has no effect on file types that are not supported by WinMerge. +
- Enable moved block detection<indexterm> + <title> + Enable moved block detection<indexterm> <primary>moved differences</primary> - </indexterm> + + - (default): WinMerge does not detect - when differences are due to moved lines. + + (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. + + : 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 . + + For an example, see the Location pane description in . +
- Align similar lines<indexterm> + <title> + Align similar lines<indexterm> <primary>similar lines, aligning</primary> - </indexterm> + + - (default): Lines within difference - blocks are shown as they occur in the source files. + + (default): Lines within difference + blocks are shown as they occur in the source files. + - : WinMerge tries to detect lines within - a difference blocks that are similar, and adds blank lines in the File - panes to align them. This option is most effective when lines are - quite similar; less effective if lines are too different. + + : WinMerge tries to detect lines within + a difference blocks that are similar, and adds blank lines in the File + panes to align them. This option is most effective when lines are + quite similar; less effective if lines are too different. + - For an example, see the Similar lines - description in . + + For an example, see the Similar lines + description in . +
- Diff algorithm<indexterm> + <title> + Diff algorithm<indexterm> <primary>algorithm</primary> - </indexterm> + + - (default): The basic greedy diff - algorithm. + + (default): The basic greedy diff + algorithm. + - : Spend extra time to make sure the - smallest possible diff is produced. + + : Spend extra time to make sure the + smallest possible diff is produced. + - : Use "patience diff" algorithm when - generating diff. + + : Use "patience diff" algorithm when + generating diff. + - : This algorithm extends the patience - algorithm to "support low-occurrence common elements". + + : This algorithm extends the patience + algorithm to "support low-occurrence common elements". + - : This algorithm does not detect insertions - or deletions of lines. + + : This algorithm does not detect insertions + or deletions of lines.
- Enable indent heuristic<indexterm> + <title> + Enable indent heuristic<indexterm> <primary>indent heuristic</primary> - </indexterm> + + - (default): - Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read. - It has no effect if the Diff algorithm is default. + + (default): + Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read. + It has no effect if the Diff algorithm is default. + - : Disable the heuristic. + + : Disable the heuristic. +
- Completely unhighlight the ignored differences<indexterm> + <title> + Completely unhighlight the ignored differences<indexterm> <primary>unhighlight ignored differences</primary> - </indexterm> + + - : - Makes the color of the different lines ignored by line filters and substitution - filters the same as the color of the identical lines. + + : + Makes the color of the different lines ignored by line filters and substitution + filters the same as the color of the identical lines. - (default): - Difference lines ignored by line filters and substitution filters are - displayed in the color of Ignored Difference. + + (default): + Difference lines ignored by line filters and substitution filters are + displayed in the color of Ignored Difference. +
- +
Compare Folder page
- Compare method<indexterm> + <title> + 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: + + 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. + + 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. + @@ -803,14 +1033,20 @@ 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. + + 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. + @@ -818,28 +1054,34 @@ Binary Contents - This method is faster than the Quick contents - compare method. However, it does not apply any plugins, line filters, - 'Ignore case' option, etc. First, it compares the file sizes, and - if they are different, it treats the contents of the file as - different without comparing them. If the file sizes match, - it simply compares the contents of the file in bytes. - No file encoding detection, EOL detection, or binary file detection is performed. - This compare method is good for comparing files against backed up files. + + This method is faster than the Quick contents + compare method. However, it does not apply any plugins, line filters, + 'Ignore case' option, etc. First, it compares the file sizes, and + if they are different, it treats the contents of the file as + different without comparing them. If the file sizes match, + it simply compares the contents of the file in bytes. + No file encoding detection, EOL detection, or binary file detection is performed. + This compare method is good for comparing files against backed up files. + - Modified Date + + 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. + + 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. + @@ -847,28 +1089,35 @@ Modified Date and Size - Similar to Modified Date, but also checks - file sizes when dates are identical. + + Similar to Modified Date, but also checks + file sizes when dates are identical. + - Size + + Size file sizes comparing - + + - Compares only file sizes, so it is fast but not as accurate as - the contents methods. + + Compares only file sizes, so it is fast but not as accurate as + the contents methods. +
- Stop after first difference<indexterm> + <title> + Stop after first difference<indexterm> <primary>comparing files</primary> <secondary>stopping after first difference</secondary> @@ -876,114 +1125,190 @@ <primary>comparing folders</primary> <secondary>stopping after first difference</secondary> - </indexterm> + + - This option is enabled only when the Quick - Contents compare method is selected. + + This option is enabled only when the + Quick + Contents + compare method is selected. + - (default): WinMerge examines all - differences in the files. + + (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. + + : 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. + + 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. +
- Ignore time differences less than 3 seconds<indexterm> + <title> + Ignore time differences less than 3 seconds<indexterm> <primary>timestamps</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - (default): Files with different - timestamps are detected as different. + + (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. + + : 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 + This option works only with the + Modified + Date + and + Modified Date and + Size + compare methods (described in ). It has no effect with other - methods. + methods. + - This option should be enabled only when the time difference is - detected. Otherwise, it can cause incorrect compare results. + + This option should be enabled only when the time difference is + detected. Otherwise, it can cause incorrect compare results. +
- + +
+ + Automatically expand subfolders after comparison<indexterm> + <primary>expand subfolders</primary> + + <secondary>detecting and ignoring differences</secondary> + </indexterm> + + + + + + (default): Subfolders remain collapsed after comparison. + + + + + + : All subfolders are expanded after comparison. + + + + + + : Only subfolders with differences are expanded after comparison. + + + + + + : Only subfolders without differences are expanded after comparison. + + + +
+
- Include unique subfolders contents<indexterm> + <title> + Include unique subfolders contents<indexterm> <primary>include unique subfolders</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - (default): WinMerge ignore unique subfolders when comparing folders. + + (default): WinMerge ignore unique subfolders when comparing folders. + - : WinMerge also shows the content from unique subfolders. + + : WinMerge also shows the content from unique subfolders. +
- +
- Include subfolders<indexterm> + <title> + Include subfolders<indexterm> <primary>include subfolders</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - (default): WinMerge doing a recursive comparing and also includes subfolders. + + (default): WinMerge doing a recursive comparing and also includes subfolders. + - : WinMerge only comparing the files in the root folder. + + : WinMerge only comparing the files in the root folder. +
- +
- Automatically expand subfolders after comparison<indexterm> + <title> + Automatically expand subfolders after comparison<indexterm> <primary>expand subfolders</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + Do not expand - (default): WinMerge will not automatically expand subfolders after comparing folders. + + (default): WinMerge will not automatically expand subfolders after comparing folders. @@ -992,7 +1317,8 @@ Expand all subfolders - WinMerge will automatically expand all subfolders after comparing folders. + + WinMerge will automatically expand all subfolders after comparing folders. @@ -1001,7 +1327,8 @@ Expand different subfolders - WinMerge will automatically expand different subfolders after comparing folders. + + WinMerge will automatically expand different subfolders after comparing folders. @@ -1010,7 +1337,8 @@ Expand identical subfolders - WinMerge will automatically expand identical subfolders after comparing folders. + + WinMerge will automatically expand identical subfolders after comparing folders. @@ -1018,111 +1346,137 @@
- Ignore reparse points<indexterm> + <title> + Ignore reparse points<indexterm> <primary>reparse points</primary> <secondary>detecting and ignoring differences</secondary> - </indexterm> + + - (default): TBD + + (default): TBD + - : TBD + + : TBD +
- +
- Threshold for switching to quick compare (MB)<indexterm> + <title> + Threshold for switching to quick compare (MB)<indexterm> <primary>Quick compare</primary> <secondary>limit</secondary> - </indexterm> + + - : Is not active unless the Compare method - is set to other than Full Contents compare method. + + : Is not active unless the Compare method + is set to other than Full Contents compare method. + - : Is active when the Compare method - is set to Full Contents compare method. + + : Is active when the Compare method + is set to Full Contents compare method. + - Threshold size for switching to Quick Contents compare method. - When Full Contents compare method is selected, files bigger (in mega bytes) than this - value are compared using Quick Contents compare method. - + + Threshold size for switching to Quick Contents compare method. + When Full Contents compare method is selected, files bigger (in mega bytes) than this + value are compared using Quick Contents compare method. +
- Threshold for switching to binary compare (MB)<indexterm> + <title> + Threshold for switching to binary compare (MB)<indexterm> <primary>Binary compare</primary> <secondary>limit</secondary> - </indexterm> + + - : Is not active unless the Compare method - is set to other than Full Contents and Quick Contents compare method. + + : Is not active unless the Compare method + is set to other than Full Contents and Quick Contents compare method. + - : Is active when the Compare method - is set to Full Contents or Quick Contents compare method. + + : Is active when the Compare method + is set to Full Contents or Quick Contents compare method. + - Threshold size for switching to Binary Contents compare method. - When Full Contents or Quick Contents compare method is selected, files bigger (in mega bytes) than this - value are compared using Binary Contents compare method. - + + Threshold size for switching to Binary Contents compare method. + When Full Contents or Quick Contents compare method is selected, files bigger (in mega bytes) than this + value are compared using Binary Contents compare method. +
- Number of compare threads<indexterm> + <title> + Number of CPU cores to use<indexterm> <primary>compare threads</primary> - </indexterm> + + - Number of threads which use to comparing. With a negative value WinMerge - will use addition of the number of available CPU cores. + + Number of threads which use to comparing. With a negative value WinMerge + will use addition of the number of available CPU cores. +
- Compare Table page<indexterm> - <primary>table files</primary> - </indexterm> + + Compare Table page<indexterm> + <primary>table files</primary> + </indexterm> +
CSV File Patterns - Specifies file name pattern for comma-separated values files to open in table format. - To specify multiple items, separate them with a semicolon. - By default, *.csv is specified. If you do not want to open the files with the extension .csv in table format. Delete the *.csv. + Specifies file name pattern for comma-separated values files to open in table format. + To specify multiple items, separate them with a semicolon. + By default, *.csv is specified. If you do not want to open the files with the extension .csv in table format. Delete the *.csv.
TSV File Patterns - Specifies file name pattern for tab-separated values files to open in table format. - To specify multiple items, separate them with a semicolon. - By default, *.tsv is specified. If you do not want to open the files with the extension .tsv in table format. Delete the *.tsv. + Specifies file name pattern for tab-separated values files to open in table format. + To specify multiple items, separate them with a semicolon. + By default, *.tsv is specified. If you do not want to open the files with the extension .tsv in table format. Delete the *.tsv.
Custom Delimiter-Separated Values - If you want to open text files, with values separated by characters other than commas or tabs, in tabular format, - specify the file name pattern and delimiter. + If you want to open text files, with values separated by characters other than commas or tabs, in tabular format, + specify the file name pattern and delimiter.
@@ -1130,16 +1484,19 @@ Allow newlines in quotes - (default): - If there is a newline character between the quote character and the next quote character, - the newline character is treated as part of a value. - Enable this option if you want to process CSV/TSV files that contain multiple lines in one field. + + (default): + If there is a newline character between the quote character and the next quote character, + the newline character is treated as part of a value. + Enable this option if you want to process CSV/TSV files that contain multiple lines in one field. + - : - Disable the above. - Disable this option when opening files with incorrect quotes. + + : + Disable the above. + Disable this option when opening files with incorrect quotes. @@ -1148,11 +1505,11 @@
Quote character - Specifies the character that is treated as quotation marks. - Delimiters within the text range enclosed by the characters specified here are treated as part of a value. - This field can be empty. - To open files in which the quotation marks are mere values, - leave it empty or specify a character that does not exist in the file. + Specifies the character that is treated as quotation marks. + Delimiters within the text range enclosed by the characters specified here are treated as part of a value. + This field can be empty. + To open files in which the quotation marks are mere values, + leave it empty or specify a character that does not exist in the file.
@@ -1160,15 +1517,19 @@
Compare Binary page
- Binary File Patterns<indexterm> + <title> + Binary File Patterns<indexterm> <primary>binary files</primary> - </indexterm> + + TBD
- Frhed settings<indexterm> + <title> + Frhed settings<indexterm> <primary>frhed</primary> - </indexterm> + + TBD @@ -1199,9 +1560,11 @@
- Compare Image page<indexterm> - <primary>image files</primary> - </indexterm> + + Compare Image page<indexterm> + <primary>image files</primary> + </indexterm> +
Image File Patterns TBD @@ -1218,41 +1581,126 @@
+
+ + Compare Webpage page<indexterm> + <primary>webpages</primary> + </indexterm> + + +
+ + URL pattern to include (Regular expression)<indexterm> + </indexterm> + + TBD +
+ +
+ + URL pattern to exclude (Regular expression)<indexterm> + </indexterm> + + TBD +
+ +
+ + User data folder location<indexterm> + </indexterm> + + TBD +
+ +
+ + Separate user data folders for each pane<indexterm> + </indexterm> + + TBD +
+ +
+ +
+ + Message Boxes page<indexterm> + <primary>message boxes</primary> + </indexterm> + + +
+ Reset + + + 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. + + + + 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. + + + + + 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. + + +
+
+
- Editor General page<indexterm> + <title> + Editor General page<indexterm> <primary>editing</primary> <secondary>options for File Compare window</secondary> - </indexterm> + +
- Highlight syntax<indexterm> + <title> + Highlight syntax<indexterm> <primary>syntax highlighting</primary> <secondary>enabling and disabling</secondary> - </indexterm> + + - (default): WinMerge can syntax - highlight many programming language and web formats. To see the - formats that are supported by default, click + + (default): WinMerge can syntax + highlight many programming language and web formats. To see the + formats that are supported by default, click View Syntax Highlight - . + . + - : Syntax highlighting consumes some - processing power, so if WinMerge screen updating seems to be slow, - turning off this option might help. + + : Syntax highlighting consumes some + processing power, so if WinMerge screen updating seems to be slow, + turning off this option might help. +
- Preserve original EOL chars<indexterm> + <title> + Preserve original EOL chars<indexterm> <primary>EOL</primary> <secondary>preserving</secondary> @@ -1260,56 +1708,69 @@ <primary>end of line</primary> <see>EOL</see> - </indexterm> + + - (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. + + (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: the - default behavior works even when comparing two files that have - different line ending styles. + + For most situations you should leave this option disabled: the + default behavior works even when comparing two files that have + different line ending styles. + - : 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). + + : 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. + + 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. +
- Tabs<indexterm> + <title> + Tabs<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. + + 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. + @@ -1317,20 +1778,26 @@ 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: + + 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 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. + + 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. + @@ -1339,120 +1806,164 @@
- Rendering Mode<indexterm> + <title> + Rendering Mode<indexterm> <primary>rendering</primary> - </indexterm> + + - (default): TBD + + (default): TBD + - : TBD + + : TBD + - : TBD + + : TBD + - : TBD + + : TBD + - : TBD + + : TBD + - : TBD + + : TBD + - : TBD + + : TBD +
- Editor Compare/Merge page<indexterm> + <title> + Editor Compare/Merge page<indexterm> <primary>editing</primary> <secondary>options for File Compare window</secondary> - </indexterm> + +
- Automatic rescan<indexterm> + <title> + Automatic rescan<indexterm> <primary>rescanning files</primary> <secondary>enabling and disabling autoscan</secondary> - </indexterm> + + - (default): WinMerge rescans - automatically when you merge a difference, or if you manually rescan - (for example, click the Rescan button). + + (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). + + : 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. + + 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. +
- Copy granularity for selected differences<indexterm> + <title> + Copy granularity for selected differences<indexterm> <primary>copy granularity</primary> - </indexterm> + + - Specifies the copy granularity when copying to another pane by - clicking the Copy to right menu item etc. - with text selected. + + Specifies the copy granularity when copying to another pane by + clicking the Copy to right menu item etc. + with text selected. + - : Copies diff hunks within - the selected text. + + : Copies diff hunks within + the selected text. + - : Copies inline diffs within - the selected text. + + : Copies inline diffs within + the selected text. + - : Copies the differences within the - selected text line by line. + + : Copies the differences within the + selected text line by line. + - (default): Copies the differences within - the selected text character by character. + + (default): Copies the differences within + the selected text character by character. +
- Line Difference Coloring<indexterm> + <title> + Line Difference Coloring<indexterm> <primary>line differences</primary> <secondary>viewing options</secondary> - </indexterm> + + - These settings enable and configure the detection of line - differences (changes within the lines of difference - blocks): + + These settings enable and configure the detection of + line + differences + (changes within the lines of difference + blocks): + @@ -1461,40 +1972,50 @@ - (default): WinMerge highlights - differences within lines. Also enables the + + (default): WinMerge highlights + differences within lines. Also enables the View - + View Line Differences - menu item. - + menu item. + + Choose one of these suboptions: - + - Character level: Highlights individual - characters that are different. This option can be useful if you - are looking for changes within words, or for file formats that do - not have clear word breaks. + + Character level: Highlights individual + characters that are different. This option can be useful if you + are looking for changes within words, or for file formats that do + not have clear word breaks. + - + - Word-level (default): Highlights - entire words that are different. - + + Word-level (default): Highlights + entire words that are different. + + - Break at whitespace (default): - Words are assumed to be separated by whitespace characters. - This usually works for typical text files. + + Break at whitespace (default): + Words are assumed to be separated by whitespace characters. + This usually works for typical text files. + - + - Break at whitespace or punctuation: - Considers both whitespace and punctuation characters to be - word breaks. This can useful for handling lists that are - separated with punctuation (like comma-separated - lists). + + Break at whitespace or punctuation: + Considers both whitespace and punctuation characters to be + word breaks. This can useful for handling lists that are + separated with punctuation (like comma-separated + lists). + @@ -1502,13 +2023,15 @@ - : WinMerge does not highlight line - differences, and all settings for the level and whitespace options are - ignored. Also disables the + + : WinMerge does not highlight line + differences, and all settings for the level and whitespace options are + ignored. Also disables the View - + View Line Differences - menu item. + menu item. + @@ -1519,166 +2042,218 @@ Word break characters - - TBD - + + TBD + Related topic - explains in - more detail how WinMerge detects and marks line differences. + + explains in + more detail how WinMerge detects and marks line differences. +
- Colors page<indexterm> + <title> + Colors page<indexterm> <primary>difference colors</primary> <secondary>options</secondary> - </indexterm> - - 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. - - 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. - - To revert to the default colors of a scheme, choose a different scheme - and return to the modified scheme. + + + + + 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. + + + + 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. + + + + To revert to the default colors of a scheme, choose a different scheme + and return to the modified scheme. +
- Differences Colors page<indexterm> + <title> + Differences Colors page<indexterm> <primary>differences colors</primary> <secondary>options</secondary> - </indexterm> + + TBD
- Syntax Colors page<indexterm> + <title> + Syntax Colors page<indexterm> <primary>syntax highlighting</primary> <secondary>color options</secondary> - </indexterm> + + - By default, the WinMerge File Compare window marks the syntax of - certain kinds of source code, as described in + 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. - - To revert to the default colors of a scheme, choose a different scheme - and return to the modified scheme. + elements that are recognized, and enables you to change their text color and + weight. + + + + To revert to the default colors of a scheme, choose a different scheme + and return to the modified scheme. +
- Text Colors page<indexterm> + <title> + Text Colors page<indexterm> <primary>text colors</primary> <secondary>options</secondary> - </indexterm> - - 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. + + + + + 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. +
- Marker Colors page<indexterm> + <title> + Marker Colors page<indexterm> <primary>marker colors</primary> <secondary>options</secondary> - </indexterm> + + TBD
- Folder Compare Colors page<indexterm> + <title> + Folder Compare Colors page<indexterm> <primary>folder compare colors</primary> <secondary>options</secondary> - </indexterm> - - By default, the WinMerge Folder Compare window use background colors - to show the status from a item (equal, different, not exists on all sides - or filtered). - - 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. - - To revert to the default colors of a scheme, choose a different scheme - and return to the modified scheme. + + + + + By default, the WinMerge Folder Compare window use background colors + to show the status from a item (equal, different, not exists on all sides + or filtered). + + + + 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. + + + + To revert to the default colors of a scheme, choose a different scheme + and return to the modified scheme. +
- Archive Support page<indexterm> + <title> + Archive Support page<indexterm> <primary>archiving files</primary> <secondary>configuring support after installation</secondary> - </indexterm> + + - This page contains options for configuring archive support - using 7-Zip. + + This page contains options for configuring archive support + using 7-Zip. +
- Enable archive file support<indexterm> + <title> + 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). + + This option controls how WinMerge handles archive files (based on + 7-Zip integration). + - (default): WinMerge recognizes 7-Zip - archives. + + (default): WinMerge recognizes 7-Zip + archives. + - : Turns off 7-Zip archive - integration. + + : Turns off 7-Zip archive + integration. +
- Detect archive type from file signature<indexterm> + <title> + Detect archive type from file signature<indexterm> <primary>detecting archive types</primary> - </indexterm> + + - (default): WinMerge recognizes only - archives whose file extension is known on your system (for example, in - the registry or through a file association). + + (default): WinMerge recognizes only + archives whose file extension is known on your system (for example, in + the registry or through a file association). + - : 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. - + + : 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. + + +
@@ -1688,59 +2263,80 @@ System page
- Send deleted files to Recycle Bin<indexterm> + <title> + Send deleted files to Recycle Bin<indexterm> <primary>deleting files</primary> <secondary>options</secondary> - </indexterm> + + - (default): Files and folders that you - delete in a Folder Compare window are moved to the Recycle Bin, if it - is available. + + (default): Files and folders that you + delete in 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! + + Remember: if the Recycle Bin on your system has been + deactivated, this option does not work, and deleted files are + lost! + - : Files and folders deleted in a - directory compare actually deleted. + + : Files and folders deleted in a + directory compare actually deleted. +
- External editor<indexterm> + <title> + External editor<indexterm> <primary>external editor</primary> <secondary>configuring</secondary> - </indexterm> + + - 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. + + 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. + - Installation configures Notepad 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. + + Installation configures Notepad 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. + - Along with the path, you can include any command line parameters - supported by the external tool, in this format: - path to executable - - + + 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 + + To use the configured external editor, right-click a file in the + Folder Compare window and choose Open Left With External Editor @@ -1748,68 +2344,91 @@ Open Right With External Editor - . + . +
- Filter folder<indexterm> + <title> + Filter folder<indexterm> <primary>Filters folders</primary> <secondary>specifying default private folder</secondary> - </indexterm> + + - Use this field to specify your own private folder for file filters. - By default this folder is your user profile directory (for example, - Documents on Windows 10). When you create a file - filter, it is automatically added to this folder. + + Use this field to specify your own private folder for file filters. + By default this folder is your user profile directory (for example, + Documents on Windows 10). When you create a file + filter, it is automatically added to this folder. +
- Temporary files folder<indexterm> + <title> + 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: + + Specify the folder where WinMerge stores temporary files. Either one + of these options is available: + - System's temp folder (default): For example, this might be - C:\Windows\Temp on your system. + + 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. + + Custom folder: Click Browse and select a + different folder where you have write access. +
- Backup Files page<indexterm> + <title> + Backup Files page<indexterm> <primary>backup files, options</primary> - </indexterm> + + - This page allows you to control how WinMerge creates backup - files. + + This page allows you to control how WinMerge creates backup + files. +
Create backup files in - Specify when WinMerge should create backup files. You can enable or - disable each of these options independently: + + 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). + + 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. + + File compare (enabled by default): Backup + files are created whenever files are saved. +
@@ -1817,23 +2436,29 @@
Create backup files into - Specify where backup files are created. Only one of these options - can be enabled: + + Specify where backup files are created. Only one of these options + can be enabled: + - 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. + + 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. + + 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. +
@@ -1841,60 +2466,83 @@
Backup filename - 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: + + 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. + + Append .bak extension (enabled by + default): For example, the file.txt is backed up + to file.txt.bak. + - Append timestamp (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. + + Append timestamp (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. + + 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. +
- Codepage page<indexterm> + <title> + Codepage page<indexterm> <primary>codepage</primary> <secondary>options</secondary> - </indexterm> + + - WinMerge detects handles file encoding transparently, and in most + + WinMerge detects handles file encoding transparently, and in most cases you should not need to change the default settings.This page allows - you to specify the codepages of certain file formats, should you need to. + you to specify the codepages of certain file formats, should you need to. + - A full explanation of text encoding and Windows codepages is beyond + + 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: + places to start: + - Wikipedia: - Code pages, Character - encoding + + + Wikipedia: + Code pages + , + Character + encoding + + - - Microsoft: Code Pages Supported by Windows + + + Microsoft: Code Pages Supported by Windows + + @@ -1902,26 +2550,34 @@
Default Codepage - Choose one of these radio buttons to set the default codepage that - WinMerge uses when handling ANSI files: + + Choose one of these radio buttons to set the default codepage that + WinMerge uses when handling ANSI 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. + + 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. + + 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. + + Custom codepage: Enter the codepage number + explicitly. For example, UTF-8 or + ISO-8851-1. +
@@ -1930,48 +2586,62 @@ Detect codepage info for these files: .html, .rc, .xml - 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. +or is this understood?--> + - (default): WinMerge does not read - codepage information from the source files. It uses the default - codepage setting instead. + + (default): WinMerge does not read + codepage information from the source files. It uses the default + codepage setting instead. + - : 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. + + : 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. + + 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. + + 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. + + 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. + + 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. + @@ -1989,17 +2659,21 @@ or is this understood?--> Shell Integration page
- Explorer<indexterm> + <title> + Explorer<indexterm> <primary>integration</primary> <secondary>with Windows shell</secondary> - </indexterm> + + - The option enables you to - launch WinMerge directly from Windows Explorer, comparing items that you - have selected there. It is enabled or disabled by default during WinMerge - installation. If enabled, you can also enable one or both of these - options: + + The option enables you to + launch WinMerge directly from Windows Explorer, comparing items that you + have selected there. It is enabled or disabled by default during WinMerge + installation. If enabled, you can also enable one or both of these + options: + @@ -2008,16 +2682,20 @@ or is this understood?--> - (default): Only the - WinMerge shortcut is included in the - Windows Explorer context menu. + + (default): Only the + WinMerge shortcut is included in the + Windows Explorer context menu. + - : Replaces the - WinMerge shortcut in the Explorer - context menu with Compare - shortcuts. + + : Replaces the + WinMerge shortcut in the Explorer + context menu with Compare + shortcuts. + @@ -2031,23 +2709,29 @@ or is this understood?--> - (default): Removes - Compare As menu item - from Explorer context menu. + + (default): Removes + Compare As menu item + from Explorer context menu. + - : Adds - Compare As menu item - to Explorer context menu. + + : Adds + Compare As menu item + to Explorer context menu. + - describes how to use the - WinMerge and Compare shortcuts. + + describes how to use the + WinMerge and Compare shortcuts. +
diff --git a/Docs/Manual/Japanese/Configuration.xml b/Docs/Manual/Japanese/Configuration.xml index adcf17a8349..05e9d79c4e0 100644 --- a/Docs/Manual/Japanese/Configuration.xml +++ b/Docs/Manual/Japanese/Configuration.xml @@ -1,26 +1,31 @@
- オプションとコンフィグレーション<indexterm> + <title> +オプションとコンフィグレーション<indexterm> <primary>オプション</primary> </indexterm> - オプションダイアログでは、WinMergeの様々なカスタマイズを行うことができます。WinMergeオプションを設定するには、 + +オプションダイアログでは、WinMergeの様々なカスタマイズを行うことができます。WinMergeオプションを設定するには、 - メニューの、編集設定、または、ツールバー + +メニューの、編集設定、または、ツールバー WinMerge Options button 設定ボタンをクリックしてください。 - オプションダイアログには、多くのページがあり、それぞれ、関連する設定のグループを含んでいます。 ダイアログの左端にある + +オプションダイアログには、多くのページがあり、それぞれ、関連する設定のグループを含んでいます。 ダイアログの左端にある カテゴリ リストのタイトルをクリックすることで、ページを開くことができます。 - 以下の方法の片方、または、両方を使って、変更したいオプションを設定することができます。 + +以下の方法の片方、または、両方を使って、変更したいオプションを設定することができます。 @@ -28,26 +33,31 @@ fileref="screenshots/options_btn.png" /> - エクスポート済の.iniファイルをインポート + +エクスポート済の.iniファイルをインポート - オプションを設定し終わったら、 OKをクリックして、それらを保存し、ダイアログを閉じてください。 + +オプションを設定し終わったら、 OKをクリックして、それらを保存し、ダイアログを閉じてください。 - このトピックでは、オプションの詳細について説明します。オプションダイアログの、それぞれのページにはセクションがあります。 + +このトピックでは、オプションの詳細について説明します。オプションダイアログの、それぞれのページにはセクションがあります。
- 設定情報のインポートとエクスポート<indexterm> + <title> +設定情報のインポートとエクスポート<indexterm> <primary>importing options files</primary> </indexterm><indexterm> <primary>exporting options files</primary> </indexterm> - 差分比較、または、マージの設定を頻繁に変更する場合、また、 あなたの設定を他のWinMergeユーザーと共有したい場合は、 + +差分比較、または、マージの設定を頻繁に変更する場合、また、 あなたの設定を他のWinMergeユーザーと共有したい場合は、 設定をファイルへエクスポートして保存することを検討してください。 あとでそれらの設定を使いたい時は、手動でオプションを設定する代わりに、単に設定ファイルをインポートすることができます。 @@ -56,10 +66,12 @@ fileref="screenshots/options_btn.png" /> インポートオプション - 保存された設定を再使用したい時は、 インポートをクリックしてください。インポートダイアログで、保存済の + +保存された設定を再使用したい時は、 インポートをクリックしてください。インポートダイアログで、保存済の iniファイルを探して、 開くをクリックしてください。 - インポートされた設定ファイルの値で、すべてのオプションを置き換えます。 + +インポートされた設定ファイルの値で、すべてのオプションを置き換えます。 @@ -67,11 +79,13 @@ fileref="screenshots/options_btn.png" /> エクスポートオプション - オプションを設定し終わったら、 エクスポートをクリックしてください。 + +オプションを設定し終わったら、 エクスポートをクリックしてください。 エクスポートダイアログで、設定ファイルのパスと名前を指定して(拡張子 iniは、自動的に付加されます)、 保存をクリックしてください。 - 生成された iniファイルの各行は、一つのオプションを表す、名前と値のペアを含みます。 + +生成された iniファイルの各行は、一つのオプションを表す、名前と値のペアを含みます。 @@ -83,25 +97,30 @@ fileref="screenshots/options_btn.png" /> 一般ページには、いくつかのオプションがあります。
- 自動的に最初の差異にスクロールする<indexterm> + <title> +自動的に最初の差異にスクロールする<indexterm> <primary>自動的に最初の差異にスクロールする</primary> </indexterm> - (デフォルト): 比較ウィンドウは、フォルダー、または、ファイルの先頭を表示し、差異を選択しません。 + +(デフォルト): 比較ウィンドウは、フォルダー、または、ファイルの先頭を表示し、差異を選択しません。 - : 最初に開いた時、比較ウィンドウは(必要ならそこまでスクロールして)最初の差異を選択します。 + +: 最初に開いた時、比較ウィンドウは(必要ならそこまでスクロールして)最初の差異を選択します。 - フォルダー比較では、ファイル、または、フォルダーの最初の差異を選択します。 + +フォルダー比較では、ファイル、または、フォルダーの最初の差異を選択します。 - ファイル比較では、ファイル中の最初の差異ブロックを選択します。 + +ファイル比較では、ファイル中の最初の差異ブロックを選択します。 @@ -109,42 +128,52 @@ fileref="screenshots/options_btn.png" />
- Automatically scroll to first inline difference<indexterm> + <title> +Automatically scroll to first inline difference<indexterm> <primary>autoscrolling to first inline difference</primary> </indexterm> - (default): TBD + + (default): When moving to a difference block, does +not automatically scroll to the first inline difference within the lines of +text. - : TBD - + +: When moving to a difference block, automatically +scrolls to the first inline difference within the lines of text.
- '<keycap>Esc</keycap>'でウィンドウを閉じる<indexterm> + <title> +'<keycap>Esc</keycap>'でウィンドウを閉じる<indexterm> <primary>Escでウィンドウを閉じる</primary> </indexterm> - (デフォルト):EscキーでWinMergeウィンドウを閉じられるようにします。Escを一度押下すると一つのウィンドウを閉じます。つまり、もう一つファイル比較ウィンドウが開いていた場合、WinMergeを終了するためには、キーを合計3回押下する必要があります(最初に、ファイル比較ウィンドウ、次に、フォルダー比較ウィンドウ、そして最後に、WinMergeウィンドウ)。 + +(デフォルト):EscキーでWinMergeウィンドウを閉じられるようにします。Escを一度押下すると一つのウィンドウを閉じます。つまり、もう一つファイル比較ウィンドウが開いていた場合、WinMergeを終了するためには、キーを合計3回押下する必要があります(最初に、ファイル比較ウィンドウ、次に、フォルダー比較ウィンドウ、そして最後に、WinMergeウィンドウ)。 - 注) WinMergeのコマンドラインの -eパラメーターは、WinMergeを + +注) WinMergeのコマンドラインの -eパラメーターは、WinMergeを Esc1回で終了することを可能にします。 - : Escを押下すると + +: Escを押下すると 子ウインドウは閉じますが、最後に残ったメインウィンドウは閉じません。 - : Esc押下で、WinMergeウィンドウを閉じません。 + +: Esc押下で、WinMergeウィンドウを閉じません。
@@ -154,11 +183,13 @@ fileref="screenshots/options_btn.png" /> - (デフォルト):ファイルまたはフォルダーの選択ダイアログで、パスを入力した時に、それらをチェックします。OKボタンは、両方(または3つすべて)のパスが検証されるまで、使用不可となります。注)このチェックは、ほんの少しだけ時間がかかることがあります。 + +(デフォルト):ファイルまたはフォルダーの選択ダイアログで、パスを入力した時に、それらをチェックします。OKボタンは、両方(または3つすべて)のパスが検証されるまで、使用不可となります。注)このチェックは、ほんの少しだけ時間がかかることがあります。 - : ファイルまたはフォルダーの選択ダイアログの + +: ファイルまたはフォルダーの選択ダイアログの OKボタンは常に使用可能となり、 指定したパスを開こうとします。検証による遅延がないため、 パスの選択が速くなります。しかし、パスが開かれなかった場合、 エラーダイアログが表示されます。 @@ -166,7 +197,8 @@ fileref="screenshots/options_btn.png" />
- 複数のインスタンスを起動しない<indexterm> + <title> +単一インスタンスモード<indexterm> <primary>WinMergeウィンドウ</primary> <secondary>インスタンス制限</secondary> @@ -174,25 +206,40 @@ fileref="screenshots/options_btn.png" /> </imageobject><textobject> <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): 複数のWinMergeを起動することができます。 + <para> +<option>無効</option>(デフォルト): 複数のWinMergeを起動することができます。 例えば、WinMergeが起動している時に、WinMergeのショートカットをクリックした場合、 新たなWinMergeウィンドウが開かれます。</para> </listitem> <listitem> - <para><option>有効</option>: WinMergeの起動を一つに制限します。</para> + <para> +<option>1つのみインスタンスを起動する</option>: WinMergeの起動を一つに制限します。</para> <itemizedlist> <listitem> - <para>WinMergeが起動している時に、新しいインスタンスを起動しようとした場合、 新しいウィンドウは開かれず、 + <para> +WinMergeが起動している時に、新しいインスタンスを起動しようとした場合、 新しいウィンドウは開かれず、 代わりに、現在のWinMergeウィンドウが使われます。</para> </listitem> <listitem> - <para>(例えば、コマンドラインから)パスと共に新しいインスタンスを起動しようとした場合、 + <para> +(例えば、コマンドラインから)パスと共に新しいインスタンスを起動しようとした場合、 新たな比較ウィンドウが、既存のWinMergeウィンドウ中に開かれます。</para> </listitem> </itemizedlist> </listitem> + + <listitem> + <para> +<option>Allow only one instance to run and wait for the instance to +terminate</option>: Similar to the "Allow only one instance to run" option, +this setting restricts WinMerge to a single application window. However, it +also ensures that the WinMerge process does not terminate until the +application window is closed. This is useful for situations where external +applications, like SourceTree, need to wait for WinMerge to finish before +they can safely delete temporary files.</para> + </listitem> </itemizedlist> </section> @@ -201,19 +248,22 @@ fileref="screenshots/options_btn.png" /> </imageobject><textobject> <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): 複数の比較ウィンドウが開いている時に、WinMergeを終了する場合、 + <para> +<option>無効</option>(デフォルト): 複数の比較ウィンドウが開いている時に、WinMergeを終了する場合、 WinMergeは、すべてのウィンドウを閉じるかを尋ねます。</para> </listitem> <listitem> - <para><option>有効</option>: <guibutton>終了</guibutton>をクリックした時、未保存のファイル変更が無い場合、 + <para> +<option>有効</option>: <guibutton>終了</guibutton>をクリックした時、未保存のファイル変更が無い場合、 WinMergeは直ちに終了します。</para> </listitem> </itemizedlist> </section> <section> - <title>ファイル比較時のファイル時刻を保つ<indexterm> + <title> +ファイル比較時のファイル時刻を保つ<indexterm> <primary>timestamps</primary> <secondary>preserving</secondary> @@ -221,17 +271,20 @@ WinMergeは直ちに終了します。</para> <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): WinMergeで、ファイルの変更を保存する時、ファイルのタイムスタンプが更新されます。</para> + <para> +<option>無効</option>(デフォルト): WinMergeで、ファイルの変更を保存する時、ファイルのタイムスタンプが更新されます。</para> </listitem> <listitem> - <para><option>有効</option>: WinMergeで、ファイルの変更を保存する時、ファイルシステム上のファイルのタイムスタンプは更新されません。</para> + <para> +<option>有効</option>: WinMergeで、ファイルの変更を保存する時、ファイルシステム上のファイルのタイムスタンプは更新されません。</para> </listitem> </itemizedlist> </section> <section> - <title>起動時にファイルまたはフォルダーの選択ダイアログを表示する<indexterm> + <title> +起動時にファイルまたはフォルダーの選択ダイアログを表示する<indexterm> <primary>ファイルまたはフォルダーの選択ダイアログ</primary> <secondary>opening automatically</secondary> @@ -239,39 +292,45 @@ WinMergeは直ちに終了します。</para> <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): + <para> +<option>無効</option>(デフォルト): WinMerge起動時に、WinMergeウィンドウが開きます。ファイル、または、フォルダーを選択するには、 <menuchoice> <guimenu>ファイル</guimenu> <guimenuitem>開く</guimenuitem> </menuchoice>をクリックしなければなりません。</para> </listitem> <listitem> - <para><option>有効</option>: + <para> +<option>有効</option>: WinMergeを起動した時、WinMergeウィンドウと共に、ファイルまたはフォルダーの選択ダイアログが開きます。</para> </listitem> </itemizedlist> </section> <section> - <title>OK押下時にファイルまたはフォルダーの選択ダイアログを閉じる<indexterm> + <title> +OK押下時にファイルまたはフォルダーの選択ダイアログを閉じる<indexterm> <primary>ファイルまたはフォルダーの選択ダイアログ</primary> </indexterm> - (デフォルト): + + (デフォルト): 比較ボタンをクリックすると、ファイルまたはフォルダーの選択ダイアログは閉じずに開いたままになります。 - : + +: 比較ボタンをクリックすると、ファイルまたはフォルダーの選択ダイアログが閉じます。
- 開くダイアログのオートコンプリート<indexterm> + <title> +開くダイアログのオートコンプリート<indexterm> <primary>MRU リスト</primary> </indexterm> @@ -279,24 +338,28 @@ WinMergeを起動した時、WinMergeウィンドウと共に、ファイルま - 無効(デフォルト): ファイルまたはフォルダーの選択ダイアログでパス入力した時、 + +無効(デフォルト): ファイルまたはフォルダーの選択ダイアログでパス入力した時、 オートコンプリートは実行されません。 - ファイルシステム: + +ファイルシステム: 入力した時にパスを調べます。入力した文字と一致するパスを、ファイルシステム上から見つけようとします。一致するパスが見つかった場合、パスを補完します。 - 最近使ったリスト: パスを、最近使ったリスト(MRU)の中から調べます。 + +最近使ったリスト: パスを、最近使ったリスト(MRU)の中から調べます。 これは、比較用のパスが限定されている場合に便利です。
- 変更されたファイルの自動再読み込み<indexterm> + <title> +変更されたファイルの自動再読み込み<indexterm> <primary>自動再読み込み</primary> </indexterm> @@ -304,17 +367,20 @@ WinMergeを起動した時、WinMergeウィンドウと共に、ファイルま - 無効 (default): 自動再読み込みを無効にします。 + +無効 (default): 自動再読み込みを無効にします。 - ウィンドウがアクティブになった時のみ: WinMergeのウインドウがアクティブになった時、 + +ウィンドウがアクティブになった時のみ: WinMergeのウインドウがアクティブになった時、 もしファイルが変更されていれば、ファイルを再読み込みします。 ただし、この時ファイルを開きなおすか問い合わせるメッセージボックスが表示されます。 このメッセージボックスを表示したくない場合は、「再びこの質問をしない」をチェックし、 はいボタンを押下してください。 - 即時: ファイルが変更されたとき再読み込みを即時に行います。 + +即時: ファイルが変更されたとき再読み込みを即時に行います。 ただし、この時ファイルを開きなおすか問い合わせるメッセージボックスが表示されます。 このメッセージボックスを表示したくない場合は、「再びこの質問をしない」をチェックし、 はいボタンを押下してください。 @@ -322,52 +388,41 @@ WinMergeを起動した時、WinMergeウィンドウと共に、ファイルま
- 言語<indexterm> + <title> +言語<indexterm> <primary>Language</primary> </indexterm> - See . - -
- -
- リセット - - WinMergeは、いくつかのメッセージボックスを抑制することを許可します。 例えば、同一の2つのファイルが開かれた時、通常なら -選択されたファイルは同一です。メッセージボックスが, -開かれます。これ以上、このメッセージを表示して欲しくない場合、 -メッセージボックス中のオプションを有効(チェックON)にすることで、そのメッセージを再び表示しないようにすることができます。 - - あとで、再びメッセージを見たいと思うかもしれません。 -リセットボタンをクリックすることで、メッセージボックスを再び表示するようにできます。 + +See . - - WinMergeを新しいバージョンにアップデートした時は、メッセージを省略することはオススメしません。 -インストーラーは、それらを自動的に表示するようにします。しかし、インストーラーを使用しない場合、 -リセットボタンを使って、メッセージの表示を有効にすることを思い出してください。 -
比較ページ - このページのオプションでは、WinMergeが、ファイルサイズのみを比較する(つまり、いくつかのタイプの差異を無視する)などの差異を検知する方法を変更することが可能です。 + +このページのオプションでは、WinMergeが、ファイルサイズのみを比較する(つまり、いくつかのタイプの差異を無視する)などの差異を検知する方法を変更することが可能です。 - いくつかの違いに興味がないかもしれない場合、差異を見つける方法をカスタマイズすることは、比較の間に有効かもしれません。 + +いくつかの違いに興味がないかもしれない場合、差異を見つける方法をカスタマイズすることは、比較の間に有効かもしれません。 しかし、これらのオプションは、マージにも影響します。 例えば、スペースの変更を無視する場合は、マージ時にソースコード中のインデント変更は保存されません。 - この理由により、いくつかの差異をマージする前に、 このページのオプション(特に無視オプション)をデフォルト値にリセットすることをオススメします。 + +この理由により、いくつかの差異をマージする前に、 このページのオプション(特に無視オプション)をデフォルト値にリセットすることをオススメします。 このページの全オプションをリセットするには、 デフォルトボタンをクリックしてください。
- 様々な無視オプションについて<indexterm> + <title> +様々な無視オプションについて<indexterm> <primary>ignored differences</primary> </indexterm> - 比較ページ(このセクションの後で説明されている)の、 たくさんのオプションによって、明らかな差異を無視することができます。無視された差異は、 + +比較ページ(このセクションの後で説明されている)の、 たくさんのオプションによって、明らかな差異を無視することができます。無視された差異は、 WinMerge内で特別な方法で扱われます。 @@ -384,45 +439,55 @@ WinMerge内で特別な方法で扱われます。 - フォルダー比較では、無視された差異のみが含まれているファイルは、同一のファイルとしてマークされます。 + +フォルダー比較では、無視された差異のみが含まれているファイルは、同一のファイルとしてマークされます。
- 空白<indexterm> + <title> +空白<indexterm> <primary>whitespaces</primary> <secondary>detecting and ignoring differences</secondary> </indexterm> - ホワイトスペースは、単語と行の間の空白です。それは、スペースやタブや改行のような、特別な非印字文字です。ホワイトスペースの重要性は、どのように差異を解釈したり、処理したいかに依ります。ホワイトスペースのすべての変更を見つけることは重要かもしれません。反対に、一つのスペース、二つのスペース、一つのインデント、または、タブなど、すべてのホワイトスペースを同様に扱いたいかもしれません。いくつかの構造化ドキュメント(カンマ区切りリストの様な)では、すべてのホワイトスペースを無視したいかもしれません。 + +ホワイトスペースは、単語と行の間の空白です。それは、スペースやタブや改行のような、特別な非印字文字です。ホワイトスペースの重要性は、どのように差異を解釈したり、処理したいかに依ります。ホワイトスペースのすべての変更を見つけることは重要かもしれません。反対に、一つのスペース、二つのスペース、一つのインデント、または、タブなど、すべてのホワイトスペースを同様に扱いたいかもしれません。いくつかの構造化ドキュメント(カンマ区切りリストの様な)では、すべてのホワイトスペースを無視したいかもしれません。 - 行内のホワイトスペースの変更の影響は、が有効にされている時だけ見ることができます。 + +行内のホワイトスペースの変更の影響は、が有効にされている時だけ見ることができます。 これは、差異ブロックとは対照的に、常にハイライトされます。 行と異なるホワイトスペース - 単語間に一つのスペース:Two Words + +単語間に一つのスペース:Two Words - 単語間に二つのスペース:Two Words + +単語間に二つのスペース:Two Words - 単語間にタブ:Two Words + +単語間にタブ:Two Words - 単語間にスペースなし:TwoWords + +単語間にスペースなし:TwoWords - これらのオプションの一つにより、ホワイトスペースの検出を制御できます: + +これらのオプションの一つにより、ホワイトスペースの検出を制御できます: 比較する - すべてのホワイトスペースが比較されます(デフォルト)。 + +すべてのホワイトスペースが比較されます(デフォルト)。 あなたのドキュメントがどのオプションを必要とするか確かでないなら、これは、たぶん最も安全な選択です。 例では、すべての行が差異として検出されます。 @@ -431,7 +496,8 @@ WinMerge内で特別な方法で扱われます。 変更を無視する - 差異中のホワイトスペースを比較します。 例では、最初の3行には異なるホワイトスペースが存在しています。 + +差異中のホワイトスペースを比較します。 例では、最初の3行には異なるホワイトスペースが存在しています。 しかし、それらは同一行として検出されます。タブと複数個のスペースは、単一のスペースとして扱われます。 最後の行にホワイトスペースは存在しないため、差異は無視 されません(結果的に、最後の2行の単語は異なります) @@ -441,7 +507,8 @@ WinMerge内で特別な方法で扱われます。 すべて無視する - 改行を除く、すべてのホワイトスペース文字を無視します( so lines are detected and preserved in a + +改行を除く、すべてのホワイトスペース文字を無視します( so lines are detected and preserved in a merge)。例のすべての行は、同一行として検出されます。 @@ -450,16 +517,19 @@ merge)。例のすべての行は、同一行として検出されます。 関連するトピック - 行の差異におけるホワイトスペース設定の影響は、 +行の差異におけるホワイトスペース設定の影響は、 で説明されています。 - オプションダイアログのエディターページは、単語間の区切りを検出するために、ホワイトスペースがどのように使われるかの制御に関する設定を含んでいます。詳細は、 + +オプションダイアログのエディターページは、単語間の区切りを検出するために、ホワイトスペースがどのように使われるかの制御に関する設定を含んでいます。詳細は、 を参照してください
- 空行を無視する<indexterm> + <title> +空行を無視する<indexterm> <primary>blank lines</primary> <secondary>detecting and ignoring differences</secondary> @@ -467,37 +537,43 @@ merge)。例のすべての行は、同一行として検出されます。</par <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): ソースファイル中の空行は、 ファイル比較ウインドウ中で、 「差異あり: + <para> +<option>無効</option>(デフォルト): ソースファイル中の空行は、 ファイル比較ウインドウ中で、 「差異あり: 削除」の色の空行で表されされます。</para> </listitem> <listitem> - <para><option>有効</option>: ソースファイル中の空行は無視されます。 + <para> +<option>有効</option>: ソースファイル中の空行は無視されます。 これらは、ファイル比較ウィンドウ中で、「無視された差異」の色の空行で表されます。 しかしながら、差異はマージできません。</para> </listitem> </itemizedlist> </section> <section> - <title>大文字と小文字を区別しない<indexterm> + <title> +大文字と小文字を区別しない<indexterm> <primary>case (letter), detecting and ignoring differences</primary> </indexterm> - (デフォルト): 比較は、大文字小文字を区別します。例えば、 + +(デフォルト): 比較は、大文字小文字を区別します。例えば、 LowerCase、 LOWERCASE、と lowercaseはすべて異なります。 - : 文字間の大文字、 小文字の差異は無視されます。 + +: 文字間の大文字、 小文字の差異は無視されます。
- 改行文字の違いを無視する (Windows/Unix/Mac)<indexterm> + <title> +改行文字の違いを無視する (Windows/Unix/Mac)<indexterm> <primary>EOL</primary> <secondary>detecting and ignoring differences</secondary> @@ -505,19 +581,43 @@ merge)。例のすべての行は、同一行として検出されます。</par <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): 行末(EOL)スタイルの差異は検出されます。 + <para> +<option>無効</option>(デフォルト): 行末(EOL)スタイルの差異は検出されます。 例えば、同じ内容で、行末が異なる2行を比較する場合、 行は異なると判断されます。 この場合、WinMergeは、差異を検出するか、 無視するかの確認ダイアログを表示します。</para> </listitem> <listitem> - <para><option>有効</option>: EOLの差異は無視されます。</para> + <para> +<option>有効</option>: EOLの差異は無視されます。</para> </listitem> </itemizedlist> </section> <section> - <title>コードページの違いを無視する<indexterm> + <title> +数字を無視する<indexterm> + <primary>numbers</primary> + + <secondary>detecting and ignoring differences</secondary> + </indexterm> + + + + +(デフォルト): 数字の差異を検出します。 + + + + +: 数字の差異は無視されます。 + + +
+ +
+ +コードページの違いを無視する<indexterm> <primary>codepage</primary> <secondary>detecting and ignoring differences</secondary> @@ -525,166 +625,192 @@ merge)。例のすべての行は、同一行として検出されます。</par <itemizedlist> <listitem> - <para><option>Disabled</option> (default): ファイルのエンコーディングの違いを検出します。 UTF-8 + <para> +<option>Disabled</option> (default): ファイルのエンコーディングの違いを検出します。 UTF-8 BOMの有無の違いも検出します。</para> </listitem> <listitem> - <para><option>Enabled</option>:ファイルエンコーディングの違いは無視されます。</para> + <para> +<option>Enabled</option>:ファイルエンコーディングの違いは無視されます。</para> </listitem> </itemizedlist> </section> <section> - <title>コメントの違いを無視する<indexterm> + <title> +コメントの違いを無視する<indexterm> <primary>フィルター</primary> <secondary>comments</secondary> </indexterm> - - - - (デフォルト): WinMerge は、他の内容と一緒に、コード中のコメントを比較します。 + +(デフォルト): WinMerge は、他の内容と一緒に、コード中のコメントを比較します。 - : このオプションは、(C++ や Java -のような)プログラミング言語のコメントを検出し、それらを無視することにより、 比較を最適化します。 + +: このオプションは、(C++ や Java +のような)プログラミング言語のコメントを検出し、それらを無視することにより、 +比較を最適化します。検出は構文の強調表示に基づいているため、WinMerge でサポートされていないファイル タイプには影響しません。
- 移動ブロックの検出を有効にする<indexterm> + <title> +移動ブロックの検出を有効にする<indexterm> <primary>moved differences</primary> </indexterm> - (デフォルト): WinMergeは、行の移動による差異を検出しません。 + +(デフォルト): WinMergeは、行の移動による差異を検出しません。 - : WinMergeは、(ファイル中の異なる場所に)移動された行の検出を試みます。移動されたブロックは、 + +: WinMergeは、(ファイル中の異なる場所に)移動された行の検出を試みます。移動されたブロックは、 移動ブロックと 選択された移動ブロックの色で示されます。 ロケーションバーが表示されている場合、左と右のロケーションバーの一致する差異の場所が、線で結ばれます。 移動ブロックの表示は、それが多すぎない場合、ファイル中の変更をより簡単に視覚化することができます。 - 一例は、ロケーションペインの説明を参照してください。 + +一例は、ロケーションペインの説明を参照してください。
- 類似行をマッチさせる<indexterm> + <title> +類似行をマッチさせる<indexterm> <primary>similar lines, aligning</primary> </indexterm> - (デフォルト): Lines within difference blocks are shown as they + +(デフォルト): Lines within difference blocks are shown as they occur in the source files. - : WinMergeは、異なるブロック中の似ている行を検出しようと試みます。 + +: WinMergeは、異なるブロック中の似ている行を検出しようと試みます。 そして、ファイルペインに空行を追加し、それらの位置を揃えます。 このオプションは、行が似通っている時に最も効果的で、行が全く異なっている場合には、それほど効果的ではありません。 - 一例は、にある Similar + +一例は、にある Similar linesの説明を参照してください。
- Diff アルゴリズム<indexterm> + <title> +Diff アルゴリズム<indexterm> <primary>algorithm</primary> </indexterm> - (デフォルト): 基本的な差分アルゴリズムです。 + + (デフォルト): 基本的な差分アルゴリズムです。 - : できるだけ差分が少なくなるように比較します。 その分、比較に時間がかかります。 + +: できるだけ差分が少なくなるように比較します。 その分、比較に時間がかかります。 - : patienceアルゴリズムで差分を比較します。 + +: patienceアルゴリズムで差分を比較します。 - : histogramアルゴリズムで差分を比較します。 + +: histogramアルゴリズムで差分を比較します。 このアルゴリズムはpatienceアルゴリズムを低頻度の共通要素に対応するように拡張しています。 - : このアルゴリズムは行の挿入や削除を検出しません。 + +: このアルゴリズムは行の挿入や削除を検出しません。
- indent heuristic を有効にする<indexterm> + <title> +indent heuristic を有効にする<indexterm> <primary>indent heuristic</primary> </indexterm> - (デフォルト): 差分のハンク境界をシフトするヒューリスティックを有効にして、差分を読みやすくします。 Diff + + (デフォルト): 差分のハンク境界をシフトするヒューリスティックを有効にして、差分を読みやすくします。 Diff アルゴリズムがdefaultの場合、効果はありません。 - : ヒューリスティックを無効にします。 + +: ヒューリスティックを無効にします。
- Completely unhighlight the ignored differences<indexterm> + <title> +Completely unhighlight the ignored differences<indexterm> <primary>unhighlight ignored differences</primary> </indexterm> - : Makes the color of the different lines ignored by + +: Makes the color of the different lines ignored by line filters and substitution filters the same as the color of the identical lines. - (default): Difference lines ignored by line + + (default): Difference lines ignored by line filters and substitution filters are displayed in the color of Ignored Difference.
- +
比較/フォルダーページ
- 比較方法<indexterm> + <title> +比較方法<indexterm> <primary>ファイルの比較</primary> <secondary>detection options</secondary> </indexterm> - このオプションは、ファイル比較を完了する方法を決めることができます。5つの選択肢から1つを選んでください。 + +このオプションは、ファイル比較を完了する方法を決めることができます。5つの選択肢から1つを選んでください。 フルコンテンツ - デフォルト: ファイルの内容すべてを比較します。 この方法はプラグインを発動し、正確な差異と移動ブロック検出のために diffutils + +デフォルト: ファイルの内容すべてを比較します。 この方法はプラグインを発動し、正確な差異と移動ブロック検出のために diffutils エンジンを使用します。 これは、もっとも完璧でオススメの方法です。 @@ -693,10 +819,12 @@ Difference. クイックコンテンツ - スリムダウンされた、ファイルの内容による比較です。この方法は、プラグインと移動ブロック検出をスキップし、簡素化されたファイル比較コードを使用します。この方法は、 + +スリムダウンされた、ファイルの内容による比較です。この方法は、プラグインと移動ブロック検出をスキップし、簡素化されたファイル比較コードを使用します。この方法は、 ファイルを読み込まないため、 フルコンテンツよりも高速です。 - 短所は、比較時に行フィルターが許可されないことです。例えば、この方法は、行フィルターをファイルのすべての差異を無視するように設定していても、それらを差異として検出します。 + +短所は、比較時に行フィルターが許可されないことです。例えば、この方法は、行フィルターをファイルのすべての差異を無視するように設定していても、それらを差異として検出します。 @@ -704,7 +832,8 @@ Difference. バイナリコンテンツ - この比較方法は、クイックコンテンツの比較方法よりも高速です。 ただし、プラグインや行フィルター、「大文字と小文字を区別しない」 + +この比較方法は、クイックコンテンツの比較方法よりも高速です。 ただし、プラグインや行フィルター、「大文字と小文字を区別しない」 オプションなどは適用されません。まず、ファイルサイズを比較し、 ファイルサイズが異なる場合は、内容を比較せずにファイルの内容を異なるもの として扱います。ファイルサイズが一致していれば、単にファイルの内容を バイト単位で比較します。 ファイルのエンコード検出、EOL検出、バイナリファイルの検出は行われません。 この比較方法は、バックアップされたファイルとの比較に適しています。 @@ -712,14 +841,16 @@ Difference. - 更新日時 + +更新日時 timestamps comparing - ファイルの更新日時のみを比較するため、他のどの比較方法よりもずっと高速です。 しかし、明らかに、それはただ更新日時と同じくらい正確です。 + +ファイルの更新日時のみを比較するため、他のどの比較方法よりもずっと高速です。 しかし、明らかに、それはただ更新日時と同じくらい正確です。 @@ -727,26 +858,30 @@ Difference. 更新日時とサイズ - 更新日時と似ていますが、 日時が同一の時に、ファイルサイズもチェックします。 + +更新日時と似ていますが、 日時が同一の時に、ファイルサイズもチェックします。 - サイズ + +サイズ file sizes comparing - ファイルサイズのみを比較するため高速ですが、 内容を比較する方法よりも不正確です。 + +ファイルサイズのみを比較するため高速ですが、 内容を比較する方法よりも不正確です。
- 最初の差異で比較を終了する<indexterm> + <title> +最初の差異で比較を終了する<indexterm> <primary>ファイルの比較</primary> <secondary>stopping after first difference</secondary> @@ -756,18 +891,22 @@ Difference.</para> <secondary>stopping after first difference</secondary> </indexterm> - このオプションは、比較方法に クイックコンテンツが選択された場合にのみ有効となります。 + +このオプションは、比較方法に クイックコンテンツが選択された場合にのみ有効となります。 - (デフォルト): WinMerge は、ファイル中のすべての差異を検査します。 + +(デフォルト): WinMerge は、ファイル中のすべての差異を検査します。 - : このオプションは、常にファイル全体をスキャンする代わりに、 + +: このオプションは、常にファイル全体をスキャンする代わりに、 最初の差異が見つかるまでファイルを検査することにより比較を最適化します。 - 欠点は、WinMerge が、バイナリファイルをバイナリとして検出できないかもしれないことです。 + +欠点は、WinMerge が、バイナリファイルをバイナリとして検出できないかもしれないことです。 最初の差異がファイルの先頭付近にある場合、このようなことが起こります。 どんな種類のファイルを比較するか知っているなら、このオプションは比較を高速化するための良い方法となるでしょう。 しかし、比較するファイルがどんな種類か確かでないなら、このオプションを有効にしないでください。 @@ -776,7 +915,8 @@ Difference.
- 3秒以下の時間差を無視する<indexterm> + <title> +3秒以下の時間差を無視する<indexterm> <primary>timestamps</primary> <secondary>detecting and ignoring differences</secondary> @@ -784,26 +924,66 @@ Difference.</para> <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): 異なるタイムスタンプを持つファイルは、差異として検出されます。</para> + <para> +<option>無効</option>(デフォルト): 異なるタイムスタンプを持つファイルは、差異として検出されます。</para> </listitem> <listitem> - <para><option>有効</option>: 時々(例えば、ネットワーク共有を使用中の場合)、 僅かなタイムスタンプの差異は重要なことではありません。 + <para> +<option>有効</option>: 時々(例えば、ネットワーク共有を使用中の場合)、 僅かなタイムスタンプの差異は重要なことではありません。 そのような状況でより意味のある結果を得るために、 このオプションで3秒以下の時間差を無視することができます。</para> - <para>このオプションは、( <xref linkend="Configuration_compmethod" />で説明されている)比較方法が、 + <para> +このオプションは、( <xref linkend="Configuration_compmethod" />で説明されている)比較方法が、 <guimenuitem>更新日時</guimenuitem>か <guimenuitem>更新日時とサイズ</guimenuitem>の場合にのみ動作します。 他の比較方法と共に使用しても効果はありません。</para> <warning> - <para>このオプションは、時間差が検出された時のみ有効です。さもなければ、それは不正な比較結果の原因となります。</para> + <para> +このオプションは、時間差が検出された時のみ有効です。さもなければ、それは不正な比較結果の原因となります。</para> </warning> </listitem> </itemizedlist> </section> - + + <section> + <title> +比較後自動的にサブフォルダーを展開する<indexterm> + <primary>expand subfolders</primary> + + <secondary>detecting and ignoring differences</secondary> + </indexterm> + + + + + (default): Subfolders remain collapsed after +comparison. + + + + +: All subfolders are expanded after +comparison. + + + + +: Only subfolders with +differences are expanded after comparison. + + + + +: Only subfolders without +differences are expanded after comparison. + + +
+
- 片方にしか存在しないフォルダー内も含める<indexterm> + <title> +片方にしか存在しないフォルダー内も含める<indexterm> <primary>include unique subfolders</primary> <secondary>detecting and ignoring differences</secondary> @@ -811,19 +991,22 @@ Difference.</para> <itemizedlist> <listitem> - <para><option>Disabled</option> (default): WinMerge ignore unique subfolders when + <para> +<option>Disabled</option> (default): WinMerge ignore unique subfolders when comparing folders.</para> </listitem> <listitem> - <para><option>Enabled</option>: WinMerge also shows the content from unique + <para> +<option>Enabled</option>: WinMerge also shows the content from unique subfolders.</para> </listitem> </itemizedlist> </section> - + <section> - <title>Include subfolders<indexterm> + <title> +Include subfolders<indexterm> <primary>include subfolders</primary> <secondary>detecting and ignoring differences</secondary> @@ -831,19 +1014,22 @@ subfolders.</para> <itemizedlist> <listitem> - <para><option>Enabled</option> (default): WinMerge doing a recursive comparing and + <para> +<option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders.</para> </listitem> <listitem> - <para><option>Disabled</option>: WinMerge only comparing the files in the root + <para> +<option>Disabled</option>: WinMerge only comparing the files in the root folder.</para> </listitem> </itemizedlist> </section> - + <section> - <title>比較後自動的にサブフォルダーを展開する<indexterm> + <title> +比較後自動的にサブフォルダーを展開する<indexterm> <primary>expand subfolders</primary> <secondary>detecting and ignoring differences</secondary> @@ -854,7 +1040,8 @@ folder.</para> <term>展開しない</term> <listitem> - <para>(デフォルト): フォルダ比較後、自動的にサブフォルダを展開しません。</para> + <para> +(デフォルト): フォルダ比較後、自動的にサブフォルダを展開しません。</para> </listitem> </varlistentry> @@ -862,7 +1049,8 @@ folder.</para> <term>すべてのサブフォルダーを展開</term> <listitem> - <para>フォルダ比較後、自動的にすべてのサブフォルダを展開します。</para> + <para> +フォルダ比較後、自動的にすべてのサブフォルダを展開します。</para> </listitem> </varlistentry> @@ -870,7 +1058,8 @@ folder.</para> <term>差異のあるサブフォルダーを展開</term> <listitem> - <para>フォルダ比較後、自動的に差異のあるサブフォルダを展開します。</para> + <para> +フォルダ比較後、自動的に差異のあるサブフォルダを展開します。</para> </listitem> </varlistentry> @@ -878,14 +1067,16 @@ folder.</para> <term>同一のサブフォルダーを展開</term> <listitem> - <para>フォルダ比較後、自動的に同一のサブフォルダを展開します。</para> + <para> +フォルダ比較後、自動的に同一のサブフォルダを展開します。</para> </listitem> </varlistentry> </variablelist> </section> <section> - <title>再解析ポイントを無視する<indexterm> + <title> +再解析ポイントを無視する<indexterm> <primary>reparse points</primary> <secondary>detecting and ignoring differences</secondary> @@ -893,17 +1084,20 @@ folder.</para> <itemizedlist> <listitem> - <para><option>Disabled</option> (default): TBD</para> + <para> +<option>Disabled</option> (default): TBD</para> </listitem> <listitem> - <para><option>Enabled</option>: TBD</para> + <para> +<option>Enabled</option>: TBD</para> </listitem> </itemizedlist> </section> - + <section> - <title>クイック比較切替閾値 (MB)<indexterm> + <title> +クイック比較切替閾値 (MB)<indexterm> <primary>Quick compare</primary> <secondary>limit</secondary> @@ -911,15 +1105,18 @@ folder.</para> <itemizedlist> <listitem> - <para><option>Disabled</option>: Is not active unless the Compare method is set to + <para> +<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> compare method.</para> </listitem> <listitem> - <para><option>Enabled</option>: Is active when the Compare method is set to + <para> +<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> compare method.</para> - <para>Threshold size for switching to <guilabel>Quick Contents</guilabel> compare + <para> +Threshold size for switching to <guilabel>Quick Contents</guilabel> compare method. When <guilabel>Full Contents</guilabel> compare method is selected, files bigger (in mega bytes) than this value are compared using <guilabel>Quick Contents</guilabel> compare method.</para> @@ -928,7 +1125,8 @@ files bigger (in mega bytes) than this value are compared using </section> <section> - <title>Threshold for switching to binary compare (MB)<indexterm> + <title> +Threshold for switching to binary compare (MB)<indexterm> <primary>Binary compare</primary> <secondary>limit</secondary> @@ -936,17 +1134,20 @@ files bigger (in mega bytes) than this value are compared using <itemizedlist> <listitem> - <para><option>Disabled</option>: Is not active unless the Compare method is set to + <para> +<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> and <guilabel>Quick Contents</guilabel> compare method.</para> </listitem> <listitem> - <para><option>Enabled</option>: Is active when the Compare method is set to + <para> +<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> compare method.</para> - <para>Threshold size for switching to Binary Contents compare method. When + <para> +Threshold size for switching to Binary Contents compare method. When <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> compare method is selected, files bigger (in mega bytes) than this value are compared using <guilabel>Binary Contents</guilabel> compare method.</para> @@ -955,20 +1156,23 @@ compared using <guilabel>Binary Contents</guilabel> compare method.</para> </section> <section> - <title>比較スレッドの数<indexterm> + <title> +使用するCPUコアの数<indexterm> <primary>compare threads</primary> </indexterm> - Number of threads which use to comparing. With a negative value WinMerge + +Number of threads which use to comparing. With a negative value WinMerge will use addition of the number of available CPU cores.
- 比較/テーブル ページ<indexterm> - <primary>table files</primary> - </indexterm> + +比較/テーブル ページ<indexterm> + <primary>table files</primary> + </indexterm>
CSV ファイルとして扱うパターン @@ -994,12 +1198,14 @@ will use addition of the number of available CPU cores. 引用符内の改行文字を値として扱う - (デフォルト): テキストに引用符文字が現れてから次の引用符文字が現れる前に改行文字が現れた場合、 + + (デフォルト): テキストに引用符文字が現れてから次の引用符文字が現れる前に改行文字が現れた場合、 この改行文字を値とみなします。 一つのフィールドに複数の行が格納されているCSV/TSVファイルを処理する場合は、このオプションを有効にします。 - : 上記を無効にします。引用符の数に誤りのあるファイルを開く場合は、 このオプションを無効にしてください。 + +: 上記を無効にします。引用符の数に誤りのあるファイルを開く場合は、 このオプションを無効にしてください。
@@ -1015,13 +1221,15 @@ will use addition of the number of available CPU cores.
比較/バイナリ ページ
- バイナリファイルとして扱うパターン<indexterm> + <title> +バイナリファイルとして扱うパターン<indexterm> <primary>binary files</primary> </indexterm> TBD
- Frhed settings<indexterm> + <title> +Frhed settings<indexterm> <primary>frhed</primary> </indexterm> TBD @@ -1054,9 +1262,10 @@ will use addition of the number of available CPU cores.
- 比較/画像 ページ<indexterm> - <primary>image files</primary> - </indexterm> + +比較/画像 ページ<indexterm> + <primary>image files</primary> + </indexterm>
画像ファイルとして扱うパターン TBD @@ -1073,15 +1282,81 @@ will use addition of the number of available CPU cores.
+
+ +Webページ ページ<indexterm> + <primary>webpages</primary> + </indexterm> + +
+ +URL pattern to include (Regular expression)<indexterm> + </indexterm> + TBD +
+ +
+ +URL pattern to exclude (Regular expression)<indexterm> + </indexterm> + TBD +
+ +
+ +User data folder location<indexterm> + </indexterm> + TBD +
+ +
+ +Separate user data folders for each pane<indexterm> + </indexterm> + TBD +
+ +
+ +
+ +Message Boxes page<indexterm> + <primary>message boxes</primary> + </indexterm> + +
+ リセット + + +WinMergeは、いくつかのメッセージボックスを抑制することを許可します。 例えば、同一の2つのファイルが開かれた時、通常なら +選択されたファイルは同一です。メッセージボックスが, +開かれます。これ以上、このメッセージを表示して欲しくない場合、 +メッセージボックス中のオプションを有効(チェックON)にすることで、そのメッセージを再び表示しないようにすることができます。 + + +あとで、再びメッセージを見たいと思うかもしれません。 +リセットボタンをクリックすることで、メッセージボックスを再び表示するようにできます。 + + + +WinMergeを新しいバージョンにアップデートした時は、メッセージを省略することはオススメしません。 +インストーラーは、それらを自動的に表示するようにします。しかし、インストーラーを使用しない場合、 +リセットボタンを使って、メッセージの表示を有効にすることを思い出してください。 + +
+
+
- エディター一般ページ<indexterm> + <title> +エディター一般ページ<indexterm> <primary>editing</primary> <secondary>options for File Compare window</secondary> </indexterm>
- シンタックスハイライト<indexterm> + <title> +シンタックスハイライト<indexterm> <primary>シンタックスハイライト</primary> <secondary>enabling and disabling</secondary> @@ -1089,21 +1364,24 @@ will use addition of the number of available CPU cores.</para> <itemizedlist> <listitem> - <para><option>有効</option>(デフォルト): WinMerge + <para> +<option>有効</option>(デフォルト): WinMerge は、多くのプログラミング言語とwebフォーマットを、シンタックスハイライトすることができます。デフォルトでサポートされている形式を見るには、 <menuchoice> <guimenu>表示</guimenu> <guimenuitem>シンタックスハイライト</guimenuitem>をクリックしてください</menuchoice>。</para> </listitem> <listitem> - <para><option>無効</option>: シンタックスハイライトは、多少のCPUパワーを消費するため、WinMerge + <para> +<option>無効</option>: シンタックスハイライトは、多少のCPUパワーを消費するため、WinMerge の画面描画が遅いと思う場合は、これを無効にすると良いかもしれません。</para> </listitem> </itemizedlist> </section> <section> - <title>元のEOL文字を保存する<indexterm> + <title> +元のEOL文字を保存する<indexterm> <primary>EOL</primary> <secondary>preserving</secondary> @@ -1115,22 +1393,26 @@ will use addition of the number of available CPU cores.</para> <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): ファイルが、Windows のファイルであると仮定します。ファイルが、Windows + <para> +<option>無効</option>(デフォルト): ファイルが、Windows のファイルであると仮定します。ファイルが、Windows 標準の行末文字を使用していない場合、WinMerge は、これをエラーとみなします。 それらを、差異として検出する代わりに、Windows スタイルの行末文字へ静かに変更します。 それゆえ、ファイル比較ウィンドウのステータスバーには、EOLスタイル <guilabel>Win</guilabel>として表示します。</para> - <para>ほとんどの場合、このオプションは無効のままにしておくべきです。 行末文字の異なる2つのファイルを比較する場合、 + <para> +ほとんどの場合、このオプションは無効のままにしておくべきです。 行末文字の異なる2つのファイルを比較する場合、 デフォルトの振る舞いで、十分うまく動作するでしょう。</para> </listitem> <listitem> - <para><option>有効</option>: WinMerge が行末文字を自動的に変更するのを防ぎます。 + <para> +<option>有効</option>: WinMerge が行末文字を自動的に変更するのを防ぎます。 その結果、すべての行のEOLスタイルの差異を検出します。これは、(Windows と Unixなど)異なるEOLスタイルを持つシステムからのファイルを扱うために便利かもしれません。</para> <important> - <para>また、これは、EOLバイトに詳しい方や、 <emphasis> + <para> +また、これは、EOLバイトに詳しい方や、 <emphasis> 1つの</emphasis>ファイルに異なるEOLスタイルが混在するファイルを比較したい方のための高等なオプションです。 あなたが、この高等な機能を必要としないなら、このオプションを有効にしないことをオススメします。 このオプションは、異なるEOLスタイルの2ファイルを比較するためには、 不要であることを憶えておいてください。</para> @@ -1140,7 +1422,8 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを </section> <section> - <title>タブ<indexterm> + <title> +タブ<indexterm> <primary>tabs</primary> <secondary>editing options</secondary> @@ -1151,7 +1434,8 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを <term>タブ幅</term> <listitem> - <para>タブの幅です。値を指定してください <replaceable>n</replaceable>: 設定した幅は、同数の + <para> +タブの幅です。値を指定してください <replaceable>n</replaceable>: 設定した幅は、同数の <replaceable>n</replaceable>の文字と同じになります。 デフォルト: 4。 最大値は64です。</para> </listitem> </varlistentry> @@ -1160,15 +1444,18 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを <term>タブ挿入オプション</term> <listitem> - <para>テキスト中でtabキーを押下した時に、どの種類の文字が使われるかを指定します。次のうち、1つだけを有効にすることができます:</para> + <para> +テキスト中でtabキーを押下した時に、どの種類の文字が使われるかを指定します。次のうち、1つだけを有効にすることができます:</para> <itemizedlist> <listitem> - <para><guilabel>タブを挿入</guilabel>(デフォルト):1つのタブ文字を使用します。</para> + <para> +<guilabel>タブを挿入</guilabel>(デフォルト):1つのタブ文字を使用します。</para> </listitem> <listitem> - <para><guilabel>スペースを挿入</guilabel>: タブ文字の代わりに、( + <para> +<guilabel>スペースを挿入</guilabel>: タブ文字の代わりに、( <option>タブ幅</option>)で指定された個数分のスペースを挿入します。例えば、デフォルトのタブ幅の場合、4つのスペースが挿入されます。</para> </listitem> </itemizedlist> @@ -1178,51 +1465,61 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを </section> <section> - <title>レンダリングモード<indexterm> + <title> +レンダリングモード<indexterm> <primary>rendering</primary> </indexterm> - (default): TBD + + (default): TBD - : TBD + +: TBD - : TBD + +: TBD - : TBD + +: TBD - : TBD + +: TBD - : TBD + +: TBD - : TBD + +: TBD
- エディター 比較/マージページ<indexterm> + <title> +エディター 比較/マージページ<indexterm> <primary>editing</primary> <secondary>options for File Compare window</secondary> </indexterm>
- 自動的に再スキャンする<indexterm> + <title> +自動的に再スキャンする<indexterm> <primary>rescanning files</primary> <secondary>enabling and disabling autoscan</secondary> @@ -1230,15 +1527,18 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを <itemizedlist> <listitem> - <para><option>無効</option>(デフォルト): WinMerge は、差異をマージした時、または、 + <para> +<option>無効</option>(デフォルト): WinMerge は、差異をマージした時、または、 <guibutton>表示更新</guibutton>ボタンをクリックするなどした時、 自動的に再スキャンします。</para> </listitem> <listitem> - <para><option>有効</option>: WinMerge は、すべての編集イベント (入力するなど、ファイルへの変更)の後、強制的に再スキャンします。</para> + <para> +<option>有効</option>: WinMerge は、すべての編集イベント (入力するなど、ファイルへの変更)の後、強制的に再スキャンします。</para> <note> - <para>編集作業を遅くするのを避けるために、WinMerge は、自動再スキャンを僅かながら遅らせます(編集イベント後1秒待ちます)。 + <para> +編集作業を遅くするのを避けるために、WinMerge は、自動再スキャンを僅かながら遅らせます(編集イベント後1秒待ちます)。 それにより、それぞれの新しい編集イベントがタイマーをリセットし、 編集を中断するか止めるまで、再スキャンは起こりません。</para> </note> </listitem> @@ -1246,41 +1546,49 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを </section> <section> - <title>選択された差異のコピー粒度<indexterm> + <title> +選択された差異のコピー粒度<indexterm> <primary>copy granularity</primary> </indexterm> - テキストが選択された状態で、右側へコピー + +テキストが選択された状態で、右側へコピー メニュー等をクリックして別ペインにコピーするときのコピー粒度を指定します。 - : 選択されたテキスト内の差異ブロックをコピーします。 + + : 選択されたテキスト内の差異ブロックをコピーします。 - : 選択されたテキスト内の行内差異をコピーします。 + +: 選択されたテキスト内の行内差異をコピーします。 - : 選択されたテキスト内の差異を行単位でコピーします。 + +: 選択されたテキスト内の差異を行単位でコピーします。 - (デフォルト): 選択されたテキスト内の差異を行単位でコピーします。 + + (デフォルト): 選択されたテキスト内の差異を行単位でコピーします。
- 行内差異の強調<indexterm> + <title> +行内差異の強調<indexterm> <primary>line differences</primary> <secondary>viewing options</secondary> </indexterm> - これらは、 行内差異(差異ブロックの行内の変更)の検出を有効にし、また、その設定をします。: + +これらは、 行内差異(差異ブロックの行内の変更)の検出を有効にし、また、その設定をします。: @@ -1289,29 +1597,34 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを - (デフォルト): WinMerge は、行内の差異をハイライトします。メニューの + +(デフォルト): WinMerge は、行内の差異をハイライトします。メニューの 表示 行内差異を表示 でも有効にできます。 - + 次のサブオプションから、1つ選択してください: - + - 文字単位: 異なる文字をハイライトします。 このオプションは、単語内の変更を探す場合や、 + +文字単位: 異なる文字をハイライトします。 このオプションは、単語内の変更を探す場合や、 明確な単語分割をしていないファイルの場合に役立つでしょう。 - + - 単語単位(デフォルト) 差異のある単語全体をハイライトします。 - + +単語単位(デフォルト) 差異のある単語全体をハイライトします。 + - 空白で区切る(デフォルト): 単語は、空白で区切られていると仮定されます。 + +空白で区切る(デフォルト): 単語は、空白で区切られていると仮定されます。 これは、大抵の典型的なテキストファイルに作用します。 - + - 空白か句読点で区切る: 空白と句読点の両方を単語境界とみなします。 これは、(カンマ区切りリストのような) + +空白か句読点で区切る: 空白と句読点の両方を単語境界とみなします。 これは、(カンマ区切りリストのような) 句読点で区切られたリストを扱うために便利です。 @@ -1320,7 +1633,8 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを - : WinMerge は、行内差異をハイライトしません。そして、レベルと空白オプションは無視されます。メニューの、 + +: WinMerge は、行内差異をハイライトしません。そして、レベルと空白オプションは無視されます。メニューの、 表示 行内差異を表示 も無効になります。 @@ -1333,16 +1647,17 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを Word break characters - - TBD - + + TBD + 関連トピック - WinMerge + + WinMerge が、行内差異をどのように検出しマークするのかを、もっと詳細に説明します。
@@ -1350,23 +1665,28 @@ Unixなど)異なるEOLスタイルを持つシステムからのファイルを
- 色 ページ<indexterm> + <title> +色 ページ<indexterm> <primary>difference colors</primary> <secondary>オプション</secondary> </indexterm> - ファイル比較ウィンドウで使用される差異などの色を変更したい場合は、 このページで行ってください。 背景、削除、テキストを設定可能です。 + +ファイル比較ウィンドウで使用される差異などの色を変更したい場合は、 このページで行ってください。 背景、削除、テキストを設定可能です。 - 色を変更するには色ボックスをクリックし、標準的な色の設定ダイアログを開きます。 基本色か作成した色から1つ選択し + +色を変更するには色ボックスをクリックし、標準的な色の設定ダイアログを開きます。 基本色か作成した色から1つ選択し OKをクリックすると、新しい色がボックスに読み込まれます。 - To revert to the default colors of a scheme, choose a different scheme and + +To revert to the default colors of a scheme, choose a different scheme and return to the modified scheme.
- Differences Colors page<indexterm> + <title> +Differences Colors page<indexterm> <primary>differences colors</primary> <secondary>オプション</secondary> @@ -1376,36 +1696,42 @@ return to the modified scheme.</para> </section> <section id="Configuration_syntaxcolors"> - <title>色/シンタックス ページ<indexterm> + <title> +色/シンタックス ページ<indexterm> <primary>シンタックスハイライト</primary> <secondary>color options</secondary> </indexterm> - デフォルトでは、WinMerge のファイル比較ウィンドウは、 +デフォルトでは、WinMerge のファイル比較ウィンドウは、 で説明されている、ある程度の種類のソースコードのシンタックスを評価します。 このページは、認識されるシンタックス要素を列挙し、これらのテキストの色と太さを変更可能にします。 - To revert to the default colors of a scheme, choose a different scheme and + +To revert to the default colors of a scheme, choose a different scheme and return to the modified scheme.
- 色/テキスト ページ<indexterm> + <title> +色/テキスト ページ<indexterm> <primary>text colors</primary> <secondary>オプション</secondary> </indexterm> - テキスト色を変更するには、このページを使用してください。はじめに、 + +テキスト色を変更するには、このページを使用してください。はじめに、 カスタムテキストカラーを使用にチェックしてください。 これは、カスタムテキストカラーを有効化します。空白、標準テキスト、選択の3種類のテキストの設定があります。 それぞれの種類のテキストに対し、背景と文字の色を選択することができます。
- 色/マーカー ページ<indexterm> + <title> +色/マーカー ページ<indexterm> <primary>marker colors</primary> <secondary>オプション</secondary> @@ -1415,70 +1741,85 @@ return to the modified scheme.</para> </section> <section id="Configuration_foldercomparecolors"> - <title>色/フォルダー比較 ページ<indexterm> + <title> +色/フォルダー比較 ページ<indexterm> <primary>folder compare colors</primary> <secondary>オプション</secondary> </indexterm> - By default, the WinMerge Folder Compare window use background colors to show + +By default, the WinMerge Folder Compare window use background colors to show the status from a item (equal, different, not exists on all sides or filtered). - 色を変更するには色ボックスをクリックし、標準的な色の設定ダイアログを開きます。 基本色か作成した色から1つ選択し + +色を変更するには色ボックスをクリックし、標準的な色の設定ダイアログを開きます。 基本色か作成した色から1つ選択し OKをクリックすると、新しい色がボックスに読み込まれます。 - To revert to the default colors of a scheme, choose a different scheme and + +To revert to the default colors of a scheme, choose a different scheme and return to the modified scheme.
- アーカイブサポートページ<indexterm> + <title> +アーカイブサポートページ<indexterm> <primary>archiving files</primary> <secondary>configuring support after installation</secondary> </indexterm> - このページは、7-Zip を使用した Winzipアーカイブサポートの設定のためのオプションを含んでいます。 + +このページは、7-Zip を使用した Winzipアーカイブサポートの設定のためのオプションを含んでいます。
- アーカイブファイルサポートを有効にする<indexterm> + <title> +アーカイブファイルサポートを有効にする<indexterm> <primary>7-Zip archives</primary> <secondary>enabling and disabling integration</secondary> </indexterm> - このオプションは、WinMerge が(7-Zip統合を基にした)アーカイブファイルを扱う方法を制御します。 + +このオプションは、WinMerge が(7-Zip統合を基にした)アーカイブファイルを扱う方法を制御します。 - (デフォルト): WinMerge は、7-Zipアーカイブを識別します。 + +(デフォルト): WinMerge は、7-Zipアーカイブを識別します。 - : 7-Zipアーカイブサポートを無効にします。 + +: 7-Zipアーカイブサポートを無効にします。
- ファイルのシグネチャからアーカイブの種類を検出する<indexterm> + <title> +ファイルのシグネチャからアーカイブの種類を検出する<indexterm> <primary>detecting archive types</primary> </indexterm> - (デフォルト): WinMerge + +(デフォルト): WinMerge は、お使いのシステムにおいて、既知の拡張子のアーカイブファイルのみを見分けることができます。 (for example, in the registry or through a file association) - : WinMerge + +: WinMerge は、ファイルの拡張子が不明な形式の場合でも、アーカイブファイルを見分けることができます。アーカイブを見分けるために、WinMerge は、ファイルの先頭から、アーカイブシグネチャバイトを探します。 - WinMergeが、OpenOfficeファイルを見分けるために、このオプションを有効にすることができます。 - + +WinMergeが、OpenOfficeファイルを見分けるために、このオプションを有効にすることができます。 + +
@@ -1488,7 +1829,8 @@ or through a file association) システムページ
- 削除されたファイルをゴミ箱に移動する<indexterm> + <title> +削除されたファイルをゴミ箱に移動する<indexterm> <primary>ファイルの削除</primary> <secondary>オプション</secondary> @@ -1496,99 +1838,118 @@ or through a file association)</para> <itemizedlist> <listitem> - <para><option>有効</option>(デフォルト): フォルダー比較ウィンドウで削除したファイルやフォルダーは、 可能な場合、ゴミ箱へ移動されます。</para> + <para> +<option>有効</option>(デフォルト): フォルダー比較ウィンドウで削除したファイルやフォルダーは、 可能な場合、ゴミ箱へ移動されます。</para> <important> - <para>お使いのシステムでゴミ箱が無効にされている場合、このオプションは動作しないことを、憶えておいてください。 その場合、ファイルは削除され失われます！</para> + <para> +お使いのシステムでゴミ箱が無効にされている場合、このオプションは動作しないことを、憶えておいてください。 その場合、ファイルは削除され失われます！</para> </important> <para></para> </listitem> <listitem> - <para><option>無効</option>: フォルダー比較ウィンドウで削除されたファイルやフォルダーは、 本当に削除されます。</para> + <para> +<option>無効</option>: フォルダー比較ウィンドウで削除されたファイルやフォルダーは、 本当に削除されます。</para> </listitem> </itemizedlist> </section> <section id="Configuration_external_editor"> - <title>外部エディター<indexterm> + <title> +外部エディター<indexterm> <primary>external editor</primary> <secondary>configuring</secondary> </indexterm> - WinMergeのファイル比較ウィンドウは、一般的な編集機能を提供します。 + +WinMergeのファイル比較ウィンドウは、一般的な編集機能を提供します。 あなたのお気に入りのフル機能のエディターを使いたい場合、フォルダー比較コンテキストメニューから、WinMerge が外部エディターを開くように設定することができます。 - デフォルトの外部エディターには、すべての Windows システムにある、メモ帳(notepad.exe)が設定されています。 + +デフォルトの外部エディターには、すべての Windows システムにある、メモ帳(notepad.exe)が設定されています。 異なる外部エディターを設定するには、その実行ファイルのフルパスを入力してください。 - パスと一緒に、その外部ツールでサポートされている、いくらかのコマンドラインパラメーターを含むことができます。このようなフォーマットです。 + +パスと一緒に、その外部ツールでサポートされている、いくらかのコマンドラインパラメーターを含むことができます。このようなフォーマットです。 実行ファイルのパス - 設定された外部エディターを使うには、フォルダー比較ウィンドウ中のファイルを右クリックし、 + +設定された外部エディターを使うには、フォルダー比較ウィンドウ中のファイルを右クリックし、 左を開く 外部エディターで 、または、 右を開く 外部エディターで を選択してください。
- フィルターフォルダー<indexterm> + <title> +フィルターフォルダー<indexterm> <primary>Filters folders</primary> <secondary>specifying default private folder</secondary> </indexterm> - ファイルフィルター用の個人フォルダーの指定には、このフィールドを使用してください。デフォルトでは、このフォルダーは、 Windows 10 では + +ファイルフィルター用の個人フォルダーの指定には、このフィールドを使用してください。デフォルトでは、このフォルダーは、 Windows 10 では ドキュメントといった)、あなたのユーザープロファイルフォルダーです。ファイルフィルターを作成したら、このフォルダーへ自動的に追加されます。
- テンポラリファイルフォルダー<indexterm> + <title> +テンポラリファイルフォルダー<indexterm> <primary>temporary files, folder used</primary> </indexterm> - WinMerge が、一時ファイルを保存するフォルダーを指定してください。次のうち、何れか1つが有効です: + +WinMerge が、一時ファイルを保存するフォルダーを指定してください。次のうち、何れか1つが有効です: - システムのテンポラリフォルダー (デフォルト): 例えば、お使いのシステムでは、 + +システムのテンポラリフォルダー (デフォルト): 例えば、お使いのシステムでは、 C:\Windows\Tempかもしれません。 - カスタムフォルダー: 参照をクリックし、書き込み可能なフォルダーを選択してください。 + +カスタムフォルダー: 参照をクリックし、書き込み可能なフォルダーを選択してください。
- バックアップファイルページ<indexterm> + <title> +バックアップファイルページ<indexterm> <primary>backup files, options</primary> </indexterm> - このページは、WinMerge がバックアップファイルを作る方法を制御することを可能にします。 + +このページは、WinMerge がバックアップファイルを作る方法を制御することを可能にします。
作成するバックアップ - WinMerge がバックアップファイルを作るべきなら指定してください。次のオプションは、それぞれ独立に、有効、または、無効にすることができます。 + +WinMerge がバックアップファイルを作るべきなら指定してください。次のオプションは、それぞれ独立に、有効、または、無効にすることができます。 - フォルダー比較(デフォルトで無効): + +フォルダー比較(デフォルトで無効): ファイルが上書き(コピー)される度に、バックアップファイルが作成されます。 - ファイル比較(デフォルトで有効): ファイルが保存される度に、バックアップファイルが作成されます。 + +ファイル比較(デフォルトで有効): ファイルが保存される度に、バックアップファイルが作成されます。
@@ -1596,17 +1957,20 @@ or through a file association)
バックアップファイル生成先 - バックアップファイルが作成される場所を指定してください。次のうち、1つのみ有効にすることができます: + +バックアップファイルが作成される場所を指定してください。次のうち、1つのみ有効にすることができます: - 元ファイルのフォルダー(デフォルトで有効): + +元ファイルのフォルダー(デフォルトで有効): バックアップファイルは、元ファイルと同じフォルダーに作成されます。 これは、大抵良い選択です。マイナス面は、巨大なフォルダーは、バックアップファイルを片付けるのが大変だということです。 - バックアップフォルダー(デフォルトで無効):すべてのバックアップファイルは、1つのフォルダーに作成されます。これは、バックアップファイルを片付けるのを容易にします。しかし、複数のソースファイルが同じファイル名だった場合、最も新しいバックアップファイルは、以前に作成された同名のファイルを上書きします。 + +バックアップフォルダー(デフォルトで無効):すべてのバックアップファイルは、1つのフォルダーに作成されます。これは、バックアップファイルを片付けるのを容易にします。しかし、複数のソースファイルが同じファイル名だった場合、最も新しいバックアップファイルは、以前に作成された同名のファイルを上書きします。
@@ -1614,20 +1978,24 @@ or through a file association)
バックアップファイル名 - WinMerge がバックアップファイルを作る時、 元ファイル名に拡張子を付加します。次のうち、 一方か両方の拡張子構成を選ぶことができます: + +WinMerge がバックアップファイルを作る時、 元ファイル名に拡張子を付加します。次のうち、 一方か両方の拡張子構成を選ぶことができます: - .bak拡張子を追加する(デフォルトで有効): 例えば、 + +.bak拡張子を追加する(デフォルトで有効): 例えば、 file.txtは、 file.txt.bakでバックアップされます。 - (デフォルトで無効): + + (デフォルトで無効): タイムスタンプはほぼ常にユニークであるため、このオプションは元ファイル名が同じ場合に、大抵、バックアップファイルの重複を回避します。 - また、保存する毎にファイルが蓄積されるため、ファイルの変更を追跡する方法を提供します。 + +また、保存する毎にファイルが蓄積されるため、ファイルの変更を追跡する方法を提供します。 しかし、このオプションが、たくさんのファイルを作成することを考慮すべきでしょう。 @@ -1635,31 +2003,35 @@ or through a file association)
- コードページページ<indexterm> + <title> +コードページページ<indexterm> <primary>codepage</primary> <secondary>オプション</secondary> </indexterm> - このページは、ANSI版 WinMerge が、ANSIファイルに対して使うコードページを指定します。 また、あるファイル形式のコードページは、 + +このページは、ANSI版 WinMerge が、ANSIファイルに対して使うコードページを指定します。 また、あるファイル形式のコードページは、 ファイルの内容から検出されるべきかどうかを指定します。 - 完全なテキストエンコーディングと Windows コードページの説明は、WinMerge ドキュメントの範囲を超えています。 + +完全なテキストエンコーディングと Windows コードページの説明は、WinMerge ドキュメントの範囲を超えています。 幸いにも、インターネット上には、 それらについての情報がたくさんあります。 例えば、ここに始めるべきいくつかの場所があります: - Wikipedia: Code -pages, Character -encoding + + Wikipedia: Code pages +, +Character encoding - + -Microsoft: Code Pages Supported by Windows +Microsoft: Code Pages Supported by Windows @@ -1667,23 +2039,27 @@ Microsoft: Code Pages Supported by Windows
デフォルトコードページ - WinMerge が、非Unicode ファイルを扱う際の、デフォルトコードページを設定するために、 次のラジオボタンから1つ選んでください: + +WinMerge が、非Unicode ファイルを扱う際の、デフォルトコードページを設定するために、 次のラジオボタンから1つ選んでください: - システムコードページ(デフォルト):あなたの Windows システムにより使用されているコードページです。 + +システムコードページ(デフォルト):あなたの Windows システムにより使用されているコードページです。 このデフォルトは、ほぼ、ベストチョイスです。 しかし、システムコードページを使用していないファイルを比較することが分かっているなら、他のオプションを考慮してください。 - + + 現在のWinMergeユーザーインターフェイス言語に従う: WinMerge のインストールに使用したエンコーディングです。 - カスタムコードページ: 明示的にコードページ番号を入力してください。例えば、 + +カスタムコードページ: 明示的にコードページ番号を入力してください。例えば、 UTF-8や ISO-8851-1など。 @@ -1693,7 +2069,8 @@ Microsoft: Code Pages Supported by Windows html, .rc, .xml ファイルのコードページ情報を検出する - WinMerge.exeでは、このオプションはチェックを外してください。文字列変換は、不可逆変換を生じる可能性があり、そしてそれは、非常にハイリスクです。WinMerge.exeは、現在のコードページのファイルのみを表示することができます。 @@ -1701,27 +2078,33 @@ or is this understood?--> - (デフォルト): WinMerge + +(デフォルト): WinMerge は、ソースファイルから、コードページ情報を読み取りません。その代わりに、デフォルトコードページ設定を使用します。 - : WinMerge は、次の拡張子のコードページを検出します: +: WinMerge は、次の拡張子のコードページを検出します: html, rc(VC++ のリソースファイル), xml。検出されたコードページは、デフォルトコードページオプションの設定を上書きします。 - このオプションは、あなたのドキュメントが、 Windows のものと異なるコードページを使用する場合に重要です。 + +このオプションは、あなたのドキュメントが、 Windows のものと異なるコードページを使用する場合に重要です。 - 例えば、英語環境で、2つのスロバキア語か、 2つの日本語ファイルをマージするかもしれません。 + +例えば、英語環境で、2つのスロバキア語か、 2つの日本語ファイルをマージするかもしれません。 このオプションが有効にされている(さらに、必要なフォントがある)場合、 あなたのスロバキア語か日本語のファイルは、スロバキア語か日本語の文字で表示されます。 - WinMergeは、左右のファイル間のコードページの差異も検出します。 マージ、コピー、ペースト時の不可逆変換を避けるために、 + +WinMergeは、左右のファイル間のコードページの差異も検出します。 マージ、コピー、ペースト時の不可逆変換を避けるために、 コードページ情報を無視することをオススメします。 - 外部アプリケーションにテキストをコピー、または、貼り付ける時、外部アプリケーションは、WinMerge + +外部アプリケーションにテキストをコピー、または、貼り付ける時、外部アプリケーションは、WinMerge と同じコードページを使用するでしょう。外部エディターのドキュメントを参照してください。 WinMerge へのコピーについては、Internet Explorer は、コードページ選択機能を提供しています。 外部エディターが、カスタムコードページをサポートしていない場合、 このオプションは無効にしてください。 @@ -1742,13 +2125,15 @@ Explorer は、コードページ選択機能を提供しています。 外部 シェル統合ページ
- エクスプローラー<indexterm> + <title> +エクスプローラー<indexterm> <primary>統合</primary> <secondary>with Windows shell</secondary> </indexterm> - The オプションは、Windows エクスプローラーから、直接、WinMerge + +The オプションは、Windows エクスプローラーから、直接、WinMerge を起動可能にし、そこで選択したアイテムを比較します。 それは、WinMergeインストールの最中に、デフォルトで有効か無効にされます。 有効な場合、次のオプションのうち、一方、または、両方を有効にすることができます: @@ -1759,12 +2144,14 @@ Explorer は、コードページ選択機能を提供しています。 外部 - (デフォルト): Windows エクスプローラーのコンテキストメニューには、 + +(デフォルト): Windows エクスプローラーのコンテキストメニューには、 WinMergeショートカットのみが含まれます。 - : エクスプローラーのコンテキストメニュー中の、 + +: エクスプローラーのコンテキストメニュー中の、 WinMergeショートカットを、 比較ショートカットで置き換えます。 @@ -1780,12 +2167,14 @@ Explorer は、コードページ選択機能を提供しています。 外部 - (デフォルト): + +(デフォルト): 形式を指定して比較メニューをエクスプローラーのコンテキストメニューから削除します。 - : 形式を指定して比較 + +: 形式を指定して比較 メニューをエクスプローラーのコンテキストメニューに追加します。 @@ -1793,7 +2182,8 @@ Explorer は、コードページ選択機能を提供しています。 外部 - では、WinMerge と + +では、WinMerge と 比較ショートカットの使用方法について説明しています。
diff --git a/Translations/Docs/Manual/English.pot b/Translations/Docs/Manual/English.pot index db6a35f1993..12df609e39b 100644 --- a/Translations/Docs/Manual/English.pot +++ b/Translations/Docs/Manual/English.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge 2.16\n" "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" -"POT-Creation-Date: 2024-03-02 20:05+0900\n" +"POT-Creation-Date: 2024-07-25 09:06+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -383,7 +383,7 @@ msgid "The path %WORKDIR%\\project1 is expanded to
-#: ./English/About_Doc.xml:314 ./English/Configuration.xml:494 +#: ./English/About_Doc.xml:314 ./English/Configuration.xml:612 #, no-wrap msgid "TwoWords" msgstr "" @@ -528,7 +528,7 @@ msgstr "" #. type: Content of:
<indexterm><primary> #: ./English/Command_line.xml:210 ./English/Command_line.xml:294 -#: ./English/Command_line.xml:417 ./English/Configuration.xml:212 +#: ./English/Command_line.xml:417 ./English/Configuration.xml:270 #: ./English/Quick_start.xml:22 msgid "WinMerge window" msgstr "" @@ -549,7 +549,7 @@ msgid "Enables you to close WinMerge with a single <keycap>Esc</keycap> key pres msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Command_line.xml:226 ./English/Configuration.xml:633 +#: ./English/Command_line.xml:226 ./English/Configuration.xml:813 #: ./English/Filters.xml:4 ./English/Filters.xml:88 ./English/Filters.xml:92 #: ./English/Filters.xml:137 ./English/Filters.xml:187 #: ./English/Filters.xml:191 ./English/Filters.xml:532 @@ -626,7 +626,7 @@ msgid "Is similar to <option>/x</option> but does not show the message about ide msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Command_line.xml:295 ./English/Configuration.xml:214 +#: ./English/Command_line.xml:295 ./English/Configuration.xml:272 msgid "limiting instances" msgstr "" @@ -661,7 +661,7 @@ msgid "Ensure that another instance is always executed, ignoring the value of th msgstr "" #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> -#: ./English/Command_line.xml:327 ./English/Configuration.xml:327 +#: ./English/Command_line.xml:327 ./English/Configuration.xml:423 #: ./English/Faq.xml:114 msgid "MRU list" msgstr "" @@ -930,13 +930,15 @@ msgstr "" #: ./English/Command_line.xml:592 ./English/Command_line.xml:599 #: ./English/Command_line.xml:606 ./English/Command_line.xml:620 #: ./English/Command_line.xml:703 ./English/Compare_files.xml:1476 -#: ./English/Compare_images.xml:117 ./English/Configuration.xml:1166 -#: ./English/Configuration.xml:1172 ./English/Configuration.xml:1178 -#: ./English/Configuration.xml:1186 ./English/Configuration.xml:1194 -#: ./English/Configuration.xml:1207 ./English/Configuration.xml:1212 -#: ./English/Configuration.xml:1217 ./English/Configuration.xml:1523 -#: ./English/Configuration.xml:1565 ./English/Configuration.xml:1606 -#: ./English/Configuration.xml:1983 ./English/Filters.xml:775 +#: ./English/Compare_images.xml:117 ./English/Configuration.xml:1525 +#: ./English/Configuration.xml:1533 ./English/Configuration.xml:1539 +#: ./English/Configuration.xml:1547 ./English/Configuration.xml:1555 +#: ./English/Configuration.xml:1570 ./English/Configuration.xml:1575 +#: ./English/Configuration.xml:1580 ./English/Configuration.xml:1596 +#: ./English/Configuration.xml:1604 ./English/Configuration.xml:1612 +#: ./English/Configuration.xml:1620 ./English/Configuration.xml:2046 +#: ./English/Configuration.xml:2100 ./English/Configuration.xml:2153 +#: ./English/Configuration.xml:2653 ./English/Filters.xml:775 #: ./English/Filters.xml:1206 ./English/Filters.xml:1211 #: ./English/Filters.xml:1222 msgid "TBD" @@ -1151,8 +1153,8 @@ msgstr "" #. type: Content of: <article><section><title><indexterm><primary> #: ./English/Compare_bin.xml:8 ./English/Compare_files.xml:6 #: ./English/Compare_images.xml:8 ./English/Compare_table.xml:8 -#: ./English/Compare_webpages.xml:8 ./English/Configuration.xml:782 -#: ./English/Configuration.xml:872 ./English/Filters.xml:67 +#: ./English/Compare_webpages.xml:8 ./English/Configuration.xml:1007 +#: ./English/Configuration.xml:1121 ./English/Filters.xml:67 #: ./English/Intro_diffs.xml:12 ./English/Quick_start.xml:325 msgid "comparing files" msgstr "" @@ -1183,7 +1185,7 @@ msgid "Whether files are opened in hexadecimal format depends on whether the fil msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Compare_dirs.xml:4 ./English/Configuration.xml:876 +#: ./English/Compare_dirs.xml:4 ./English/Configuration.xml:1125 #: ./English/Filters.xml:43 ./English/Quick_start.xml:239 msgid "comparing folders" msgstr "" @@ -1832,7 +1834,7 @@ msgid "In the WinMerge menu, <menuchoice> <guimenu>Merge</guimenu> <guimenuitem> msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Compare_dirs.xml:614 ./English/Configuration.xml:1692 +#: ./English/Compare_dirs.xml:614 ./English/Configuration.xml:2268 msgid "deleting files" msgstr "" @@ -2002,7 +2004,7 @@ msgid "A full refresh of large folders can take a long time. In WinMerge 2.2 and msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Compare_dirs.xml:798 ./English/Configuration.xml:1631 +#: ./English/Compare_dirs.xml:798 ./English/Configuration.xml:2187 msgid "archiving files" msgstr "" @@ -2228,8 +2230,8 @@ msgid "unique folders" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><secondary> -#: ./English/Compare_dirs.xml:1050 ./English/Configuration.xml:836 -#: ./English/Configuration.xml:859 +#: ./English/Compare_dirs.xml:1050 ./English/Configuration.xml:1075 +#: ./English/Configuration.xml:1104 msgid "comparing" msgstr "" @@ -2680,7 +2682,7 @@ msgid "Copies just the source filename into the system clipboard." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Compare_files.xml:134 ./English/Configuration.xml:1540 +#: ./English/Compare_files.xml:134 ./English/Configuration.xml:2066 msgid "difference colors" msgstr "" @@ -2746,7 +2748,7 @@ msgid "The last difference block includes two lines." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Compare_files.xml:194 ./English/Configuration.xml:436 +#: ./English/Compare_files.xml:194 ./English/Configuration.xml:536 msgid "ignored differences" msgstr "" @@ -2787,7 +2789,7 @@ msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> #: ./English/Compare_files.xml:238 ./English/Compare_files.xml:917 -#: ./English/Configuration.xml:656 +#: ./English/Configuration.xml:841 msgid "moved differences" msgstr "" @@ -2882,7 +2884,7 @@ msgid "In the second comparison, the lines <quote>mice</quote> and <quote>mice a msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Compare_files.xml:338 ./English/Configuration.xml:1448 +#: ./English/Compare_files.xml:338 ./English/Configuration.xml:1954 msgid "line differences" msgstr "" @@ -3068,8 +3070,8 @@ msgid "<imageobject> <imagedata contentwidth=\"494\" fileref=\"screenshots/line- msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Compare_files.xml:520 ./English/Configuration.xml:1223 -#: ./English/Configuration.xml:1380 +#: ./English/Compare_files.xml:520 ./English/Configuration.xml:1663 +#: ./English/Configuration.xml:1864 msgid "editing" msgstr "" @@ -3524,7 +3526,7 @@ msgid "for File Compare window" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Compare_files.xml:1007 ./English/Configuration.xml:1299 +#: ./English/Compare_files.xml:1007 ./English/Configuration.xml:1757 msgid "tabs" msgstr "" @@ -3977,7 +3979,7 @@ msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> #: ./English/Compare_files.xml:1491 ./English/Compare_files.xml:1776 -#: ./English/Configuration.xml:1387 +#: ./English/Configuration.xml:1873 msgid "rescanning files" msgstr "" @@ -4925,1932 +4927,2028 @@ msgid "Comparing web pages with very different content may take a lot of time." msgstr "" #. type: Content of: <article><section><title><indexterm><secondary> -#: ./English/Configuration.xml:4 ./English/Configuration.xml:1542 -#: ./English/Configuration.xml:1562 ./English/Configuration.xml:1589 -#: ./English/Configuration.xml:1603 ./English/Configuration.xml:1613 -#: ./English/Configuration.xml:1694 ./English/Configuration.xml:1873 +#: ./English/Configuration.xml:5 ./English/Configuration.xml:2068 +#: ./English/Configuration.xml:2096 ./English/Configuration.xml:2131 +#: ./English/Configuration.xml:2149 ./English/Configuration.xml:2161 +#: ./English/Configuration.xml:2270 ./English/Configuration.xml:2507 msgid "options" msgstr "" #. type: Content of: <article><title> -#: ./English/Configuration.xml:3 +#: ./English/Configuration.xml:4 msgid "Options and configuration<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><para> -#: ./English/Configuration.xml:7 +#: ./English/Configuration.xml:10 msgid "The Options dialog enables you to customize many WinMerge features. To set WinMerge options:" msgstr "" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject> -#: ./English/Configuration.xml:17 +#: ./English/Configuration.xml:22 msgid "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/options_btn.png\" /> </imageobject>" msgstr "" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: ./English/Configuration.xml:22 +#: ./English/Configuration.xml:27 msgid "WinMerge Options button" msgstr "" #. type: Content of: <article><orderedlist><listitem><para> -#: ./English/Configuration.xml:12 +#: ./English/Configuration.xml:17 msgid "Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</guimenuitem> </menuchoice> in the menu or the <placeholder type=\"inlinemediaobject\" id=\"0\"/> <guibutton>Options</guibutton> button in the toolbar." msgstr "" #. type: Content of: <article><orderedlist><listitem><para> -#: ./English/Configuration.xml:27 +#: ./English/Configuration.xml:34 msgid "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 <guilabel>Categories</guilabel> list, on the left side of the dialog." msgstr "" #. type: Content of: <article><orderedlist><listitem><para> -#: ./English/Configuration.xml:34 +#: ./English/Configuration.xml:43 msgid "Configure the options you want to change using one or both of these methods:" msgstr "" #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:39 +#: ./English/Configuration.xml:49 msgid "Directly in the options pages." msgstr "" #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:43 +#: ./English/Configuration.xml:54 msgid "Importing an options <filename>.ini</filename> file that you exported previously (see <xref linkend=\"Configuration_importexport\" /> for details)." msgstr "" #. type: Content of: <article><orderedlist><listitem><para> -#: ./English/Configuration.xml:51 +#: ./English/Configuration.xml:64 msgid "When you have set all your options, click <guibutton>OK</guibutton> to save them and dismiss the dialog." msgstr "" #. type: Content of: <article><para> -#: ./English/Configuration.xml:56 +#: ./English/Configuration.xml:71 msgid "This topic describes the options in detail. There is a section for each page in the Options dialog." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:61 +#: ./English/Configuration.xml:78 msgid "importing options files" msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:63 +#: ./English/Configuration.xml:80 msgid "exporting options files" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:60 +#: ./English/Configuration.xml:77 msgid "Importing and Exporting options<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:66 +#: ./English/Configuration.xml:85 msgid "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." msgstr "" #. type: Content of: <article><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:74 +#: ./English/Configuration.xml:94 msgid "To import options" msgstr "" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:77 +#: ./English/Configuration.xml:98 msgid "When you want to reuse your saved options, click <guibutton>Import</guibutton>. In the Select file for import dialog, navigate to the saved <filename>ini</filename> file and click <guibutton>Open</guibutton>." msgstr "" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:82 +#: ./English/Configuration.xml:105 msgid "The values in your imported options file replace all existing settings." msgstr "" #. type: Content of: <article><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:88 +#: ./English/Configuration.xml:112 msgid "To export options" msgstr "" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:91 +#: ./English/Configuration.xml:116 msgid "When you have set your options the way you want them, click <guibutton>Export</guibutton>. In the Select file for export dialog, specify a path and name for your options file (the type <filename>ini</filename> is automatically appended), and click <guibutton>Save</guibutton>." msgstr "" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:97 +#: ./English/Configuration.xml:124 msgid "In the generated text <filename>ini</filename> file, each line contains a name-value pair that defines a single option." msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:105 +#: ./English/Configuration.xml:133 msgid "General page" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:107 +#: ./English/Configuration.xml:135 msgid "The General page has these options:" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:111 +#: ./English/Configuration.xml:140 msgid "autoscrolling to first difference" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:110 +#: ./English/Configuration.xml:139 msgid "Automatically scroll to first difference<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:116 +#: ./English/Configuration.xml:147 msgid "<option>Disabled</option> (default): Compare window opens to the top of the folder or file, with no difference selected." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:121 +#: ./English/Configuration.xml:154 msgid "<option>Enabled</option>: When it first opens, the Compare window selects the first difference, scrolling to the location if necessary." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:127 +#: ./English/Configuration.xml:162 msgid "For a folder compare, selects the first different file or folders." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:132 +#: ./English/Configuration.xml:169 msgid "For a file compare, selects the first difference block in the files." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:142 +#: ./English/Configuration.xml:181 msgid "autoscrolling to first inline difference" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:141 +#: ./English/Configuration.xml:180 msgid "Automatically scroll to first inline difference<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:147 ./English/Configuration.xml:1029 -msgid "<option>Disabled</option> (default): TBD" +#: ./English/Configuration.xml:188 +msgid "<option>Disabled</option> (default): When moving to a difference block, does not automatically scroll to the first inline difference within the lines of text." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:151 ./English/Configuration.xml:1033 -msgid "<option>Enabled</option>: TBD" +#: ./English/Configuration.xml:194 +msgid "<option>Enabled</option>: When moving to a difference block, automatically scrolls to the first inline difference within the lines of text." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:159 +#: ./English/Configuration.xml:203 msgid "closing windows using Esc key" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:158 +#: ./English/Configuration.xml:202 msgid "Close Windows with '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:164 +#: ./English/Configuration.xml:210 msgid "<option>MDI child window or main window</option> (default): Lets you use the <keycap>Esc</keycap> key to close WinMerge windows. Pressing <keycap>Esc</keycap> 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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:171 +#: ./English/Configuration.xml:219 msgid "Note that in the WinMerge command line, the <parameter>-e</parameter> parameter enables you to close WinMerge by pressing <keycap>Esc</keycap> just once." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:177 +#: ./English/Configuration.xml:227 msgid "<option>MDI child window only</option>: Pressing <keycap>Esc</keycap> closes a child window, but not the last remaining main window." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:182 +#: ./English/Configuration.xml:234 msgid "<option>Disabled</option>: Pressing <keycap>Esc</keycap> does not close any WinMerge windows." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:189 +#: ./English/Configuration.xml:242 msgid "Automatically verify paths in Open-dialog" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:193 +#: ./English/Configuration.xml:247 msgid "<option>Enabled</option> (default): The Select Files or Folders dialog checks both or all three paths as you enter them. The <guibutton>Compare</guibutton> button remains disabled until both or all three paths are validated. Note that this checking can cause some delay." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:201 +#: ./English/Configuration.xml:257 msgid "<option>Disabled</option>: The <guibutton>Compare</guibutton> 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." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:211 -msgid "Allow only one instance to run<placeholder type=\"indexterm\" id=\"0\"/>" +#: ./English/Configuration.xml:269 +msgid "Single instance mode<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:219 +#: ./English/Configuration.xml:279 msgid "<option>Disabled</option> (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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:226 -msgid "<option>Enabled</option>: Limits the WinMerge program to one instance:" +#: ./English/Configuration.xml:288 +msgid "<option>Allow only one instance to run</option>: Limits the WinMerge program to one instance:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:231 +#: ./English/Configuration.xml:295 msgid "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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:237 +#: ./English/Configuration.xml:303 msgid "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." msgstr "" +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:313 +msgid "<option>Allow only one instance to run and wait for the instance to terminate</option>: Similar to the \"Allow only one instance to run\" option, this setting restricts WinMerge to a single application window. However, it also ensures that the WinMerge process does not terminate until the application window is closed. This is useful for situations where external applications, like SourceTree, need to wait for WinMerge to finish before they can safely delete temporary files." +msgstr "" + #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:247 +#: ./English/Configuration.xml:320 msgid "Ask when closing multiple windows" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:251 +#: ./English/Configuration.xml:325 msgid "<option>Disabled</option> (default): If you exit WinMerge while multiple Compare windows are open, WinMerge prompts you to confirm whether to close all the windows." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:257 +#: ./English/Configuration.xml:333 msgid "<option>Enabled</option>: If you click <guibutton>Exit</guibutton> and there are no pending file changes, WinMerge closes immediately." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:266 ./English/Configuration.xml:834 -#: ./English/Configuration.xml:907 +#: ./English/Configuration.xml:344 ./English/Configuration.xml:1073 +#: ./English/Configuration.xml:1168 msgid "timestamps" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:268 ./English/Configuration.xml:1258 +#: ./English/Configuration.xml:346 ./English/Configuration.xml:1706 msgid "preserving" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:265 +#: ./English/Configuration.xml:343 msgid "Preserve file time in file compare<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:273 +#: ./English/Configuration.xml:353 msgid "<option>Disabled</option> (default): If you save changes to a file in WinMerge, the timestamp of the file is updated." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:278 +#: ./English/Configuration.xml:360 msgid "<option>Enabled</option>: If you save changes to a file in WinMerge, the timestamp of the file is not changed in your file system." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:287 ./English/Configuration.xml:311 +#: ./English/Configuration.xml:371 ./English/Configuration.xml:401 #: ./English/Open_paths.xml:38 ./English/Quick_start.xml:75 msgid "Select Files or Folders dialog" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:289 +#: ./English/Configuration.xml:373 msgid "opening automatically" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:286 +#: ./English/Configuration.xml:370 msgid "Show \"Select Files or Folders\" dialog on startup<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:294 +#: ./English/Configuration.xml:380 msgid "<option>Disabled</option> (default): The WinMerge window opens when you launch WinMerge. You must then click <menuchoice> <guimenu>File</guimenu> <guimenuitem>Open</guimenuitem> </menuchoice> to open Select Files or Folders." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:303 +#: ./English/Configuration.xml:391 msgid "<option>Enabled</option>: The Select Files or Folders dialog opens along with the WinMerge window when you launch WinMerge." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:310 +#: ./English/Configuration.xml:400 msgid "Close \"Select Files or Folders\" dialog on clicking Compare button<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:316 +#: ./English/Configuration.xml:408 msgid "<option>Disabled</option> (default): When you click <guibutton>Compare</guibutton> button, the Select File or Folders dialog will remain open instead of closing." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:320 +#: ./English/Configuration.xml:414 msgid "<option>Enabled</option>: Clicking <guibutton>Compare</guibutton> button closes the Select Files or Folders dialog." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:326 +#: ./English/Configuration.xml:422 msgid "Open-dialog Auto-Completion<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:330 ./English/Configuration.xml:358 +#: ./English/Configuration.xml:427 ./English/Configuration.xml:463 msgid "Choose one of these options:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:334 +#: ./English/Configuration.xml:432 msgid "<guilabel>Disabled</guilabel> (default): No autocompletion is performed when you enter paths in the Select Files or Folders dialog." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:340 +#: ./English/Configuration.xml:440 msgid "<guilabel>From file system</guilabel>: 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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:346 +#: ./English/Configuration.xml:448 msgid "<guilabel>From Most Recent Used list</guilabel>: Checks paths only from the most recently used (MRU) list. This is handy when you have a limited set of paths to compare." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:355 +#: ./English/Configuration.xml:459 msgid "Auto-reload" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:354 +#: ./English/Configuration.xml:458 msgid "Auto-reload modified files<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:362 +#: ./English/Configuration.xml:468 msgid "<guilabel>Disabled</guilabel> (default): Disables automatic reloading." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:367 +#: ./English/Configuration.xml:474 msgid "<guilabel>Only on window activated</guilabel>: When the WinMerge window is activated, if the file has been modified, it will reload the file. However, a message box asking if you want to reload the file will be displayed at this time. If you do not want to see this message box, check \"Don't ask this question again\" and press the Yes button." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:375 +#: ./English/Configuration.xml:484 msgid "<guilabel>Immediately</guilabel>: Reloads the file immediately when it has been modified. However, a message box asking if you want to reload the file will be displayed at this time. If you do not want to see this message box, check \"Don't ask this question again\" and press the Yes button." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:385 +#: ./English/Configuration.xml:496 msgid "Language" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:384 +#: ./English/Configuration.xml:495 msgid "Language<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:388 +#: ./English/Configuration.xml:501 msgid "See <xref linkend=\"Locales_changing\" />." msgstr "" -#. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:393 -msgid "Reset" -msgstr "" - -#. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:395 -msgid "WinMerge allows you to suppress some common message boxes. For example, when two identical files are opened, the message box titled, <guilabel>The files are identical</guilabel>, 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." -msgstr "" - -#. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:401 -msgid "Later, you might decide that you want to see those messages again. If so, click the <guibutton>Reset</guibutton> button to make the message boxes display again." -msgstr "" - -#. type: Content of: <article><section><section><note><para> -#: ./English/Configuration.xml:406 -msgid "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 <guibutton>Reset</guibutton> button." -msgstr "" - #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:415 +#: ./English/Configuration.xml:508 msgid "Compare General page" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:417 +#: ./English/Configuration.xml:511 msgid "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." msgstr "" #. type: Content of: <article><section><important><para> -#: ./English/Configuration.xml:422 +#: ./English/Configuration.xml:518 msgid "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." msgstr "" #. type: Content of: <article><section><important><para> -#: ./English/Configuration.xml:428 +#: ./English/Configuration.xml:526 msgid "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 <guibutton>Defaults</guibutton> button." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:435 +#: ./English/Configuration.xml:535 msgid "About ignore options<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:439 +#: ./English/Configuration.xml:541 msgid "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:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:445 +#: ./English/Configuration.xml:548 msgid "They are marked with the Ignored Difference color." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:449 +#: ./English/Configuration.xml:552 msgid "Ignored differences cannot be merged." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:453 +#: ./English/Configuration.xml:556 msgid "Ignored differences are not included in difference counts." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:457 +#: ./English/Configuration.xml:561 msgid "Files containing only ignored differences are marked as identical in a folder comparison." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:465 +#: ./English/Configuration.xml:571 msgid "whitespaces" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:467 ./English/Configuration.xml:551 -#: ./English/Configuration.xml:594 ./English/Configuration.xml:617 -#: ./English/Configuration.xml:909 ./English/Configuration.xml:942 -#: ./English/Configuration.xml:960 ./English/Configuration.xml:978 -#: ./English/Configuration.xml:1024 +#: ./English/Configuration.xml:573 ./English/Configuration.xml:683 +#: ./English/Configuration.xml:738 ./English/Configuration.xml:767 +#: ./English/Configuration.xml:791 ./English/Configuration.xml:1170 +#: ./English/Configuration.xml:1217 ./English/Configuration.xml:1253 +#: ./English/Configuration.xml:1277 ./English/Configuration.xml:1301 +#: ./English/Configuration.xml:1353 msgid "detecting and ignoring differences" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:464 +#: ./English/Configuration.xml:570 msgid "Whitespaces<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:470 +#: ./English/Configuration.xml:578 msgid "Whitespace is the space between words and lines. It is represented in text files by special, nonprinting characters like spaces, tabs, and linefeeds. The significance of whitespace depends on how you want to read or process differences. It might be important to detect all changes in whitespace. Conversely, you might prefer to treat all whitespace the same whether one space, two spaces, an indent, or a tab. And in some structured documents (like comma-separated lists), you might want to disregard all whitespace." msgstr "" #. type: Content of: <article><section><section><note><para> -#: ./English/Configuration.xml:480 +#: ./English/Configuration.xml:590 msgid "The effects of whitespace on changes within lines are visible only when <option>View line differences</option> is enabled. This is in contrast to difference blocks, which are always highlighted." msgstr "" #. type: Content of: <article><section><section><example><title> -#: ./English/Configuration.xml:486 +#: ./English/Configuration.xml:597 msgid "Lines with different whitespace" msgstr "" #. type: Content of: <article><section><section><example><para><screen> -#: ./English/Configuration.xml:488 +#: ./English/Configuration.xml:600 #, no-wrap msgid "Two Words" msgstr "" #. type: Content of: <article><section><section><example><para> -#: ./English/Configuration.xml:488 +#: ./English/Configuration.xml:600 msgid "One space between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><example><para><screen> -#: ./English/Configuration.xml:490 +#: ./English/Configuration.xml:604 #, no-wrap msgid "Two Words" msgstr "" #. type: Content of: <article><section><section><example><para> -#: ./English/Configuration.xml:490 +#: ./English/Configuration.xml:604 msgid "Two spaces between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><example><para><screen> -#: ./English/Configuration.xml:492 +#: ./English/Configuration.xml:608 #, no-wrap msgid "Two\tWords" msgstr "" #. type: Content of: <article><section><section><example><para> -#: ./English/Configuration.xml:492 +#: ./English/Configuration.xml:608 msgid "Tab between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><example><para> -#: ./English/Configuration.xml:494 +#: ./English/Configuration.xml:612 msgid "No spaces between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:497 +#: ./English/Configuration.xml:617 msgid "You can control whitespace detection by choosing one of these options:" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:502 +#: ./English/Configuration.xml:623 msgid "Compare" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:505 +#: ./English/Configuration.xml:627 msgid "All whitespace is compared (default). If you are not sure which option your document requires, this is probably the safest choice. In the example, all lines are detected as different." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:512 +#: ./English/Configuration.xml:635 msgid "Ignore change" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:515 +#: ./English/Configuration.xml:639 msgid "Compares differences in whitespace. In the 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 <emphasis>not</emphasis> ignored (in effect, the words in the last two lines are different):" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:525 +#: ./English/Configuration.xml:650 msgid "Ignore all" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:528 +#: ./English/Configuration.xml:654 msgid "Ignores all whitespace characters, except linefeeds (so lines are detected and preserved in a merge). All lines in the example are detected as identical." msgstr "" #. type: Content of: <article><section><section><note><title> -#: ./English/Configuration.xml:536 +#: ./English/Configuration.xml:663 msgid "Related topics" msgstr "" #. type: Content of: <article><section><section><note><para> -#: ./English/Configuration.xml:538 +#: ./English/Configuration.xml:666 msgid "The effects of whitespace settings on line differences is described in <xref linkend=\"CompareFiles_linediff-highlight\" />." msgstr "" #. type: Content of: <article><section><section><note><para> -#: ./English/Configuration.xml:541 +#: ./English/Configuration.xml:671 msgid "The Options dialog Editor page contains related options that control how whitespace is used to detect breaks between words. See <xref linkend=\"Configuration_viewlinediffs\" /> for details." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:549 +#: ./English/Configuration.xml:681 msgid "blank lines" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:548 +#: ./English/Configuration.xml:680 msgid "Ignore blank lines<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:556 +#: ./English/Configuration.xml:690 msgid "<option>Disabled</option> (default): Empty lines in the source files are detected and represented in the File Compare window as blank lines with the Deleted Difference colors." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:562 +#: ./English/Configuration.xml:698 msgid "<option>Enabled</option>: 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." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:572 +#: ./English/Configuration.xml:710 msgid "case (letter), detecting and ignoring differences" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:571 +#: ./English/Configuration.xml:709 msgid "Ignore case<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:577 +#: ./English/Configuration.xml:717 msgid "<option>Disabled</option> (default): Comparisons are case-sensitive. For example, <literal>LowerCase</literal>, <literal>LOWERCASE</literal>, and <literal>lowercase</literal> are all different." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:584 +#: ./English/Configuration.xml:726 msgid "<option>Enabled</option>: Differences between lowercase and uppercase letters are ignored." msgstr "" #. type: Content of: <article><section><section><title><indexterm><see> -#: ./English/Configuration.xml:592 ./English/Configuration.xml:1256 -#: ./English/Configuration.xml:1262 +#: ./English/Configuration.xml:736 ./English/Configuration.xml:1704 +#: ./English/Configuration.xml:1710 msgid "EOL" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:591 +#: ./English/Configuration.xml:735 msgid "Ignore carriage return differences (Windows/Unix/Mac)<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:599 +#: ./English/Configuration.xml:745 msgid "<option>Disabled</option> (default): End of line (EOL) style differences are detected. 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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:608 +#: ./English/Configuration.xml:756 msgid "<option>Enabled</option>: EOL differences are ignored." msgstr "" +#. type: Content of: <article><section><section><title><indexterm><primary> +#: ./English/Configuration.xml:765 +msgid "numbers" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:764 +msgid "Ignore numbers<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:774 +msgid "<option>Disabled</option> (default): Numeric differences are detected." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:780 +msgid "<option>Enabled</option>: Numeric differences are ignored." +msgstr "" + #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:615 ./English/Configuration.xml:1871 +#: ./English/Configuration.xml:789 ./English/Configuration.xml:2505 msgid "codepage" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:614 +#: ./English/Configuration.xml:788 msgid "Ignore codepage differences<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:622 +#: ./English/Configuration.xml:798 msgid "<option>Disabled</option> (default): File encoding differences are detected. Also, differences between the presence and absence of BOM are detected." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:626 +#: ./English/Configuration.xml:804 msgid "<option>Enabled</option>: File encoding differences are ignored." msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:635 +#: ./English/Configuration.xml:815 msgid "comments" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:632 +#: ./English/Configuration.xml:812 msgid "Ignore comment differences<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:642 +#: ./English/Configuration.xml:822 msgid "<option>Disabled</option> (default): WinMerge compares comments in code, along with other content." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:647 -msgid "<option>Enabled</option>: This option optimizes comparisons by detecting comments in certain programming language file types (such as C++ and Java), and ignoring them." +#: ./English/Configuration.xml:829 +msgid "<option>Enabled</option>: This option optimizes comparisons by detecting comments in certain programming language file types (such as C++ and Java), and ignoring them. The detection is based on syntax highlighting, so it has no effect on file types that are not supported by WinMerge." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:655 +#: ./English/Configuration.xml:840 msgid "Enable moved block detection<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:661 +#: ./English/Configuration.xml:848 msgid "<option>Disabled</option> (default): WinMerge does not detect when differences are due to moved lines." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:666 -msgid "<option>Enabled</option>: WinMerge tries to detect lines that are moved (in different locations in each file). Moved blocks are indicated by the <guilabel>Moved</guilabel> and <guilabel>Selected Moved</guilabel> 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." +#: ./English/Configuration.xml:855 +msgid "<option>Enabled</option>: WinMerge tries to detect lines that are moved (in different locations in each file). Moved blocks are indicated by the <guilabel>Moved</guilabel> and <guilabel> Selected Moved </guilabel> 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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:674 +#: ./English/Configuration.xml:867 msgid "For an example, see the Location pane description in <xref linkend=\"Compare_files\" />." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:682 +#: ./English/Configuration.xml:877 msgid "similar lines, aligning" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:681 +#: ./English/Configuration.xml:876 msgid "Align similar lines<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:687 +#: ./English/Configuration.xml:884 msgid "<option>Disabled</option> (default): Lines within difference blocks are shown as they occur in the source files." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:692 +#: ./English/Configuration.xml:891 msgid "<option>Enabled</option>: WinMerge tries to detect lines within a difference blocks that are similar, and adds blank lines in the File panes to align them. This option is most effective when lines are quite similar; less effective if lines are too different." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:697 +#: ./English/Configuration.xml:898 msgid "For an example, see the <citetitle>Similar lines</citetitle> description in <xref linkend=\"CompareFiles_diffcolors\" />." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:705 +#: ./English/Configuration.xml:908 msgid "algorithm" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:704 +#: ./English/Configuration.xml:907 msgid "Diff algorithm<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:710 +#: ./English/Configuration.xml:915 msgid "<option>default</option> (default): The basic greedy diff algorithm." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:715 +#: ./English/Configuration.xml:922 msgid "<option>minimal</option>: Spend extra time to make sure the smallest possible diff is produced." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:720 +#: ./English/Configuration.xml:929 msgid "<option>patience</option>: Use \"patience diff\" algorithm when generating diff." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:725 +#: ./English/Configuration.xml:936 msgid "<option>histogram</option>: This algorithm extends the patience algorithm to \"support low-occurrence common elements\"." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:730 +#: ./English/Configuration.xml:943 msgid "<option>none</option>: This algorithm does not detect insertions or deletions of lines." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:739 +#: ./English/Configuration.xml:953 msgid "indent heuristic" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:738 +#: ./English/Configuration.xml:952 msgid "Enable indent heuristic<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:744 +#: ./English/Configuration.xml:960 msgid "<option>Enabled</option> (default): Enable the heuristic that shifts diff hunk boundaries to make diffs easier to read. It has no effect if the Diff algorithm is default." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:750 +#: ./English/Configuration.xml:968 msgid "<option>Disabled</option>: Disable the heuristic." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:757 +#: ./English/Configuration.xml:977 msgid "unhighlight ignored differences" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:756 +#: ./English/Configuration.xml:976 msgid "Completely unhighlight the ignored differences<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:762 +#: ./English/Configuration.xml:984 msgid "<option>Enabled</option>: Makes the color of the different lines ignored by line filters and substitution filters the same as the color of the identical lines." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:769 +#: ./English/Configuration.xml:992 msgid "<option>Disabled</option> (default): Difference lines ignored by line filters and substitution filters are displayed in the color of Ignored Difference." msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:778 +#: ./English/Configuration.xml:1002 msgid "Compare Folder page" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:784 +#: ./English/Configuration.xml:1009 msgid "detection options" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:781 +#: ./English/Configuration.xml:1006 msgid "Compare method<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:787 +#: ./English/Configuration.xml:1014 msgid "This option lets you determine how complete your file comparisons are. Choose one of these five choices:" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:792 +#: ./English/Configuration.xml:1020 msgid "Full Contents" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:795 +#: ./English/Configuration.xml:1024 msgid "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." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:803 +#: ./English/Configuration.xml:1033 msgid "Quick Contents" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:806 -msgid "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 <guilabel>Full Contents</guilabel>, because it does not load the files." +#: ./English/Configuration.xml:1037 +msgid "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 <guilabel> Full Contents </guilabel>, because it does not load the files." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:811 +#: ./English/Configuration.xml:1046 msgid "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." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:818 +#: ./English/Configuration.xml:1054 msgid "Binary Contents" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:821 +#: ./English/Configuration.xml:1058 msgid "This method is faster than the Quick contents compare method. However, it does not apply any plugins, line filters, 'Ignore case' option, etc. First, it compares the file sizes, and if they are different, it treats the contents of the file as different without comparing them. If the file sizes match, it simply compares the contents of the file in bytes. No file encoding detection, EOL detection, or binary file detection is performed. This compare method is good for comparing files against backed up files." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:833 +#: ./English/Configuration.xml:1072 msgid "Modified Date<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:840 +#: ./English/Configuration.xml:1081 msgid "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." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:847 +#: ./English/Configuration.xml:1089 msgid "Modified Date and Size" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:850 +#: ./English/Configuration.xml:1093 msgid "Similar to <guilabel>Modified Date</guilabel>, but also checks file sizes when dates are identical." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> -#: ./English/Configuration.xml:857 +#: ./English/Configuration.xml:1102 msgid "file sizes" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:856 +#: ./English/Configuration.xml:1101 msgid "Size<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:863 +#: ./English/Configuration.xml:1110 msgid "Compares only file sizes, so it is fast but not as accurate as the contents methods." msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:874 ./English/Configuration.xml:878 +#: ./English/Configuration.xml:1123 ./English/Configuration.xml:1127 msgid "stopping after first difference" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:871 +#: ./English/Configuration.xml:1120 msgid "Stop after first difference<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:881 -msgid "This option is enabled only when the <guilabel>Quick Contents</guilabel> compare method is selected." +#: ./English/Configuration.xml:1132 +msgid "This option is enabled only when the <guilabel> Quick Contents </guilabel> compare method is selected." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:886 +#: ./English/Configuration.xml:1141 msgid "<option>Disabled</option> (default): WinMerge examines all differences in the files." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:891 +#: ./English/Configuration.xml:1148 msgid "<option>Enabled</option>: This option optimizes comparisons by examining files only until the first difference is found, instead always scanning the entire files." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:895 +#: ./English/Configuration.xml:1154 msgid "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." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:906 +#: ./English/Configuration.xml:1167 msgid "Ignore time differences less than 3 seconds<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:914 +#: ./English/Configuration.xml:1177 msgid "<option>Disabled</option> (default): Files with different timestamps are detected as different." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:919 +#: ./English/Configuration.xml:1184 msgid "<option>Enabled</option>: 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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:924 -msgid "This option works only with the <guimenuitem>Modified Date</guimenuitem> and <guimenuitem>Modified Date and Size</guimenuitem> compare methods (described in <xref linkend=\"Configuration_compmethod\" />). It has no effect with other methods." +#: ./English/Configuration.xml:1191 +msgid "This option works only with the <guimenuitem> Modified Date </guimenuitem> and <guimenuitem> Modified Date and Size </guimenuitem> compare methods (described in <xref linkend=\"Configuration_compmethod\" />). It has no effect with other methods." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><warning><para> -#: ./English/Configuration.xml:931 +#: ./English/Configuration.xml:1204 msgid "This option should be enabled only when the time difference is detected. Otherwise, it can cause incorrect compare results." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:940 +#: ./English/Configuration.xml:1215 ./English/Configuration.xml:1299 +msgid "expand subfolders" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:1214 ./English/Configuration.xml:1298 +msgid "Automatically expand subfolders after comparison<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:1224 +msgid "<option>Do not expand</option> (default): Subfolders remain collapsed after comparison." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:1230 +msgid "<option>Expand all subfolders</option>: All subfolders are expanded after comparison." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:1236 +msgid "<option>Expand different subfolders</option>: Only subfolders with differences are expanded after comparison." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:1242 +msgid "<option>Expand identical subfolders</option>: Only subfolders without differences are expanded after comparison." +msgstr "" + +#. type: Content of: <article><section><section><title><indexterm><primary> +#: ./English/Configuration.xml:1251 msgid "include unique subfolders" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:939 +#: ./English/Configuration.xml:1250 msgid "Include unique subfolders contents<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:947 +#: ./English/Configuration.xml:1260 msgid "<option>Disabled</option> (default): WinMerge ignore unique subfolders when comparing folders." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:951 +#: ./English/Configuration.xml:1266 msgid "<option>Enabled</option>: WinMerge also shows the content from unique subfolders." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:958 +#: ./English/Configuration.xml:1275 msgid "include subfolders" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:957 +#: ./English/Configuration.xml:1274 msgid "Include subfolders<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:965 +#: ./English/Configuration.xml:1284 msgid "<option>Enabled</option> (default): WinMerge doing a recursive comparing and also includes subfolders." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:969 +#: ./English/Configuration.xml:1290 msgid "<option>Disabled</option>: WinMerge only comparing the files in the root folder." msgstr "" -#. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:976 -msgid "expand subfolders" -msgstr "" - -#. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:975 -msgid "Automatically expand subfolders after comparison<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" - #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:983 +#: ./English/Configuration.xml:1307 msgid "Do not expand" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:986 +#: ./English/Configuration.xml:1311 msgid "(default): WinMerge will not automatically expand subfolders after comparing folders." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:992 +#: ./English/Configuration.xml:1317 msgid "Expand all subfolders" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:995 +#: ./English/Configuration.xml:1321 msgid "WinMerge will automatically expand all subfolders after comparing folders." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1001 +#: ./English/Configuration.xml:1327 msgid "Expand different subfolders" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:1004 +#: ./English/Configuration.xml:1331 msgid "WinMerge will automatically expand different subfolders after comparing folders." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1010 +#: ./English/Configuration.xml:1337 msgid "Expand identical subfolders" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:1013 +#: ./English/Configuration.xml:1341 msgid "WinMerge will automatically expand identical subfolders after comparing folders." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1022 +#: ./English/Configuration.xml:1351 msgid "reparse points" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1021 +#: ./English/Configuration.xml:1350 msgid "Ignore reparse points<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:1360 +msgid "<option>Disabled</option> (default): TBD" +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: ./English/Configuration.xml:1366 +msgid "<option>Enabled</option>: TBD" +msgstr "" + #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1040 +#: ./English/Configuration.xml:1375 msgid "Quick compare" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1042 ./English/Configuration.xml:1067 +#: ./English/Configuration.xml:1377 ./English/Configuration.xml:1409 msgid "limit" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1039 +#: ./English/Configuration.xml:1374 msgid "Threshold for switching to quick compare (MB)<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1047 +#: ./English/Configuration.xml:1384 msgid "<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1052 +#: ./English/Configuration.xml:1391 msgid "<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1055 +#: ./English/Configuration.xml:1396 msgid "Threshold size for switching to <guilabel>Quick Contents</guilabel> compare method. When <guilabel>Full Contents</guilabel> compare method is selected, files bigger (in mega bytes) than this value are compared using <guilabel>Quick Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1065 +#: ./English/Configuration.xml:1407 msgid "Binary compare" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1064 +#: ./English/Configuration.xml:1406 msgid "Threshold for switching to binary compare (MB)<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1072 +#: ./English/Configuration.xml:1416 msgid "<option>Disabled</option>: Is not active unless the Compare method is set to other than <guilabel>Full Contents</guilabel> and <guilabel>Quick Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1077 +#: ./English/Configuration.xml:1423 msgid "<option>Enabled</option>: Is active when the Compare method is set to <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1080 +#: ./English/Configuration.xml:1428 msgid "Threshold size for switching to Binary Contents compare method. When <guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> compare method is selected, files bigger (in mega bytes) than this value are compared using <guilabel>Binary Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1090 +#: ./English/Configuration.xml:1439 msgid "compare threads" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1089 -msgid "Number of compare threads<placeholder type=\"indexterm\" id=\"0\"/>" +#: ./English/Configuration.xml:1438 +msgid "Number of CPU cores to use<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1093 +#: ./English/Configuration.xml:1444 msgid "Number of threads which use to comparing. With a negative value WinMerge will use addition of the number of available CPU cores." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1101 +#: ./English/Configuration.xml:1454 msgid "table files" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1100 +#: ./English/Configuration.xml:1453 msgid "Compare Table page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1104 +#: ./English/Configuration.xml:1458 msgid "CSV File Patterns" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1106 +#: ./English/Configuration.xml:1460 msgid "Specifies file name pattern for comma-separated values files to open in table format. To specify multiple items, separate them with a semicolon. By default, *.csv is specified. If you do not want to open the files with the extension .csv in table format. Delete the *.csv." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1113 +#: ./English/Configuration.xml:1467 msgid "TSV File Patterns" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1115 +#: ./English/Configuration.xml:1469 msgid "Specifies file name pattern for tab-separated values files to open in table format. To specify multiple items, separate them with a semicolon. By default, *.tsv is specified. If you do not want to open the files with the extension .tsv in table format. Delete the *.tsv." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1122 +#: ./English/Configuration.xml:1476 msgid "Custom Delimiter-Separated Values" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1124 +#: ./English/Configuration.xml:1478 msgid "If you want to open text files, with values separated by characters other than commas or tabs, in tabular format, specify the file name pattern and delimiter." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1130 +#: ./English/Configuration.xml:1484 msgid "Allow newlines in quotes" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1133 +#: ./English/Configuration.xml:1488 msgid "<option>Enabled</option> (default): If there is a newline character between the quote character and the next quote character, the newline character is treated as part of a value. Enable this option if you want to process CSV/TSV files that contain multiple lines in one field." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1140 +#: ./English/Configuration.xml:1497 msgid "<option>Disabled</option>: Disable the above. Disable this option when opening files with incorrect quotes." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1149 +#: ./English/Configuration.xml:1506 msgid "Quote character" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1151 +#: ./English/Configuration.xml:1508 msgid "Specifies the character that is treated as quotation marks. Delimiters within the text range enclosed by the characters specified here are treated as part of a value. This field can be empty. To open files in which the quotation marks are mere values, leave it empty or specify a character that does not exist in the file." msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1161 +#: ./English/Configuration.xml:1518 msgid "Compare Binary page" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1164 +#: ./English/Configuration.xml:1522 msgid "binary files" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1163 +#: ./English/Configuration.xml:1521 msgid "Binary File Patterns<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1170 +#: ./English/Configuration.xml:1530 msgid "frhed" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1169 +#: ./English/Configuration.xml:1529 msgid "Frhed settings<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1175 +#: ./English/Configuration.xml:1536 msgid "View Settings..." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1183 +#: ./English/Configuration.xml:1544 msgid "Binary Mode..." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1191 +#: ./English/Configuration.xml:1552 msgid "Character Set..." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1203 +#: ./English/Configuration.xml:1565 msgid "image files" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1202 +#: ./English/Configuration.xml:1564 msgid "Compare Image page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1206 +#: ./English/Configuration.xml:1569 msgid "Image File Patterns" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1211 +#: ./English/Configuration.xml:1574 msgid "Enable image compare in folder compare" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1216 +#: ./English/Configuration.xml:1579 msgid "OCR result" msgstr "" +#. type: Content of: <article><section><title><indexterm><primary> +#: ./English/Configuration.xml:1587 +msgid "webpages" +msgstr "" + +#. type: Content of: <article><section><title> +#: ./English/Configuration.xml:1586 +msgid "Compare Webpage page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:1593 +msgid "URL pattern to include (Regular expression)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:1601 +msgid "URL pattern to exclude (Regular expression)<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:1609 +msgid "User data folder location<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:1617 +msgid "Separate user data folders for each pane<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><title><indexterm><primary> +#: ./English/Configuration.xml:1628 +msgid "message boxes" +msgstr "" + +#. type: Content of: <article><section><title> +#: ./English/Configuration.xml:1627 +msgid "Message Boxes page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: ./English/Configuration.xml:1633 +msgid "Reset" +msgstr "" + +#. type: Content of: <article><section><section><para> +#: ./English/Configuration.xml:1636 +msgid "WinMerge allows you to suppress some common message boxes. For example, when two identical files are opened, the message box titled, <guilabel>The files are identical</guilabel>, 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." +msgstr "" + +#. type: Content of: <article><section><section><para> +#: ./English/Configuration.xml:1644 +msgid "Later, you might decide that you want to see those messages again. If so, click the <guibutton>Reset</guibutton> button to make the message boxes display again." +msgstr "" + +#. type: Content of: <article><section><section><note><para> +#: ./English/Configuration.xml:1651 +msgid "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 <guibutton>Reset</guibutton> button." +msgstr "" + #. type: Content of: <article><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1225 ./English/Configuration.xml:1382 +#: ./English/Configuration.xml:1665 ./English/Configuration.xml:1866 msgid "options for File Compare window" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1222 +#: ./English/Configuration.xml:1662 msgid "Editor General page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1230 ./English/Configuration.xml:1570 +#: ./English/Configuration.xml:1672 ./English/Configuration.xml:2106 msgid "syntax highlighting" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1232 +#: ./English/Configuration.xml:1674 msgid "enabling and disabling" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1229 +#: ./English/Configuration.xml:1671 msgid "Highlight syntax<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1237 +#: ./English/Configuration.xml:1681 msgid "<option>Enabled</option> (default): WinMerge can syntax highlight many programming language and web formats. To see the formats that are supported by default, click <menuchoice> <guimenu>View</guimenu> <guimenuitem>Syntax Highlight</guimenuitem> </menuchoice>." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1247 +#: ./English/Configuration.xml:1693 msgid "<option>Disabled</option>: Syntax highlighting consumes some processing power, so if WinMerge screen updating seems to be slow, turning off this option might help." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1260 +#: ./English/Configuration.xml:1708 msgid "end of line" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1255 +#: ./English/Configuration.xml:1703 msgid "Preserve original EOL chars<placeholder type=\"indexterm\" id=\"0\"/><placeholder type=\"indexterm\" id=\"1\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1267 +#: ./English/Configuration.xml:1717 msgid "<option>Disabled</option> (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 <guilabel>Win</guilabel>." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1274 +#: ./English/Configuration.xml:1726 msgid "For most situations you should leave this option disabled: the default behavior works even when comparing two files that have different line ending styles." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1280 +#: ./English/Configuration.xml:1734 msgid "<option>Enabled</option>: 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)." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> -#: ./English/Configuration.xml:1286 +#: ./English/Configuration.xml:1742 msgid "This is an advanced option for users who are familiar with EOL bytes and who want to compare files with different EOL styles inside <emphasis>one</emphasis> 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." msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1301 +#: ./English/Configuration.xml:1759 msgid "editing options" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1298 +#: ./English/Configuration.xml:1756 msgid "Tabs<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1306 +#: ./English/Configuration.xml:1765 msgid "Tab size" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:1309 +#: ./English/Configuration.xml:1769 msgid "Width of a tab space. Specify a value <replaceable>n</replaceable>: the resulting width is equivalent to that of <replaceable>n</replaceable> characters. Default: 4. The maximum value is 64." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1317 +#: ./English/Configuration.xml:1778 msgid "Tab insert options" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: ./English/Configuration.xml:1320 +#: ./English/Configuration.xml:1782 msgid "Determines what kind of character is used when you insert a tab in text. Only one of these options can be enabled:" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1325 +#: ./English/Configuration.xml:1789 msgid "<guilabel>Insert Tabs</guilabel> (default): Uses a single tab character." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1330 +#: ./English/Configuration.xml:1796 msgid "<guilabel>Insert Spaces</guilabel>: Uses one or more spaces (determined by the <option>Tab size</option>) instead of a tab character. For example, with the default tab size, four spaces are inserted." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1343 +#: ./English/Configuration.xml:1811 msgid "rendering" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1342 +#: ./English/Configuration.xml:1810 msgid "Rendering Mode<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1348 +#: ./English/Configuration.xml:1818 msgid "<option>GDI</option> (default): TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1352 +#: ./English/Configuration.xml:1824 msgid "<option>DirectWrite Default</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1356 +#: ./English/Configuration.xml:1830 msgid "<option>DirectWrite Aliased</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1360 +#: ./English/Configuration.xml:1836 msgid "<option>DirectWrite GDI Classic</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1364 +#: ./English/Configuration.xml:1842 msgid "<option>DirectWrite GDI Natural</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1368 +#: ./English/Configuration.xml:1848 msgid "<option>DirectWrite Natural</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1372 +#: ./English/Configuration.xml:1854 msgid "<option>DirectWrite Natural Symmetric</option>: TBD" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1379 +#: ./English/Configuration.xml:1863 msgid "Editor Compare/Merge page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1389 +#: ./English/Configuration.xml:1875 msgid "enabling and disabling autoscan" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1386 +#: ./English/Configuration.xml:1872 msgid "Automatic rescan<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1394 +#: ./English/Configuration.xml:1882 msgid "<option>Disabled</option> (default): WinMerge rescans automatically when you merge a difference, or if you manually rescan (for example, click the <guibutton>Rescan</guibutton> button)." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1400 +#: ./English/Configuration.xml:1890 msgid "<option>Enabled</option>: Forces WinMerge to rescan after every edit event (a change to files, like typing)." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><note><para> -#: ./English/Configuration.xml:1404 +#: ./English/Configuration.xml:1896 msgid "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." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1415 +#: ./English/Configuration.xml:1909 msgid "copy granularity" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1414 +#: ./English/Configuration.xml:1908 msgid "Copy granularity for selected differences<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1418 +#: ./English/Configuration.xml:1914 msgid "Specifies the copy granularity when copying to another pane by clicking the <guimenuitem>Copy to right</guimenuitem> menu item etc. with text selected." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1424 +#: ./English/Configuration.xml:1922 msgid "<option>Diff hunk</option>: Copies diff hunks within the selected text." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1429 +#: ./English/Configuration.xml:1929 msgid "<option>Inline diff</option>: Copies inline diffs within the selected text." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1434 +#: ./English/Configuration.xml:1936 msgid "<option>Line</option>: Copies the differences within the selected text line by line." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1439 +#: ./English/Configuration.xml:1943 msgid "<option>Character</option> (default): Copies the differences within the selected text character by character." msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1450 +#: ./English/Configuration.xml:1956 msgid "viewing options" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1447 +#: ./English/Configuration.xml:1953 msgid "Line Difference Coloring<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1453 -msgid "These settings enable and configure the detection of <glossterm>line differences</glossterm> (changes within the lines of difference blocks):" +#: ./English/Configuration.xml:1961 +msgid "These settings enable and configure the detection of <glossterm> line differences </glossterm> (changes within the lines of difference blocks):" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1459 +#: ./English/Configuration.xml:1970 msgid "View line differences" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1464 +#: ./English/Configuration.xml:1976 msgid "<option>Enabled</option> (default): WinMerge highlights differences within lines. Also enables the <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Differences</guimenuitem> </menuchoice> menu item." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1471 +#: ./English/Configuration.xml:1984 msgid "Choose one of these suboptions:" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1475 +#: ./English/Configuration.xml:1989 msgid "<guilabel>Character level</guilabel>: Highlights individual characters that are different. This option can be useful if you are looking for changes within words, or for file formats that do not have clear word breaks." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1482 +#: ./English/Configuration.xml:1998 msgid "<guilabel>Word-level</guilabel> (default): Highlights entire words that are different." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1487 +#: ./English/Configuration.xml:2005 msgid "<guilabel>Break at whitespace</guilabel> (default): Words are assumed to be separated by whitespace characters. This usually works for typical text files." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1493 +#: ./English/Configuration.xml:2013 msgid "<guilabel>Break at whitespace or punctuation</guilabel>: Considers both whitespace and punctuation characters to be word breaks. This can useful for handling lists that are separated with punctuation (like comma-separated lists)." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1505 +#: ./English/Configuration.xml:2027 msgid "<option>Disabled</option>: WinMerge does not highlight line differences, and all settings for the level and whitespace options are ignored. Also disables the <menuchoice> <guimenu>View</guimenu> <guimenuitem>View Line Differences</guimenuitem> </menuchoice> menu item." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:1520 +#: ./English/Configuration.xml:2043 msgid "Word break characters" msgstr "" #. type: Content of: <article><section><section><note><title> -#: ./English/Configuration.xml:1529 +#: ./English/Configuration.xml:2052 msgid "Related topic" msgstr "" #. type: Content of: <article><section><section><note><para> -#: ./English/Configuration.xml:1531 +#: ./English/Configuration.xml:2055 msgid "<xref linkend=\"CompareFiles_linediff-highlight\" /> explains in more detail how WinMerge detects and marks line differences." msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1539 +#: ./English/Configuration.xml:2065 msgid "Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1545 +#: ./English/Configuration.xml:2073 msgid "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." msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1549 ./English/Configuration.xml:1620 +#: ./English/Configuration.xml:2079 ./English/Configuration.xml:2172 msgid "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 <guibutton>OK</guibutton> to load the new color in the box." msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1554 ./English/Configuration.xml:1581 -#: ./English/Configuration.xml:1625 +#: ./English/Configuration.xml:2086 ./English/Configuration.xml:2121 +#: ./English/Configuration.xml:2179 msgid "To revert to the default colors of a scheme, choose a different scheme and return to the modified scheme." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1560 +#: ./English/Configuration.xml:2094 msgid "differences colors" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1559 +#: ./English/Configuration.xml:2093 msgid "Differences Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1572 +#: ./English/Configuration.xml:2108 msgid "color options" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1569 +#: ./English/Configuration.xml:2105 msgid "Syntax Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1575 +#: ./English/Configuration.xml:2113 msgid "By default, the WinMerge File Compare window marks the syntax of certain kinds of source code, as described in <xref linkend=\"Configuration_syntaxhighlight\" />. This page lists the syntax elements that are recognized, and enables you to change their text color and weight." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1587 +#: ./English/Configuration.xml:2129 msgid "text colors" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1586 +#: ./English/Configuration.xml:2128 msgid "Text Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1592 +#: ./English/Configuration.xml:2136 msgid "Use this page to change the colors used for text. First, check the option, <guilabel>Use customized text colors</guilabel>. 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." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1601 +#: ./English/Configuration.xml:2147 msgid "marker colors" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1600 +#: ./English/Configuration.xml:2146 msgid "Marker Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1611 +#: ./English/Configuration.xml:2159 msgid "folder compare colors" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1610 +#: ./English/Configuration.xml:2158 msgid "Folder Compare Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1616 +#: ./English/Configuration.xml:2166 msgid "By default, the WinMerge Folder Compare window use background colors to show the status from a item (equal, different, not exists on all sides or filtered)." msgstr "" #. type: Content of: <article><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1633 +#: ./English/Configuration.xml:2189 msgid "configuring support after installation" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1630 +#: ./English/Configuration.xml:2186 msgid "Archive Support page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1636 +#: ./English/Configuration.xml:2194 msgid "This page contains options for configuring archive support using 7-Zip." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1641 ./English/Open_paths.xml:60 +#: ./English/Configuration.xml:2201 ./English/Open_paths.xml:60 msgid "7-Zip archives" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1643 +#: ./English/Configuration.xml:2203 msgid "enabling and disabling integration" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1640 +#: ./English/Configuration.xml:2200 msgid "Enable archive file support<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1646 +#: ./English/Configuration.xml:2208 msgid "This option controls how WinMerge handles archive files (based on 7-Zip integration)." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1651 +#: ./English/Configuration.xml:2215 msgid "<option>Enabled</option> (default): WinMerge recognizes 7-Zip archives." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1656 +#: ./English/Configuration.xml:2222 msgid "<option>Disabled</option>: Turns off 7-Zip archive integration." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1664 +#: ./English/Configuration.xml:2232 msgid "detecting archive types" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1663 +#: ./English/Configuration.xml:2231 msgid "Detect archive type from file signature<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1669 +#: ./English/Configuration.xml:2239 msgid "<option>Disabled</option> (default): WinMerge recognizes only archives whose file extension is known on your system (for example, in the registry or through a file association)." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1675 +#: ./English/Configuration.xml:2247 msgid "<option>Enabled</option>: 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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para><tip><para> -#: ./English/Configuration.xml:1679 +#: ./English/Configuration.xml:2252 msgid "You can use this option to enable WinMerge to recognize Open Office files." msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1688 +#: ./English/Configuration.xml:2263 msgid "System page" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1691 +#: ./English/Configuration.xml:2267 msgid "Send deleted files to Recycle Bin<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1699 +#: ./English/Configuration.xml:2277 msgid "<option>Enabled</option> (default): Files and folders that you delete in a Folder Compare window are moved to the Recycle Bin, if it is available." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> -#: ./English/Configuration.xml:1704 +#: ./English/Configuration.xml:2284 msgid "Remember: if the Recycle Bin on your system has been deactivated, this option does not work, and deleted files are lost!" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1712 +#: ./English/Configuration.xml:2294 msgid "<option>Disabled</option>: Files and folders deleted in a directory compare actually deleted." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1720 +#: ./English/Configuration.xml:2304 msgid "external editor" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1722 +#: ./English/Configuration.xml:2306 msgid "configuring" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1719 +#: ./English/Configuration.xml:2303 msgid "External editor<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1725 +#: ./English/Configuration.xml:2311 msgid "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." msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1730 +#: ./English/Configuration.xml:2318 msgid "Installation configures Notepad 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." msgstr "" #. type: Content of: <article><section><section><tip><para> -#: ./English/Configuration.xml:1735 -msgid "Along with the path, you can include any command line parameters supported by the external tool, in this format: <command><replaceable>path to executable</replaceable></command> <option>-option1</option> <option>-option2</option> <option><replaceable>...</replaceable></option>" +#: ./English/Configuration.xml:2325 +msgid "Along with the path, you can include any command line parameters supported by the external tool, in this format: <command> <replaceable>path to executable</replaceable> </command> <option>-option1</option> <option>-option2</option> <option> <replaceable>...</replaceable> </option>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1742 +#: ./English/Configuration.xml:2338 msgid "To use the configured external editor, right-click a file in the Folder Compare window and choose <menuchoice> <guimenuitem>Open Left</guimenuitem> <guimenuitem>With External Editor</guimenuitem> </menuchoice> or <menuchoice> <guimenuitem>Open Right</guimenuitem> <guimenuitem>With External Editor</guimenuitem> </menuchoice>." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1756 ./English/Filters.xml:215 +#: ./English/Configuration.xml:2354 ./English/Filters.xml:215 msgid "Filters folders" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1758 +#: ./English/Configuration.xml:2356 msgid "specifying default private folder" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1755 +#: ./English/Configuration.xml:2353 msgid "Filter folder<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1761 +#: ./English/Configuration.xml:2361 msgid "Use this field to specify your own private folder for file filters. By default this folder is your user profile directory (for example, <filename>Documents</filename> on Windows 10). When you create a file filter, it is automatically added to this folder." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: ./English/Configuration.xml:1769 +#: ./English/Configuration.xml:2371 msgid "temporary files, folder used" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1768 +#: ./English/Configuration.xml:2370 msgid "Temporary files folder<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1772 +#: ./English/Configuration.xml:2376 msgid "Specify the folder where WinMerge stores temporary files. Either one of these options is available:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1777 +#: ./English/Configuration.xml:2383 msgid "<guilabel>System's temp folder</guilabel> (default): For example, this might be <filename>C:\\Windows\\Temp</filename> on your system." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1782 +#: ./English/Configuration.xml:2390 msgid "<guilabel>Custom folder</guilabel>: Click <guibutton>Browse</guibutton> and select a different folder where you have write access." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: ./English/Configuration.xml:1791 +#: ./English/Configuration.xml:2401 msgid "backup files, options" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1790 +#: ./English/Configuration.xml:2400 msgid "Backup Files page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1794 +#: ./English/Configuration.xml:2406 msgid "This page allows you to control how WinMerge creates backup files." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1798 +#: ./English/Configuration.xml:2411 msgid "Create backup files in" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1800 +#: ./English/Configuration.xml:2414 msgid "Specify when WinMerge should create backup files. You can enable or disable each of these options independently:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1805 +#: ./English/Configuration.xml:2421 msgid "<guilabel>Folder compare</guilabel> (disabled by default): Backup files are create whenever files are overwritten (copied)." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1811 +#: ./English/Configuration.xml:2429 msgid "<guilabel>File compare</guilabel> (enabled by default): Backup files are created whenever files are saved." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1818 +#: ./English/Configuration.xml:2437 msgid "Create backup files into" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1820 +#: ./English/Configuration.xml:2440 msgid "Specify where backup files are created. Only one of these options can be enabled:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1825 +#: ./English/Configuration.xml:2447 msgid "<guilabel>Original file's folder</guilabel> (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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1832 +#: ./English/Configuration.xml:2456 msgid "<guilabel>Global backup folder</guilabel> (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." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1842 +#: ./English/Configuration.xml:2467 msgid "Backup filename" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1844 +#: ./English/Configuration.xml:2470 msgid "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:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1850 +#: ./English/Configuration.xml:2478 msgid "<guilabel>Append .bak extension</guilabel> (enabled by default): For example, the <filename>file.txt</filename> is backed up to <filename>file.txt.bak</filename>." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1856 +#: ./English/Configuration.xml:2486 msgid "<guilabel>Append timestamp</guilabel> (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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1861 +#: ./English/Configuration.xml:2493 msgid "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." msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1870 +#: ./English/Configuration.xml:2504 msgid "Codepage page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><para> -#: ./English/Configuration.xml:1876 +#: ./English/Configuration.xml:2512 msgid "WinMerge detects handles file encoding transparently, and in most cases you should not need to change the default settings.This page allows you to specify the codepages of certain file formats, should you need to." msgstr "" #. type: Content of: <article><section><note><para> -#: ./English/Configuration.xml:1881 +#: ./English/Configuration.xml:2519 msgid "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:" msgstr "" #. type: Content of: <article><section><note><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1888 -msgid "<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\">Wikipedia: Code pages</ulink>, <ulink url=\"https://en.wikipedia.org/wiki/Character_encoding\">Character encoding</ulink>" +#: ./English/Configuration.xml:2528 +msgid "<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: Code pages </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/Character_encoding\"> Character encoding </ulink>" msgstr "" #. type: Content of: <article><section><note><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1895 -msgid "<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages Supported by Windows</ulink>" +#: ./English/Configuration.xml:2541 +msgid "<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages Supported by Windows </ulink>" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1903 +#: ./English/Configuration.xml:2551 msgid "Default Codepage" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1905 +#: ./English/Configuration.xml:2554 msgid "Choose one of these radio buttons to set the default codepage that WinMerge uses when handling ANSI files:" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1910 +#: ./English/Configuration.xml:2561 msgid "<guilabel>System codepage</guilabel> (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." msgstr "" #. This is just a guess - don't find any info on this option. #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1917 +#: ./English/Configuration.xml:2570 msgid "<guilabel>According to WinMerge User Interface</guilabel>: The encoding used by your installation of WinMerge." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1922 +#: ./English/Configuration.xml:2577 msgid "<guilabel>Custom codepage</guilabel>: Enter the codepage number explicitly. For example, <userinput>UTF-8</userinput> or <userinput>ISO-8851-1</userinput>." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1930 +#: ./English/Configuration.xml:2586 msgid "Detect codepage info for these files: .html, .rc, .xml" msgstr "" @@ -6858,105 +6956,105 @@ msgstr "" #. why is the option there? Also, should we mention WinMergeU.exe when we mention WinMerge.exe, #. or is this understood? #. type: Content of: <article><section><section><important><para> -#: ./English/Configuration.xml:1933 +#: ./English/Configuration.xml:2590 msgid "Uncheck this option in <filename>WinMerge.exe</filename>. Characters conversions can result in lossy conversions and the risk is very high. <filename>WinMerge.exe</filename> can display files only with your current codepage." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1943 +#: ./English/Configuration.xml:2602 msgid "<option>Disabled</option> (default): WinMerge does not read codepage information from the source files. It uses the default codepage setting instead." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1949 +#: ./English/Configuration.xml:2610 msgid "<option>Enabled</option>: WinMerge detects the codepage for these extensions: <filename class=\"extension\">html</filename>, <filename class=\"extension\">rc</filename> (resource files for VC++) and <filename class=\"extension\">xml</filename>. The detected codepage overrides the setting for the default codepage option." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1955 +#: ./English/Configuration.xml:2618 msgid "This option is of interest when your documents use a codepage that is different from the codepage of your Windows configuration." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1959 +#: ./English/Configuration.xml:2624 msgid "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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: ./English/Configuration.xml:1964 +#: ./English/Configuration.xml:2631 msgid "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." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><caution><para> -#: ./English/Configuration.xml:1969 +#: ./English/Configuration.xml:2638 msgid "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." msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1981 +#: ./English/Configuration.xml:2651 msgid "Detect codepage for text files using mlang.dll" msgstr "" #. type: Content of: <article><section><title> -#: ./English/Configuration.xml:1989 +#: ./English/Configuration.xml:2659 msgid "Shell Integration page" msgstr "" #. type: Content of: <article><title><indexterm><primary> -#: ./English/Configuration.xml:1993 ./English/Faq.xml:95 +#: ./English/Configuration.xml:2664 ./English/Faq.xml:95 #: ./English/Install.xml:175 ./English/Install.xml:190 #: ./English/Install.xml:353 ./English/Version_control.xml:4 msgid "integration" msgstr "" #. type: Content of: <article><section><title><indexterm><secondary> -#: ./English/Configuration.xml:1995 ./English/Install.xml:192 +#: ./English/Configuration.xml:2666 ./English/Install.xml:192 #: ./English/Install.xml:355 msgid "with Windows shell" msgstr "" #. type: Content of: <article><section><section><title> -#: ./English/Configuration.xml:1992 +#: ./English/Configuration.xml:2663 msgid "Explorer<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:1998 +#: ./English/Configuration.xml:2671 msgid "The <option>Add to context menu</option> option enables you to launch WinMerge directly from Windows Explorer, comparing items that you have selected there. It is enabled or disabled by default during WinMerge installation. If enabled, you can also enable one or both of these options:" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:2006 +#: ./English/Configuration.xml:2680 msgid "Enable advanced menu" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:2011 +#: ./English/Configuration.xml:2686 msgid "<option>Disabled</option> (default): Only the <guimenuitem>WinMerge</guimenuitem> shortcut is included in the Windows Explorer context menu." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:2017 +#: ./English/Configuration.xml:2694 msgid "<option>Enabled</option>: Replaces the <guimenuitem>WinMerge</guimenuitem> shortcut in the Explorer context menu with <guimenuitem>Compare</guimenuitem> shortcuts." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: ./English/Configuration.xml:2029 +#: ./English/Configuration.xml:2707 msgid "Enable Compare As menu" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:2034 +#: ./English/Configuration.xml:2713 msgid "<option>Disabled</option> (default): Removes <guimenuitem>Compare As</guimenuitem> menu item from Explorer context menu." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: ./English/Configuration.xml:2040 +#: ./English/Configuration.xml:2721 msgid "<option>Enabled</option>: Adds <guimenuitem>Compare As</guimenuitem> menu item to Explorer context menu." msgstr "" #. type: Content of: <article><section><section><para> -#: ./English/Configuration.xml:2049 +#: ./English/Configuration.xml:2732 msgid "<xref linkend=\"OpenPaths_shell-integ\" /> describes how to use the WinMerge and Compare shortcuts." msgstr "" diff --git a/Translations/Docs/Manual/Japanese.po b/Translations/Docs/Manual/Japanese.po index 80de4118bee..cdb222fcf70 100644 --- a/Translations/Docs/Manual/Japanese.po +++ b/Translations/Docs/Manual/Japanese.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" -"POT-Creation-Date: 2024-03-02 20:05+0900\n" +"POT-Creation-Date: 2024-07-25 09:06+0900\n" "PO-Revision-Date: 2024-03-02 19:07+0900\n" "Last-Translator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n" "Language-Team: Japanese <winmerge-translate@lists.sourceforge.net>\n" @@ -502,7 +502,7 @@ msgstr "" "\\workfiles\\project1</filename>に展開されます。" #. type: Content of: <article><section><section><example><para><screen> -#: English/About_Doc.xml:314 English/Configuration.xml:494 +#: English/About_Doc.xml:314 English/Configuration.xml:612 #, no-wrap msgid "TwoWords" msgstr "TwoWords" @@ -820,7 +820,7 @@ msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Command_line.xml:210 English/Command_line.xml:294 -#: English/Command_line.xml:417 English/Configuration.xml:212 +#: English/Command_line.xml:417 English/Configuration.xml:270 #: English/Quick_start.xml:22 msgid "WinMerge window" msgstr "WinMergeウィンドウ" @@ -854,7 +854,7 @@ msgstr "" "しました)" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Command_line.xml:226 English/Configuration.xml:633 +#: English/Command_line.xml:226 English/Configuration.xml:813 #: English/Filters.xml:4 English/Filters.xml:88 English/Filters.xml:92 #: English/Filters.xml:137 English/Filters.xml:187 English/Filters.xml:191 #: English/Filters.xml:532 English/Filters.xml:536 English/Filters.xml:639 @@ -970,7 +970,7 @@ msgstr "" "ジボックスを表示しません。" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Command_line.xml:295 English/Configuration.xml:214 +#: English/Command_line.xml:295 English/Configuration.xml:272 msgid "limiting instances" msgstr "インスタンス制限" @@ -1022,7 +1022,7 @@ msgstr "" "起動されるようにします。" #. type: Content of: <article><section><qandaset><qandaentry><question><para><indexterm><primary> -#: English/Command_line.xml:327 English/Configuration.xml:327 +#: English/Command_line.xml:327 English/Configuration.xml:423 #: English/Faq.xml:114 msgid "MRU list" msgstr "MRU リスト" @@ -1347,13 +1347,15 @@ msgstr "<option>/noninteractive</option>" #: English/Command_line.xml:592 English/Command_line.xml:599 #: English/Command_line.xml:606 English/Command_line.xml:620 #: English/Command_line.xml:703 English/Compare_files.xml:1476 -#: English/Compare_images.xml:117 English/Configuration.xml:1166 -#: English/Configuration.xml:1172 English/Configuration.xml:1178 -#: English/Configuration.xml:1186 English/Configuration.xml:1194 -#: English/Configuration.xml:1207 English/Configuration.xml:1212 -#: English/Configuration.xml:1217 English/Configuration.xml:1523 -#: English/Configuration.xml:1565 English/Configuration.xml:1606 -#: English/Configuration.xml:1983 English/Filters.xml:775 +#: English/Compare_images.xml:117 English/Configuration.xml:1525 +#: English/Configuration.xml:1533 English/Configuration.xml:1539 +#: English/Configuration.xml:1547 English/Configuration.xml:1555 +#: English/Configuration.xml:1570 English/Configuration.xml:1575 +#: English/Configuration.xml:1580 English/Configuration.xml:1596 +#: English/Configuration.xml:1604 English/Configuration.xml:1612 +#: English/Configuration.xml:1620 English/Configuration.xml:2046 +#: English/Configuration.xml:2100 English/Configuration.xml:2153 +#: English/Configuration.xml:2653 English/Filters.xml:775 #: English/Filters.xml:1206 English/Filters.xml:1211 English/Filters.xml:1222 msgid "TBD" msgstr "" @@ -1641,8 +1643,8 @@ msgstr "Hex形式比較" #. type: Content of: <article><section><title><indexterm><primary> #: English/Compare_bin.xml:8 English/Compare_files.xml:6 #: English/Compare_images.xml:8 English/Compare_table.xml:8 -#: English/Compare_webpages.xml:8 English/Configuration.xml:782 -#: English/Configuration.xml:872 English/Filters.xml:67 +#: English/Compare_webpages.xml:8 English/Configuration.xml:1007 +#: English/Configuration.xml:1121 English/Filters.xml:67 #: English/Intro_diffs.xml:12 English/Quick_start.xml:325 msgid "comparing files" msgstr "ファイルの比較" @@ -1685,7 +1687,7 @@ msgstr "" "較/バイナリページで指定してください。" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_dirs.xml:4 English/Configuration.xml:876 +#: English/Compare_dirs.xml:4 English/Configuration.xml:1125 #: English/Filters.xml:43 English/Quick_start.xml:239 msgid "comparing folders" msgstr "フォルダーの比較" @@ -2736,7 +2738,7 @@ msgstr "" "ピーコマンドと同じ動作をします。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_dirs.xml:614 English/Configuration.xml:1692 +#: English/Compare_dirs.xml:614 English/Configuration.xml:2268 msgid "deleting files" msgstr "ファイルの削除" @@ -3043,7 +3045,7 @@ msgstr "" "guimenuitem> </menuchoice>を選んでください。" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_dirs.xml:798 English/Configuration.xml:1631 +#: English/Compare_dirs.xml:798 English/Configuration.xml:2187 msgid "archiving files" msgstr "" @@ -3417,8 +3419,8 @@ msgid "unique folders" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><secondary> -#: English/Compare_dirs.xml:1050 English/Configuration.xml:836 -#: English/Configuration.xml:859 +#: English/Compare_dirs.xml:1050 English/Configuration.xml:1075 +#: English/Configuration.xml:1104 msgid "comparing" msgstr "" @@ -4166,7 +4168,7 @@ msgid "Copies just the source filename into the system clipboard." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_files.xml:134 English/Configuration.xml:1540 +#: English/Compare_files.xml:134 English/Configuration.xml:2066 msgid "difference colors" msgstr "" @@ -4247,7 +4249,7 @@ msgid "The last difference block includes two lines." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:194 English/Configuration.xml:436 +#: English/Compare_files.xml:194 English/Configuration.xml:536 msgid "ignored differences" msgstr "" @@ -4302,7 +4304,7 @@ msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:238 English/Compare_files.xml:917 -#: English/Configuration.xml:656 +#: English/Configuration.xml:841 msgid "moved differences" msgstr "" @@ -4432,7 +4434,7 @@ msgid "" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:338 English/Configuration.xml:1448 +#: English/Compare_files.xml:338 English/Configuration.xml:1954 msgid "line differences" msgstr "" @@ -4667,8 +4669,8 @@ msgid "" msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Compare_files.xml:520 English/Configuration.xml:1223 -#: English/Configuration.xml:1380 +#: English/Compare_files.xml:520 English/Configuration.xml:1663 +#: English/Configuration.xml:1864 msgid "editing" msgstr "" @@ -5284,7 +5286,7 @@ msgid "for File Compare window" msgstr "ファイル比較ウィンドウ" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Compare_files.xml:1007 English/Configuration.xml:1299 +#: English/Compare_files.xml:1007 English/Configuration.xml:1757 msgid "tabs" msgstr "" @@ -5870,7 +5872,7 @@ msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> #: English/Compare_files.xml:1491 English/Compare_files.xml:1776 -#: English/Configuration.xml:1387 +#: English/Configuration.xml:1873 msgid "rescanning files" msgstr "" @@ -7124,21 +7126,21 @@ msgstr "" "す。" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:4 English/Configuration.xml:1542 -#: English/Configuration.xml:1562 English/Configuration.xml:1589 -#: English/Configuration.xml:1603 English/Configuration.xml:1613 -#: English/Configuration.xml:1694 English/Configuration.xml:1873 +#: English/Configuration.xml:5 English/Configuration.xml:2068 +#: English/Configuration.xml:2096 English/Configuration.xml:2131 +#: English/Configuration.xml:2149 English/Configuration.xml:2161 +#: English/Configuration.xml:2270 English/Configuration.xml:2507 msgid "options" msgstr "オプション" #. type: Content of: <article><title> -#: English/Configuration.xml:3 +#: English/Configuration.xml:4 msgid "Options and configuration<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "オプションとコンフィグレーション<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><para> -#: English/Configuration.xml:7 +#: English/Configuration.xml:10 msgid "" "The Options dialog enables you to customize many WinMerge features. To set " "WinMerge options:" @@ -7147,19 +7149,19 @@ msgstr "" "WinMergeオプションを設定するには、" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject> -#: English/Configuration.xml:17 +#: English/Configuration.xml:22 msgid "" "<imageobject> <imagedata contentwidth=\"16\" fileref=\"screenshots/" "options_btn.png\" /> </imageobject>" msgstr "" #. type: Content of: <article><orderedlist><listitem><para><inlinemediaobject><textobject><phrase> -#: English/Configuration.xml:22 +#: English/Configuration.xml:27 msgid "WinMerge Options button" msgstr "" #. type: Content of: <article><orderedlist><listitem><para> -#: English/Configuration.xml:12 +#: English/Configuration.xml:17 msgid "" "Click <menuchoice> <guimenu>Edit</guimenu> <guimenuitem>Options</" "guimenuitem> </menuchoice> in the menu or the <placeholder " @@ -7172,7 +7174,7 @@ msgstr "" "リックしてください。" #. type: Content of: <article><orderedlist><listitem><para> -#: English/Configuration.xml:27 +#: English/Configuration.xml:34 msgid "" "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 " @@ -7183,7 +7185,7 @@ msgstr "" "トのタイトルをクリックすることで、ページを開くことができます。" #. type: Content of: <article><orderedlist><listitem><para> -#: English/Configuration.xml:34 +#: English/Configuration.xml:43 msgid "" "Configure the options you want to change using one or both of these methods:" msgstr "" @@ -7191,19 +7193,19 @@ msgstr "" "できます。" #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:39 +#: English/Configuration.xml:49 msgid "Directly in the options pages." msgstr "オプションページで直接編集" #. type: Content of: <article><orderedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:43 +#: English/Configuration.xml:54 msgid "" "Importing an options <filename>.ini</filename> file that you exported " "previously (see <xref linkend=\"Configuration_importexport\" /> for details)." msgstr "エクスポート済の<filename>.ini</filename>ファイルをインポート" #. type: Content of: <article><orderedlist><listitem><para> -#: English/Configuration.xml:51 +#: English/Configuration.xml:64 msgid "" "When you have set all your options, click <guibutton>OK</guibutton> to save " "them and dismiss the dialog." @@ -7212,7 +7214,7 @@ msgstr "" "らを保存し、ダイアログを閉じてください。" #. type: Content of: <article><para> -#: English/Configuration.xml:56 +#: English/Configuration.xml:71 msgid "" "This topic describes the options in detail. There is a section for each page " "in the Options dialog." @@ -7221,17 +7223,17 @@ msgstr "" "の、それぞれのページにはセクションがあります。" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:61 +#: English/Configuration.xml:78 msgid "importing options files" msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:63 +#: English/Configuration.xml:80 msgid "exporting options files" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:60 +#: English/Configuration.xml:77 msgid "" "Importing and Exporting options<placeholder type=\"indexterm\" id=\"0\"/" "><placeholder type=\"indexterm\" id=\"1\"/>" @@ -7240,7 +7242,7 @@ msgstr "" "><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:66 +#: English/Configuration.xml:85 msgid "" "If you change options frequently for different compare or merge scenarios, " "or if you want to share your settings with other WinMerge users, consider " @@ -7254,12 +7256,12 @@ msgstr "" "設定する代わりに、単に設定ファイルをインポートすることができます。" #. type: Content of: <article><section><variablelist><varlistentry><term> -#: English/Configuration.xml:74 +#: English/Configuration.xml:94 msgid "To import options" msgstr "インポートオプション" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:77 +#: English/Configuration.xml:98 msgid "" "When you want to reuse your saved options, click <guibutton>Import</" "guibutton>. In the Select file for import dialog, navigate to the saved " @@ -7270,17 +7272,17 @@ msgstr "" "イルを探して、 <guibutton>開く</guibutton>をクリックしてください。" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:82 +#: English/Configuration.xml:105 msgid "The values in your imported options file replace all existing settings." msgstr "インポートされた設定ファイルの値で、すべてのオプションを置き換えます。" #. type: Content of: <article><section><variablelist><varlistentry><term> -#: English/Configuration.xml:88 +#: English/Configuration.xml:112 msgid "To export options" msgstr "エクスポートオプション" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:91 +#: English/Configuration.xml:116 msgid "" "When you have set your options the way you want them, click " "<guibutton>Export</guibutton>. In the Select file for export dialog, specify " @@ -7293,7 +7295,7 @@ msgstr "" "guibutton>をクリックしてください。" #. type: Content of: <article><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:97 +#: English/Configuration.xml:124 msgid "" "In the generated text <filename>ini</filename> file, each line contains a " "name-value pair that defines a single option." @@ -7302,22 +7304,22 @@ msgstr "" "名前と値のペアを含みます。" #. type: Content of: <article><section><title> -#: English/Configuration.xml:105 +#: English/Configuration.xml:133 msgid "General page" msgstr "一般 ページ" #. type: Content of: <article><section><para> -#: English/Configuration.xml:107 +#: English/Configuration.xml:135 msgid "The General page has these options:" msgstr "一般ページには、いくつかのオプションがあります。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:111 +#: English/Configuration.xml:140 msgid "autoscrolling to first difference" msgstr "自動的に最初の差異にスクロールする" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:110 +#: English/Configuration.xml:139 msgid "" "Automatically scroll to first difference<placeholder type=\"indexterm\" " "id=\"0\"/>" @@ -7325,7 +7327,7 @@ msgstr "" "自動的に最初の差異にスクロールする<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:116 +#: English/Configuration.xml:147 msgid "" "<option>Disabled</option> (default): Compare window opens to the top of the " "folder or file, with no difference selected." @@ -7334,7 +7336,7 @@ msgstr "" "イルの先頭を表示し、差異を選択しません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:121 +#: English/Configuration.xml:154 msgid "" "<option>Enabled</option>: When it first opens, the Compare window selects " "the first difference, scrolling to the location if necessary." @@ -7343,45 +7345,50 @@ msgstr "" "ロールして)最初の差異を選択します。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:127 +#: English/Configuration.xml:162 msgid "For a folder compare, selects the first different file or folders." msgstr "" "フォルダー比較では、ファイル、または、フォルダーの最初の差異を選択します。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:132 +#: English/Configuration.xml:169 msgid "For a file compare, selects the first difference block in the files." msgstr "ファイル比較では、ファイル中の最初の差異ブロックを選択します。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:142 +#: English/Configuration.xml:181 msgid "autoscrolling to first inline difference" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:141 +#: English/Configuration.xml:180 msgid "" "Automatically scroll to first inline difference<placeholder " "type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:147 English/Configuration.xml:1029 -msgid "<option>Disabled</option> (default): TBD" +#: English/Configuration.xml:188 +msgid "" +"<option>Disabled</option> (default): When moving to a difference block, does " +"not automatically scroll to the first inline difference within the lines of " +"text." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:151 English/Configuration.xml:1033 -msgid "<option>Enabled</option>: TBD" +#: English/Configuration.xml:194 +msgid "" +"<option>Enabled</option>: When moving to a difference block, automatically " +"scrolls to the first inline difference within the lines of text." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:159 +#: English/Configuration.xml:203 msgid "closing windows using Esc key" msgstr "Escでウィンドウを閉じる" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:158 +#: English/Configuration.xml:202 msgid "" "Close Windows with '<keycap>Esc</keycap>'<placeholder type=\"indexterm\" " "id=\"0\"/>" @@ -7390,7 +7397,7 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:164 +#: English/Configuration.xml:210 msgid "" "<option>MDI child window or main window</option> (default): Lets you use the " "<keycap>Esc</keycap> key to close WinMerge windows. Pressing <keycap>Esc</" @@ -7406,7 +7413,7 @@ msgstr "" "ダー比較ウィンドウ、そして最後に、WinMergeウィンドウ)。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:171 +#: English/Configuration.xml:219 msgid "" "Note that in the WinMerge command line, the <parameter>-e</parameter> " "parameter enables you to close WinMerge by pressing <keycap>Esc</keycap> " @@ -7416,7 +7423,7 @@ msgstr "" "WinMergeを <keycap>Esc</keycap>1回で終了することを可能にします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:177 +#: English/Configuration.xml:227 msgid "" "<option>MDI child window only</option>: Pressing <keycap>Esc</keycap> closes " "a child window, but not the last remaining main window." @@ -7425,7 +7432,7 @@ msgstr "" "ンドウは閉じますが、最後に残ったメインウィンドウは閉じません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:182 +#: English/Configuration.xml:234 msgid "" "<option>Disabled</option>: Pressing <keycap>Esc</keycap> does not close any " "WinMerge windows." @@ -7434,12 +7441,12 @@ msgstr "" "せん。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:189 +#: English/Configuration.xml:242 msgid "Automatically verify paths in Open-dialog" msgstr "開くダイアログで自動的にパスを検査する" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:193 +#: English/Configuration.xml:247 msgid "" "<option>Enabled</option> (default): The Select Files or Folders dialog " "checks both or all three paths as you enter them. The <guibutton>Compare</" @@ -7452,7 +7459,7 @@ msgstr "" "のチェックは、ほんの少しだけ時間がかかることがあります。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:201 +#: English/Configuration.xml:257 msgid "" "<option>Disabled</option>: The <guibutton>Compare</guibutton> button in the " "Select Files or Folders dialog is always enabled, and attempts to open any " @@ -7466,14 +7473,12 @@ msgstr "" "かれなかった場合、 エラーダイアログが表示されます。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:211 -msgid "" -"Allow only one instance to run<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "" -"複数のインスタンスを起動しない<placeholder type=\"indexterm\" id=\"0\"/>" +#: English/Configuration.xml:269 +msgid "Single instance mode<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "単一インスタンスモード<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:219 +#: English/Configuration.xml:279 msgid "" "<option>Disabled</option> (default): You can run multiple WinMerge " "instances. For example, if WinMerge is currently running and you click the " @@ -7484,12 +7489,16 @@ msgstr "" "合、 新たなWinMergeウィンドウが開かれます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:226 -msgid "<option>Enabled</option>: Limits the WinMerge program to one instance:" -msgstr "<option>有効</option>: WinMergeの起動を一つに制限します。" +#: English/Configuration.xml:288 +msgid "" +"<option>Allow only one instance to run</option>: Limits the WinMerge program " +"to one instance:" +msgstr "" +"<option>1つのみインスタンスを起動する</option>: WinMergeの起動を一つに制限し" +"ます。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:231 +#: English/Configuration.xml:295 msgid "" "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." @@ -7498,7 +7507,7 @@ msgstr "" "ウィンドウは開かれず、 代わりに、現在のWinMergeウィンドウが使われます。" #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:237 +#: English/Configuration.xml:303 msgid "" "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." @@ -7506,13 +7515,25 @@ msgstr "" "(例えば、コマンドラインから)パスと共に新しいインスタンスを起動しようとした場" "合、 新たな比較ウィンドウが、既存のWinMergeウィンドウ中に開かれます。" +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:313 +msgid "" +"<option>Allow only one instance to run and wait for the instance to " +"terminate</option>: Similar to the \"Allow only one instance to run\" " +"option, this setting restricts WinMerge to a single application window. " +"However, it also ensures that the WinMerge process does not terminate until " +"the application window is closed. This is useful for situations where " +"external applications, like SourceTree, need to wait for WinMerge to finish " +"before they can safely delete temporary files." +msgstr "" + #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:247 +#: English/Configuration.xml:320 msgid "Ask when closing multiple windows" msgstr "複数のウィンドウを閉じるときに尋ねる" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:251 +#: English/Configuration.xml:325 msgid "" "<option>Disabled</option> (default): If you exit WinMerge while multiple " "Compare windows are open, WinMerge prompts you to confirm whether to close " @@ -7522,7 +7543,7 @@ msgstr "" "WinMergeを終了する場合、 WinMergeは、すべてのウィンドウを閉じるかを尋ねます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:257 +#: English/Configuration.xml:333 msgid "" "<option>Enabled</option>: If you click <guibutton>Exit</guibutton> and there " "are no pending file changes, WinMerge closes immediately." @@ -7531,25 +7552,25 @@ msgstr "" "ファイル変更が無い場合、 WinMergeは直ちに終了します。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:266 English/Configuration.xml:834 -#: English/Configuration.xml:907 +#: English/Configuration.xml:344 English/Configuration.xml:1073 +#: English/Configuration.xml:1168 msgid "timestamps" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:268 English/Configuration.xml:1258 +#: English/Configuration.xml:346 English/Configuration.xml:1706 msgid "preserving" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:265 +#: English/Configuration.xml:343 msgid "" "Preserve file time in file compare<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "ファイル比較時のファイル時刻を保つ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:273 +#: English/Configuration.xml:353 msgid "" "<option>Disabled</option> (default): If you save changes to a file in " "WinMerge, the timestamp of the file is updated." @@ -7558,7 +7579,7 @@ msgstr "" "ファイルのタイムスタンプが更新されます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:278 +#: English/Configuration.xml:360 msgid "" "<option>Enabled</option>: If you save changes to a file in WinMerge, the " "timestamp of the file is not changed in your file system." @@ -7567,18 +7588,18 @@ msgstr "" "ム上のファイルのタイムスタンプは更新されません。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:287 English/Configuration.xml:311 +#: English/Configuration.xml:371 English/Configuration.xml:401 #: English/Open_paths.xml:38 English/Quick_start.xml:75 msgid "Select Files or Folders dialog" msgstr "ファイルまたはフォルダーの選択ダイアログ" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:289 +#: English/Configuration.xml:373 msgid "opening automatically" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:286 +#: English/Configuration.xml:370 msgid "" "Show \"Select Files or Folders\" dialog on startup<placeholder " "type=\"indexterm\" id=\"0\"/>" @@ -7587,7 +7608,7 @@ msgstr "" "type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:294 +#: English/Configuration.xml:380 msgid "" "<option>Disabled</option> (default): The WinMerge window opens when you " "launch WinMerge. You must then click <menuchoice> <guimenu>File</guimenu> " @@ -7600,7 +7621,7 @@ msgstr "" "ればなりません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:303 +#: English/Configuration.xml:391 msgid "" "<option>Enabled</option>: The Select Files or Folders dialog opens along " "with the WinMerge window when you launch WinMerge." @@ -7609,7 +7630,7 @@ msgstr "" "ルまたはフォルダーの選択ダイアログが開きます。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:310 +#: English/Configuration.xml:400 msgid "" "Close \"Select Files or Folders\" dialog on clicking Compare " "button<placeholder type=\"indexterm\" id=\"0\"/>" @@ -7618,7 +7639,7 @@ msgstr "" "type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:316 +#: English/Configuration.xml:408 msgid "" "<option>Disabled</option> (default): When you click <guibutton>Compare</" "guibutton> button, the Select File or Folders dialog will remain open " @@ -7629,7 +7650,7 @@ msgstr "" "ます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:320 +#: English/Configuration.xml:414 msgid "" "<option>Enabled</option>: Clicking <guibutton>Compare</guibutton> button " "closes the Select Files or Folders dialog." @@ -7638,18 +7659,18 @@ msgstr "" "ファイルまたはフォルダーの選択ダイアログが閉じます。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:326 +#: English/Configuration.xml:422 msgid "Open-dialog Auto-Completion<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "開くダイアログのオートコンプリート<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:330 English/Configuration.xml:358 +#: English/Configuration.xml:427 English/Configuration.xml:463 msgid "Choose one of these options:" msgstr "次の中から一つ選択してください:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:334 +#: English/Configuration.xml:432 msgid "" "<guilabel>Disabled</guilabel> (default): No autocompletion is performed when " "you enter paths in the Select Files or Folders dialog." @@ -7658,7 +7679,7 @@ msgstr "" "グでパス入力した時、 オートコンプリートは実行されません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:340 +#: English/Configuration.xml:440 msgid "" "<guilabel>From file system</guilabel>: Checks paths as you type. It " "attempts to locate paths in the file system that match the letters you type, " @@ -7669,7 +7690,7 @@ msgstr "" "見つかった場合、パスを補完します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:346 +#: English/Configuration.xml:448 msgid "" "<guilabel>From Most Recent Used list</guilabel>: Checks paths only from the " "most recently used (MRU) list. This is handy when you have a limited set of " @@ -7679,23 +7700,23 @@ msgstr "" "調べます。 これは、比較用のパスが限定されている場合に便利です。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:355 +#: English/Configuration.xml:459 msgid "Auto-reload" msgstr "自動再読み込み" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:354 +#: English/Configuration.xml:458 msgid "Auto-reload modified files<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "変更されたファイルの自動再読み込み<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:362 +#: English/Configuration.xml:468 msgid "<guilabel>Disabled</guilabel> (default): Disables automatic reloading." msgstr "<guilabel>無効</guilabel> (default): 自動再読み込みを無効にします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:367 +#: English/Configuration.xml:474 msgid "" "<guilabel>Only on window activated</guilabel>: When the WinMerge window is " "activated, if the file has been modified, it will reload the file. However, " @@ -7710,7 +7731,7 @@ msgstr "" "をしない」をチェックし、 はいボタンを押下してください。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:375 +#: English/Configuration.xml:484 msgid "" "<guilabel>Immediately</guilabel>: Reloads the file immediately when it has " "been modified. However, a message box asking if you want to reload the file " @@ -7723,71 +7744,27 @@ msgstr "" "い」をチェックし、 はいボタンを押下してください。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:385 +#: English/Configuration.xml:496 msgid "Language" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:384 +#: English/Configuration.xml:495 msgid "Language<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "言語<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:388 +#: English/Configuration.xml:501 msgid "See <xref linkend=\"Locales_changing\" />." msgstr "" -#. type: Content of: <article><section><section><title> -#: English/Configuration.xml:393 -msgid "Reset" -msgstr "リセット" - -#. type: Content of: <article><section><section><para> -#: English/Configuration.xml:395 -msgid "" -"WinMerge allows you to suppress some common message boxes. For example, when " -"two identical files are opened, the message box titled, <guilabel>The files " -"are identical</guilabel>, 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." -msgstr "" -"WinMergeは、いくつかのメッセージボックスを抑制することを許可します。 例えば、" -"同一の2つのファイルが開かれた時、通常なら <guilabel>選択されたファイルは同一" -"です。</guilabel>メッセージボックスが, 開かれます。これ以上、このメッセージを" -"表示して欲しくない場合、 メッセージボックス中のオプションを有効(チェックON)に" -"することで、そのメッセージを再び表示しないようにすることができます。" - -#. type: Content of: <article><section><section><para> -#: English/Configuration.xml:401 -msgid "" -"Later, you might decide that you want to see those messages again. If so, " -"click the <guibutton>Reset</guibutton> button to make the message boxes " -"display again." -msgstr "" -"あとで、再びメッセージを見たいと思うかもしれません。 <guibutton>リセット</" -"guibutton>ボタンをクリックすることで、メッセージボックスを再び表示するように" -"できます。" - -#. type: Content of: <article><section><section><note><para> -#: English/Configuration.xml:406 -msgid "" -"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 <guibutton>Reset</guibutton> button." -msgstr "" -"WinMergeを新しいバージョンにアップデートした時は、メッセージを省略することは" -"オススメしません。 インストーラーは、それらを自動的に表示するようにします。し" -"かし、インストーラーを使用しない場合、 <guibutton>リセット</guibutton>ボタン" -"を使って、メッセージの表示を有効にすることを思い出してください。" - #. type: Content of: <article><section><title> -#: English/Configuration.xml:415 +#: English/Configuration.xml:508 msgid "Compare General page" msgstr "比較ページ" #. type: Content of: <article><section><para> -#: English/Configuration.xml:417 +#: English/Configuration.xml:511 msgid "" "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 " @@ -7798,7 +7775,7 @@ msgstr "" "です。" #. type: Content of: <article><section><important><para> -#: English/Configuration.xml:422 +#: English/Configuration.xml:518 msgid "" "Customizing difference detection can be useful during comparisons, when you " "might not be interested in some differences. However, these options also " @@ -7811,7 +7788,7 @@ msgstr "" "コード中のインデント変更は保存されません。" #. type: Content of: <article><section><important><para> -#: English/Configuration.xml:428 +#: English/Configuration.xml:526 msgid "" "For this reason, before you merge any differences, we strongly recommend " "resetting the options on this page to their default settings, especially the " @@ -7824,12 +7801,12 @@ msgstr "" "クリックしてください。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:435 +#: English/Configuration.xml:535 msgid "About ignore options<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "様々な無視オプションについて<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:439 +#: English/Configuration.xml:541 msgid "" "A number of options in the Compare page (described later in this section) " "enable you to ignore certain differences. Ignored differences are treated in " @@ -7840,22 +7817,22 @@ msgstr "" "な方法で扱われます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:445 +#: English/Configuration.xml:548 msgid "They are marked with the Ignored Difference color." msgstr "これらは、無視された差異の色でマークされます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:449 +#: English/Configuration.xml:552 msgid "Ignored differences cannot be merged." msgstr "無視された差異はマージできません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:453 +#: English/Configuration.xml:556 msgid "Ignored differences are not included in difference counts." msgstr "無視された差異は、差異の個数に含められません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:457 +#: English/Configuration.xml:561 msgid "" "Files containing only ignored differences are marked as identical in a " "folder comparison." @@ -7864,26 +7841,27 @@ msgstr "" "ルとしてマークされます。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:465 +#: English/Configuration.xml:571 msgid "whitespaces" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:467 English/Configuration.xml:551 -#: English/Configuration.xml:594 English/Configuration.xml:617 -#: English/Configuration.xml:909 English/Configuration.xml:942 -#: English/Configuration.xml:960 English/Configuration.xml:978 -#: English/Configuration.xml:1024 +#: English/Configuration.xml:573 English/Configuration.xml:683 +#: English/Configuration.xml:738 English/Configuration.xml:767 +#: English/Configuration.xml:791 English/Configuration.xml:1170 +#: English/Configuration.xml:1217 English/Configuration.xml:1253 +#: English/Configuration.xml:1277 English/Configuration.xml:1301 +#: English/Configuration.xml:1353 msgid "detecting and ignoring differences" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:464 +#: English/Configuration.xml:570 msgid "Whitespaces<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "空白<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:470 +#: English/Configuration.xml:578 msgid "" "Whitespace is the space between words and lines. It is represented in text " "files by special, nonprinting characters like spaces, tabs, and linefeeds. " @@ -7902,7 +7880,7 @@ msgstr "" "イトスペースを無視したいかもしれません。" #. type: Content of: <article><section><section><note><para> -#: English/Configuration.xml:480 +#: English/Configuration.xml:590 msgid "" "The effects of whitespace on changes within lines are visible only when " "<option>View line differences</option> is enabled. This is in contrast to " @@ -7913,60 +7891,60 @@ msgstr "" "にハイライトされます。" #. type: Content of: <article><section><section><example><title> -#: English/Configuration.xml:486 +#: English/Configuration.xml:597 msgid "Lines with different whitespace" msgstr "行と異なるホワイトスペース" #. type: Content of: <article><section><section><example><para><screen> -#: English/Configuration.xml:488 +#: English/Configuration.xml:600 #, no-wrap msgid "Two Words" msgstr "" #. type: Content of: <article><section><section><example><para> -#: English/Configuration.xml:488 +#: English/Configuration.xml:600 msgid "One space between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "単語間に一つのスペース:<placeholder type=\"screen\" id=\"0\"/>" #. type: Content of: <article><section><section><example><para><screen> -#: English/Configuration.xml:490 +#: English/Configuration.xml:604 #, no-wrap msgid "Two Words" msgstr "" #. type: Content of: <article><section><section><example><para> -#: English/Configuration.xml:490 +#: English/Configuration.xml:604 msgid "Two spaces between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "単語間に二つのスペース:<placeholder type=\"screen\" id=\"0\"/>" #. type: Content of: <article><section><section><example><para><screen> -#: English/Configuration.xml:492 +#: English/Configuration.xml:608 #, no-wrap msgid "Two\tWords" msgstr "" #. type: Content of: <article><section><section><example><para> -#: English/Configuration.xml:492 +#: English/Configuration.xml:608 msgid "Tab between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "単語間にタブ:<placeholder type=\"screen\" id=\"0\"/>" #. type: Content of: <article><section><section><example><para> -#: English/Configuration.xml:494 +#: English/Configuration.xml:612 msgid "No spaces between words:<placeholder type=\"screen\" id=\"0\"/>" msgstr "単語間にスペースなし:<placeholder type=\"screen\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:497 +#: English/Configuration.xml:617 msgid "You can control whitespace detection by choosing one of these options:" msgstr "これらのオプションの一つにより、ホワイトスペースの検出を制御できます:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:502 +#: English/Configuration.xml:623 msgid "Compare" msgstr "比較する" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:505 +#: English/Configuration.xml:627 msgid "" "All whitespace is compared (default). If you are not sure which option your " "document requires, this is probably the safest choice. In the example, all " @@ -7977,12 +7955,12 @@ msgstr "" "例では、すべての行が差異として検出されます。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:512 +#: English/Configuration.xml:635 msgid "Ignore change" msgstr "変更を無視する" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:515 +#: English/Configuration.xml:639 msgid "" "Compares differences in whitespace. In the example, the first three lines " "have different whitespace, but are detected as identical: tabs and multiple " @@ -7997,12 +7975,12 @@ msgstr "" "行の単語は異なります)" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:525 +#: English/Configuration.xml:650 msgid "Ignore all" msgstr "すべて無視する" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:528 +#: English/Configuration.xml:654 msgid "" "Ignores all whitespace characters, except linefeeds (so lines are detected " "and preserved in a merge). All lines in the example are detected as " @@ -8012,12 +7990,12 @@ msgstr "" "and preserved in a merge)。例のすべての行は、同一行として検出されます。" #. type: Content of: <article><section><section><note><title> -#: English/Configuration.xml:536 +#: English/Configuration.xml:663 msgid "Related topics" msgstr "関連するトピック" #. type: Content of: <article><section><section><note><para> -#: English/Configuration.xml:538 +#: English/Configuration.xml:666 msgid "" "The effects of whitespace settings on line differences is described in <xref " "linkend=\"CompareFiles_linediff-highlight\" />." @@ -8026,7 +8004,7 @@ msgstr "" "linkend=\"CompareFiles_linediff-highlight\" />で説明されています。" #. type: Content of: <article><section><section><note><para> -#: English/Configuration.xml:541 +#: English/Configuration.xml:671 msgid "" "The Options dialog Editor page contains related options that control how " "whitespace is used to detect breaks between words. See <xref " @@ -8037,17 +8015,17 @@ msgstr "" "は、 <xref linkend=\"Configuration_viewlinediffs\" />を参照してください" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:549 +#: English/Configuration.xml:681 msgid "blank lines" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:548 +#: English/Configuration.xml:680 msgid "Ignore blank lines<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "空行を無視する<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:556 +#: English/Configuration.xml:690 msgid "" "<option>Disabled</option> (default): Empty lines in the source files are " "detected and represented in the File Compare window as blank lines with the " @@ -8057,7 +8035,7 @@ msgstr "" "インドウ中で、 「差異あり: 削除」の色の空行で表されされます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:562 +#: English/Configuration.xml:698 msgid "" "<option>Enabled</option>: Empty lines in the source files are ignored. They " "are represented in the File Compare window as blank lines with the Ignored " @@ -8068,17 +8046,17 @@ msgstr "" "ら、差異はマージできません。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:572 +#: English/Configuration.xml:710 msgid "case (letter), detecting and ignoring differences" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:571 +#: English/Configuration.xml:709 msgid "Ignore case<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "大文字と小文字を区別しない<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:577 +#: English/Configuration.xml:717 msgid "" "<option>Disabled</option> (default): Comparisons are case-sensitive. For " "example, <literal>LowerCase</literal>, <literal>LOWERCASE</literal>, and " @@ -8089,20 +8067,20 @@ msgstr "" "<literal>lowercase</literal>はすべて異なります。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:584 +#: English/Configuration.xml:726 msgid "" "<option>Enabled</option>: Differences between lowercase and uppercase " "letters are ignored." msgstr "<option>有効</option>: 文字間の大文字、 小文字の差異は無視されます。" #. type: Content of: <article><section><section><title><indexterm><see> -#: English/Configuration.xml:592 English/Configuration.xml:1256 -#: English/Configuration.xml:1262 +#: English/Configuration.xml:736 English/Configuration.xml:1704 +#: English/Configuration.xml:1710 msgid "EOL" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:591 +#: English/Configuration.xml:735 msgid "" "Ignore carriage return differences (Windows/Unix/Mac)<placeholder " "type=\"indexterm\" id=\"0\"/>" @@ -8111,7 +8089,7 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:599 +#: English/Configuration.xml:745 msgid "" "<option>Disabled</option> (default): End of line (EOL) style differences are " "detected. For example, if you compare two lines that have the same contents " @@ -8125,22 +8103,42 @@ msgstr "" "す。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:608 +#: English/Configuration.xml:756 msgid "<option>Enabled</option>: EOL differences are ignored." msgstr "<option>有効</option>: EOLの差異は無視されます。" +#. type: Content of: <article><section><section><title><indexterm><primary> +#: English/Configuration.xml:765 +msgid "numbers" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:764 +msgid "Ignore numbers<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "数字を無視する<placeholder type=\"indexterm\" id=\"0\"/>" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:774 +msgid "<option>Disabled</option> (default): Numeric differences are detected." +msgstr "<option>無効</option>(デフォルト): 数字の差異を検出します。" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:780 +msgid "<option>Enabled</option>: Numeric differences are ignored." +msgstr "<option>有効</option>: 数字の差異は無視されます。" + #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:615 English/Configuration.xml:1871 +#: English/Configuration.xml:789 English/Configuration.xml:2505 msgid "codepage" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:614 +#: English/Configuration.xml:788 msgid "Ignore codepage differences<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "コードページの違いを無視する<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:622 +#: English/Configuration.xml:798 msgid "" "<option>Disabled</option> (default): File encoding differences are detected. " "Also, differences between the presence and absence of BOM are detected." @@ -8149,23 +8147,23 @@ msgstr "" "ます。 UTF-8 BOMの有無の違いも検出します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:626 +#: English/Configuration.xml:804 msgid "<option>Enabled</option>: File encoding differences are ignored." msgstr "" "<option>Enabled</option>:ファイルエンコーディングの違いは無視されます。" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:635 +#: English/Configuration.xml:815 msgid "comments" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:632 +#: English/Configuration.xml:812 msgid "Ignore comment differences<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "コメントの違いを無視する<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:642 +#: English/Configuration.xml:822 msgid "" "<option>Disabled</option> (default): WinMerge compares comments in code, " "along with other content." @@ -8174,23 +8172,26 @@ msgstr "" "コメントを比較します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:647 +#: English/Configuration.xml:829 msgid "" "<option>Enabled</option>: This option optimizes comparisons by detecting " "comments in certain programming language file types (such as C++ and Java), " -"and ignoring them." +"and ignoring them. The detection is based on syntax highlighting, so it has " +"no effect on file types that are not supported by WinMerge." msgstr "" "<option>有効</option>: このオプションは、(C++ や Java のような)プログラミング" -"言語のコメントを検出し、それらを無視することにより、 比較を最適化します。" +"言語のコメントを検出し、それらを無視することにより、 比較を最適化します。検出" +"は構文の強調表示に基づいているため、WinMerge でサポートされていないファイル " +"タイプには影響しません。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:655 +#: English/Configuration.xml:840 msgid "Enable moved block detection<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "移動ブロックの検出を有効にする<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:661 +#: English/Configuration.xml:848 msgid "" "<option>Disabled</option> (default): WinMerge does not detect when " "differences are due to moved lines." @@ -8199,11 +8200,11 @@ msgstr "" "ん。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:666 +#: English/Configuration.xml:855 msgid "" "<option>Enabled</option>: WinMerge tries to detect lines that are moved (in " "different locations in each file). Moved blocks are indicated by the " -"<guilabel>Moved</guilabel> and <guilabel>Selected Moved</guilabel> " +"<guilabel>Moved</guilabel> and <guilabel> Selected Moved </guilabel> " "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 " @@ -8217,7 +8218,7 @@ msgstr "" "より簡単に視覚化することができます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:674 +#: English/Configuration.xml:867 msgid "" "For an example, see the Location pane description in <xref " "linkend=\"Compare_files\" />." @@ -8226,17 +8227,17 @@ msgstr "" "ください。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:682 +#: English/Configuration.xml:877 msgid "similar lines, aligning" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:681 +#: English/Configuration.xml:876 msgid "Align similar lines<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "類似行をマッチさせる<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:687 +#: English/Configuration.xml:884 msgid "" "<option>Disabled</option> (default): Lines within difference blocks are " "shown as they occur in the source files." @@ -8245,7 +8246,7 @@ msgstr "" "as they occur in the source files." #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:692 +#: English/Configuration.xml:891 msgid "" "<option>Enabled</option>: WinMerge tries to detect lines within a difference " "blocks that are similar, and adds blank lines in the File panes to align " @@ -8258,7 +8259,7 @@ msgstr "" "は、それほど効果的ではありません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:697 +#: English/Configuration.xml:898 msgid "" "For an example, see the <citetitle>Similar lines</citetitle> description in " "<xref linkend=\"CompareFiles_diffcolors\" />." @@ -8267,22 +8268,22 @@ msgstr "" "<citetitle>Similar lines</citetitle>の説明を参照してください。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:705 +#: English/Configuration.xml:908 msgid "algorithm" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:704 +#: English/Configuration.xml:907 msgid "Diff algorithm<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "Diff アルゴリズム<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:710 +#: English/Configuration.xml:915 msgid "<option>default</option> (default): The basic greedy diff algorithm." msgstr "<option>default</option> (デフォルト): 基本的な差分アルゴリズムです。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:715 +#: English/Configuration.xml:922 msgid "" "<option>minimal</option>: Spend extra time to make sure the smallest " "possible diff is produced." @@ -8291,14 +8292,14 @@ msgstr "" "分、比較に時間がかかります。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:720 +#: English/Configuration.xml:929 msgid "" "<option>patience</option>: Use \"patience diff\" algorithm when generating " "diff." msgstr "<option>patience</option>: patienceアルゴリズムで差分を比較します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:725 +#: English/Configuration.xml:936 msgid "" "<option>histogram</option>: This algorithm extends the patience algorithm to " "\"support low-occurrence common elements\"." @@ -8308,7 +8309,7 @@ msgstr "" "ます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:730 +#: English/Configuration.xml:943 msgid "" "<option>none</option>: This algorithm does not detect insertions or " "deletions of lines." @@ -8316,18 +8317,18 @@ msgstr "" "<option>none</option>: このアルゴリズムは行の挿入や削除を検出しません。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:739 +#: English/Configuration.xml:953 msgid "indent heuristic" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:738 +#: English/Configuration.xml:952 msgid "Enable indent heuristic<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "indent heuristic を有効にする<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:744 +#: English/Configuration.xml:960 msgid "" "<option>Enabled</option> (default): Enable the heuristic that shifts diff " "hunk boundaries to make diffs easier to read. It has no effect if the Diff " @@ -8338,24 +8339,24 @@ msgstr "" "合、効果はありません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:750 +#: English/Configuration.xml:968 msgid "<option>Disabled</option>: Disable the heuristic." msgstr "<option>無効</option>: ヒューリスティックを無効にします。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:757 +#: English/Configuration.xml:977 msgid "unhighlight ignored differences" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:756 +#: English/Configuration.xml:976 msgid "" "Completely unhighlight the ignored differences<placeholder " "type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:762 +#: English/Configuration.xml:984 msgid "" "<option>Enabled</option>: Makes the color of the different lines ignored by " "line filters and substitution filters the same as the color of the identical " @@ -8363,7 +8364,7 @@ msgid "" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:769 +#: English/Configuration.xml:992 msgid "" "<option>Disabled</option> (default): Difference lines ignored by line " "filters and substitution filters are displayed in the color of Ignored " @@ -8371,22 +8372,22 @@ msgid "" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:778 +#: English/Configuration.xml:1002 msgid "Compare Folder page" msgstr "比較/フォルダーページ" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:784 +#: English/Configuration.xml:1009 msgid "detection options" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:781 +#: English/Configuration.xml:1006 msgid "Compare method<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "比較方法<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:787 +#: English/Configuration.xml:1014 msgid "" "This option lets you determine how complete your file comparisons are. " "Choose one of these five choices:" @@ -8395,12 +8396,12 @@ msgstr "" "肢から1つを選んでください。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:792 +#: English/Configuration.xml:1020 msgid "Full Contents" msgstr "フルコンテンツ" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:795 +#: English/Configuration.xml:1024 msgid "" "Default: Full comparison of files by content, with all the bells and " "whistles. This method invokes plugins and uses the diffutils engine for " @@ -8412,16 +8413,16 @@ msgstr "" "は、もっとも完璧でオススメの方法です。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:803 +#: English/Configuration.xml:1033 msgid "Quick Contents" msgstr "クイックコンテンツ" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:806 +#: English/Configuration.xml:1037 msgid "" "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 <guilabel>Full Contents</guilabel>, because it does " +"method is faster than <guilabel> Full Contents </guilabel>, because it does " "not load the files." msgstr "" "スリムダウンされた、ファイルの内容による比較です。この方法は、プラグインと移" @@ -8430,7 +8431,7 @@ msgstr "" "も高速です。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:811 +#: English/Configuration.xml:1046 msgid "" "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 " @@ -8441,12 +8442,12 @@ msgstr "" "異として検出します。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:818 +#: English/Configuration.xml:1054 msgid "Binary Contents" msgstr "バイナリコンテンツ" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:821 +#: English/Configuration.xml:1058 msgid "" "This method is faster than the Quick contents compare method. However, it " "does not apply any plugins, line filters, 'Ignore case' option, etc. First, " @@ -8465,12 +8466,12 @@ msgstr "" "されたファイルとの比較に適しています。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:833 +#: English/Configuration.xml:1072 msgid "Modified Date<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "更新日時<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:840 +#: English/Configuration.xml:1081 msgid "" "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 " @@ -8480,12 +8481,12 @@ msgstr "" "しかし、明らかに、それはただ更新日時と同じくらい正確です。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:847 +#: English/Configuration.xml:1089 msgid "Modified Date and Size" msgstr "更新日時とサイズ" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:850 +#: English/Configuration.xml:1093 msgid "" "Similar to <guilabel>Modified Date</guilabel>, but also checks file sizes " "when dates are identical." @@ -8494,17 +8495,17 @@ msgstr "" "ズもチェックします。" #. type: Content of: <article><section><section><variablelist><varlistentry><term><indexterm><primary> -#: English/Configuration.xml:857 +#: English/Configuration.xml:1102 msgid "file sizes" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:856 +#: English/Configuration.xml:1101 msgid "Size<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "サイズ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:863 +#: English/Configuration.xml:1110 msgid "" "Compares only file sizes, so it is fast but not as accurate as the contents " "methods." @@ -8513,12 +8514,12 @@ msgstr "" "す。" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:874 English/Configuration.xml:878 +#: English/Configuration.xml:1123 English/Configuration.xml:1127 msgid "stopping after first difference" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:871 +#: English/Configuration.xml:1120 msgid "" "Stop after first difference<placeholder type=\"indexterm\" id=\"0\"/" "><placeholder type=\"indexterm\" id=\"1\"/>" @@ -8527,16 +8528,16 @@ msgstr "" "><placeholder type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:881 +#: English/Configuration.xml:1132 msgid "" -"This option is enabled only when the <guilabel>Quick Contents</guilabel> " +"This option is enabled only when the <guilabel> Quick Contents </guilabel> " "compare method is selected." msgstr "" "このオプションは、比較方法に <guilabel>クイックコンテンツ</guilabel>が選択さ" "れた場合にのみ有効となります。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:886 +#: English/Configuration.xml:1141 msgid "" "<option>Disabled</option> (default): WinMerge examines all differences in " "the files." @@ -8545,7 +8546,7 @@ msgstr "" "査します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:891 +#: English/Configuration.xml:1148 msgid "" "<option>Enabled</option>: This option optimizes comparisons by examining " "files only until the first difference is found, instead always scanning the " @@ -8555,7 +8556,7 @@ msgstr "" "に、 最初の差異が見つかるまでファイルを検査することにより比較を最適化します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:895 +#: English/Configuration.xml:1154 msgid "" "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 " @@ -8571,14 +8572,14 @@ msgstr "" "確かでないなら、このオプションを有効にしないでください。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:906 +#: English/Configuration.xml:1167 msgid "" "Ignore time differences less than 3 seconds<placeholder type=\"indexterm\" " "id=\"0\"/>" msgstr "3秒以下の時間差を無視する<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:914 +#: English/Configuration.xml:1177 msgid "" "<option>Disabled</option> (default): Files with different timestamps are " "detected as different." @@ -8587,7 +8588,7 @@ msgstr "" "として検出されます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:919 +#: English/Configuration.xml:1184 msgid "" "<option>Enabled</option>: Sometimes (for example, when you use network " "shares) small differences in timestamps are not significant. To get more " @@ -8600,12 +8601,12 @@ msgstr "" "す。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:924 +#: English/Configuration.xml:1191 msgid "" -"This option works only with the <guimenuitem>Modified Date</guimenuitem> and " -"<guimenuitem>Modified Date and Size</guimenuitem> compare methods (described " -"in <xref linkend=\"Configuration_compmethod\" />). It has no effect with " -"other methods." +"This option works only with the <guimenuitem> Modified Date </guimenuitem> " +"and <guimenuitem> Modified Date and Size </guimenuitem> compare methods " +"(described in <xref linkend=\"Configuration_compmethod\" />). It has no " +"effect with other methods." msgstr "" "このオプションは、( <xref linkend=\"Configuration_compmethod\" />で説明されて" "いる)比較方法が、 <guimenuitem>更新日時</guimenuitem>か <guimenuitem>更新日時" @@ -8613,7 +8614,7 @@ msgstr "" "果はありません。" #. type: Content of: <article><section><section><itemizedlist><listitem><warning><para> -#: English/Configuration.xml:931 +#: English/Configuration.xml:1204 msgid "" "This option should be enabled only when the time difference is detected. " "Otherwise, it can cause incorrect compare results." @@ -8622,12 +8623,54 @@ msgstr "" "な比較結果の原因となります。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:940 +#: English/Configuration.xml:1215 English/Configuration.xml:1299 +msgid "expand subfolders" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:1214 English/Configuration.xml:1298 +msgid "" +"Automatically expand subfolders after comparison<placeholder " +"type=\"indexterm\" id=\"0\"/>" +msgstr "" +"比較後自動的にサブフォルダーを展開する<placeholder type=\"indexterm\" " +"id=\"0\"/>" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:1224 +msgid "" +"<option>Do not expand</option> (default): Subfolders remain collapsed after " +"comparison." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:1230 +msgid "" +"<option>Expand all subfolders</option>: All subfolders are expanded after " +"comparison." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:1236 +msgid "" +"<option>Expand different subfolders</option>: Only subfolders with " +"differences are expanded after comparison." +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:1242 +msgid "" +"<option>Expand identical subfolders</option>: Only subfolders without " +"differences are expanded after comparison." +msgstr "" + +#. type: Content of: <article><section><section><title><indexterm><primary> +#: English/Configuration.xml:1251 msgid "include unique subfolders" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:939 +#: English/Configuration.xml:1250 msgid "" "Include unique subfolders contents<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" @@ -8635,147 +8678,143 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:947 +#: English/Configuration.xml:1260 msgid "" "<option>Disabled</option> (default): WinMerge ignore unique subfolders when " "comparing folders." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:951 +#: English/Configuration.xml:1266 msgid "" "<option>Enabled</option>: WinMerge also shows the content from unique " "subfolders." msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:958 +#: English/Configuration.xml:1275 msgid "include subfolders" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:957 +#: English/Configuration.xml:1274 msgid "Include subfolders<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:965 +#: English/Configuration.xml:1284 msgid "" "<option>Enabled</option> (default): WinMerge doing a recursive comparing and " "also includes subfolders." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:969 +#: English/Configuration.xml:1290 msgid "" "<option>Disabled</option>: WinMerge only comparing the files in the root " "folder." msgstr "" -#. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:976 -msgid "expand subfolders" -msgstr "" - -#. type: Content of: <article><section><section><title> -#: English/Configuration.xml:975 -msgid "" -"Automatically expand subfolders after comparison<placeholder " -"type=\"indexterm\" id=\"0\"/>" -msgstr "" -"比較後自動的にサブフォルダーを展開する<placeholder type=\"indexterm\" " -"id=\"0\"/>" - #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:983 +#: English/Configuration.xml:1307 msgid "Do not expand" msgstr "展開しない" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:986 +#: English/Configuration.xml:1311 msgid "" "(default): WinMerge will not automatically expand subfolders after comparing " "folders." msgstr "(デフォルト): フォルダ比較後、自動的にサブフォルダを展開しません。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:992 +#: English/Configuration.xml:1317 msgid "Expand all subfolders" msgstr "すべてのサブフォルダーを展開" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:995 +#: English/Configuration.xml:1321 msgid "" "WinMerge will automatically expand all subfolders after comparing folders." msgstr "フォルダ比較後、自動的にすべてのサブフォルダを展開します。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1001 +#: English/Configuration.xml:1327 msgid "Expand different subfolders" msgstr "差異のあるサブフォルダーを展開" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:1004 +#: English/Configuration.xml:1331 msgid "" "WinMerge will automatically expand different subfolders after comparing " "folders." msgstr "フォルダ比較後、自動的に差異のあるサブフォルダを展開します。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1010 +#: English/Configuration.xml:1337 msgid "Expand identical subfolders" msgstr "同一のサブフォルダーを展開" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:1013 +#: English/Configuration.xml:1341 msgid "" "WinMerge will automatically expand identical subfolders after comparing " "folders." msgstr "フォルダ比較後、自動的に同一のサブフォルダを展開します。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1022 +#: English/Configuration.xml:1351 msgid "reparse points" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1021 +#: English/Configuration.xml:1350 msgid "Ignore reparse points<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "再解析ポイントを無視する<placeholder type=\"indexterm\" id=\"0\"/>" +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:1360 +msgid "<option>Disabled</option> (default): TBD" +msgstr "" + +#. type: Content of: <article><section><section><itemizedlist><listitem><para> +#: English/Configuration.xml:1366 +msgid "<option>Enabled</option>: TBD" +msgstr "" + #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1040 +#: English/Configuration.xml:1375 msgid "Quick compare" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1042 English/Configuration.xml:1067 +#: English/Configuration.xml:1377 English/Configuration.xml:1409 msgid "limit" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1039 +#: English/Configuration.xml:1374 msgid "" "Threshold for switching to quick compare (MB)<placeholder type=\"indexterm\" " "id=\"0\"/>" msgstr "クイック比較切替閾値 (MB)<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1047 +#: English/Configuration.xml:1384 msgid "" "<option>Disabled</option>: Is not active unless the Compare method is set to " "other than <guilabel>Full Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1052 +#: English/Configuration.xml:1391 msgid "" "<option>Enabled</option>: Is active when the Compare method is set to " "<guilabel>Full Contents</guilabel> compare method." msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1055 +#: English/Configuration.xml:1396 msgid "" "Threshold size for switching to <guilabel>Quick Contents</guilabel> compare " "method. When <guilabel>Full Contents</guilabel> compare method is selected, " @@ -8784,19 +8823,19 @@ msgid "" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1065 +#: English/Configuration.xml:1407 msgid "Binary compare" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1064 +#: English/Configuration.xml:1406 msgid "" "Threshold for switching to binary compare (MB)<placeholder " "type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1072 +#: English/Configuration.xml:1416 msgid "" "<option>Disabled</option>: Is not active unless the Compare method is set to " "other than <guilabel>Full Contents</guilabel> and <guilabel>Quick Contents</" @@ -8804,7 +8843,7 @@ msgid "" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1077 +#: English/Configuration.xml:1423 msgid "" "<option>Enabled</option>: Is active when the Compare method is set to " "<guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " @@ -8812,7 +8851,7 @@ msgid "" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1080 +#: English/Configuration.xml:1428 msgid "" "Threshold size for switching to Binary Contents compare method. When " "<guilabel>Full Contents</guilabel> or <guilabel>Quick Contents</guilabel> " @@ -8821,39 +8860,39 @@ msgid "" msgstr "" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1090 +#: English/Configuration.xml:1439 msgid "compare threads" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1089 -msgid "Number of compare threads<placeholder type=\"indexterm\" id=\"0\"/>" -msgstr "比較スレッドの数<placeholder type=\"indexterm\" id=\"0\"/>" +#: English/Configuration.xml:1438 +msgid "Number of CPU cores to use<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "使用するCPUコアの数<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1093 +#: English/Configuration.xml:1444 msgid "" "Number of threads which use to comparing. With a negative value WinMerge " "will use addition of the number of available CPU cores." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1101 +#: English/Configuration.xml:1454 msgid "table files" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1100 +#: English/Configuration.xml:1453 msgid "Compare Table page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "比較/テーブル ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1104 +#: English/Configuration.xml:1458 msgid "CSV File Patterns" msgstr "CSV ファイルとして扱うパターン" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1106 +#: English/Configuration.xml:1460 msgid "" "Specifies file name pattern for comma-separated values files to open in " "table format. To specify multiple items, separate them with a semicolon. " @@ -8866,12 +8905,12 @@ msgstr "" "は、*.csv を取り除いてください。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1113 +#: English/Configuration.xml:1467 msgid "TSV File Patterns" msgstr "TSV ファイルとして扱うパターン" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1115 +#: English/Configuration.xml:1469 msgid "" "Specifies file name pattern for tab-separated values files to open in table " "format. To specify multiple items, separate them with a semicolon. By " @@ -8884,12 +8923,12 @@ msgstr "" "*.tsv を取り除いてください。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1122 +#: English/Configuration.xml:1476 msgid "Custom Delimiter-Separated Values" msgstr "ユーザー指定文字区切り値" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1124 +#: English/Configuration.xml:1478 msgid "" "If you want to open text files, with values separated by characters other " "than commas or tabs, in tabular format, specify the file name pattern and " @@ -8900,12 +8939,12 @@ msgstr "" "す。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1130 +#: English/Configuration.xml:1484 msgid "Allow newlines in quotes" msgstr "引用符内の改行文字を値として扱う" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1133 +#: English/Configuration.xml:1488 msgid "" "<option>Enabled</option> (default): If there is a newline character between " "the quote character and the next quote character, the newline character is " @@ -8918,7 +8957,7 @@ msgstr "" "プションを有効にします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1140 +#: English/Configuration.xml:1497 msgid "" "<option>Disabled</option>: Disable the above. Disable this option when " "opening files with incorrect quotes." @@ -8927,12 +8966,12 @@ msgstr "" "く場合は、 このオプションを無効にしてください。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1149 +#: English/Configuration.xml:1506 msgid "Quote character" msgstr "引用符文字" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1151 +#: English/Configuration.xml:1508 msgid "" "Specifies the character that is treated as quotation marks. Delimiters " "within the text range enclosed by the characters specified here are treated " @@ -8946,98 +8985,188 @@ msgstr "" "ルに存在しない文字を指定してください。" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1161 +#: English/Configuration.xml:1518 msgid "Compare Binary page" msgstr "比較/バイナリ ページ" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1164 +#: English/Configuration.xml:1522 msgid "binary files" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1163 +#: English/Configuration.xml:1521 msgid "Binary File Patterns<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "バイナリファイルとして扱うパターン<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1170 +#: English/Configuration.xml:1530 msgid "frhed" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1169 +#: English/Configuration.xml:1529 msgid "Frhed settings<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1175 +#: English/Configuration.xml:1536 msgid "View Settings..." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1183 +#: English/Configuration.xml:1544 msgid "Binary Mode..." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1191 +#: English/Configuration.xml:1552 msgid "Character Set..." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1203 +#: English/Configuration.xml:1565 msgid "image files" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1202 +#: English/Configuration.xml:1564 msgid "Compare Image page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "比較/画像 ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1206 +#: English/Configuration.xml:1569 msgid "Image File Patterns" msgstr "画像ファイルとして扱うパターン" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1211 +#: English/Configuration.xml:1574 msgid "Enable image compare in folder compare" msgstr "フォルダー比較で画像比較を有効にする" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1216 +#: English/Configuration.xml:1579 msgid "OCR result" msgstr "OCRの結果" +#. type: Content of: <article><section><title><indexterm><primary> +#: English/Configuration.xml:1587 +msgid "webpages" +msgstr "" + +#. type: Content of: <article><section><title> +#: English/Configuration.xml:1586 +msgid "Compare Webpage page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "Webページ ページ<placeholder type=\"indexterm\" id=\"0\"/>" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:1593 +msgid "" +"URL pattern to include (Regular expression)<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:1601 +msgid "" +"URL pattern to exclude (Regular expression)<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:1609 +msgid "User data folder location<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:1617 +msgid "" +"Separate user data folders for each pane<placeholder type=\"indexterm\" " +"id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><title><indexterm><primary> +#: English/Configuration.xml:1628 +msgid "message boxes" +msgstr "" + +#. type: Content of: <article><section><title> +#: English/Configuration.xml:1627 +msgid "Message Boxes page<placeholder type=\"indexterm\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <article><section><section><title> +#: English/Configuration.xml:1633 +msgid "Reset" +msgstr "リセット" + +#. type: Content of: <article><section><section><para> +#: English/Configuration.xml:1636 +msgid "" +"WinMerge allows you to suppress some common message boxes. For example, when " +"two identical files are opened, the message box titled, <guilabel>The files " +"are identical</guilabel>, 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." +msgstr "" +"WinMergeは、いくつかのメッセージボックスを抑制することを許可します。 例えば、" +"同一の2つのファイルが開かれた時、通常なら <guilabel>選択されたファイルは同一" +"です。</guilabel>メッセージボックスが, 開かれます。これ以上、このメッセージを" +"表示して欲しくない場合、 メッセージボックス中のオプションを有効(チェックON)に" +"することで、そのメッセージを再び表示しないようにすることができます。" + +#. type: Content of: <article><section><section><para> +#: English/Configuration.xml:1644 +msgid "" +"Later, you might decide that you want to see those messages again. If so, " +"click the <guibutton>Reset</guibutton> button to make the message boxes " +"display again." +msgstr "" +"あとで、再びメッセージを見たいと思うかもしれません。 <guibutton>リセット</" +"guibutton>ボタンをクリックすることで、メッセージボックスを再び表示するように" +"できます。" + +#. type: Content of: <article><section><section><note><para> +#: English/Configuration.xml:1651 +msgid "" +"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 <guibutton>Reset</guibutton> button." +msgstr "" +"WinMergeを新しいバージョンにアップデートした時は、メッセージを省略することは" +"オススメしません。 インストーラーは、それらを自動的に表示するようにします。し" +"かし、インストーラーを使用しない場合、 <guibutton>リセット</guibutton>ボタン" +"を使って、メッセージの表示を有効にすることを思い出してください。" + #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:1225 English/Configuration.xml:1382 +#: English/Configuration.xml:1665 English/Configuration.xml:1866 msgid "options for File Compare window" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1222 +#: English/Configuration.xml:1662 msgid "Editor General page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "エディター一般ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1230 English/Configuration.xml:1570 +#: English/Configuration.xml:1672 English/Configuration.xml:2106 msgid "syntax highlighting" msgstr "シンタックスハイライト" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1232 +#: English/Configuration.xml:1674 msgid "enabling and disabling" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1229 +#: English/Configuration.xml:1671 msgid "Highlight syntax<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "シンタックスハイライト<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1237 +#: English/Configuration.xml:1681 msgid "" "<option>Enabled</option> (default): WinMerge can syntax highlight many " "programming language and web formats. To see the formats that are supported " @@ -9051,7 +9180,7 @@ msgstr "" "menuchoice>。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1247 +#: English/Configuration.xml:1693 msgid "" "<option>Disabled</option>: Syntax highlighting consumes some processing " "power, so if WinMerge screen updating seems to be slow, turning off this " @@ -9062,12 +9191,12 @@ msgstr "" "ん。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1260 +#: English/Configuration.xml:1708 msgid "end of line" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1255 +#: English/Configuration.xml:1703 msgid "" "Preserve original EOL chars<placeholder type=\"indexterm\" id=\"0\"/" "><placeholder type=\"indexterm\" id=\"1\"/>" @@ -9076,7 +9205,7 @@ msgstr "" "type=\"indexterm\" id=\"1\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1267 +#: English/Configuration.xml:1717 msgid "" "<option>Disabled</option> (default): Assumes that files are meant to be " "Windows files. If a file does not use the standard Windows line ending, " @@ -9092,7 +9221,7 @@ msgstr "" "スバーには、EOLスタイル <guilabel>Win</guilabel>として表示します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1274 +#: English/Configuration.xml:1726 msgid "" "For most situations you should leave this option disabled: the default " "behavior works even when comparing two files that have different line ending " @@ -9103,7 +9232,7 @@ msgstr "" "しょう。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1280 +#: English/Configuration.xml:1734 msgid "" "<option>Enabled</option>: Prevents WinMerge from automatically changing line " "endings, so that it detects different EOL styles for every line. This might " @@ -9116,7 +9245,7 @@ msgstr "" "ん。" #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> -#: English/Configuration.xml:1286 +#: English/Configuration.xml:1742 msgid "" "This is an advanced option for users who are familiar with EOL bytes and who " "want to compare files with different EOL styles inside <emphasis>one</" @@ -9131,22 +9260,22 @@ msgstr "" "るためには、 不要であることを憶えておいてください。" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1301 +#: English/Configuration.xml:1759 msgid "editing options" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1298 +#: English/Configuration.xml:1756 msgid "Tabs<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "タブ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1306 +#: English/Configuration.xml:1765 msgid "Tab size" msgstr "タブ幅" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:1309 +#: English/Configuration.xml:1769 msgid "" "Width of a tab space. Specify a value <replaceable>n</replaceable>: the " "resulting width is equivalent to that of <replaceable>n</replaceable> " @@ -9157,12 +9286,12 @@ msgstr "" "4。 最大値は64です。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1317 +#: English/Configuration.xml:1778 msgid "Tab insert options" msgstr "タブ挿入オプション" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><para> -#: English/Configuration.xml:1320 +#: English/Configuration.xml:1782 msgid "" "Determines what kind of character is used when you insert a tab in text. " "Only one of these options can be enabled:" @@ -9171,14 +9300,14 @@ msgstr "" "のうち、1つだけを有効にすることができます:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1325 +#: English/Configuration.xml:1789 msgid "" "<guilabel>Insert Tabs</guilabel> (default): Uses a single tab character." msgstr "" "<guilabel>タブを挿入</guilabel>(デフォルト):1つのタブ文字を使用します。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1330 +#: English/Configuration.xml:1796 msgid "" "<guilabel>Insert Spaces</guilabel>: Uses one or more spaces (determined by " "the <option>Tab size</option>) instead of a tab character. For example, with " @@ -9189,67 +9318,67 @@ msgstr "" "の場合、4つのスペースが挿入されます。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1343 +#: English/Configuration.xml:1811 msgid "rendering" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1342 +#: English/Configuration.xml:1810 msgid "Rendering Mode<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "レンダリングモード<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1348 +#: English/Configuration.xml:1818 msgid "<option>GDI</option> (default): TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1352 +#: English/Configuration.xml:1824 msgid "<option>DirectWrite Default</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1356 +#: English/Configuration.xml:1830 msgid "<option>DirectWrite Aliased</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1360 +#: English/Configuration.xml:1836 msgid "<option>DirectWrite GDI Classic</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1364 +#: English/Configuration.xml:1842 msgid "<option>DirectWrite GDI Natural</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1368 +#: English/Configuration.xml:1848 msgid "<option>DirectWrite Natural</option>: TBD" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1372 +#: English/Configuration.xml:1854 msgid "<option>DirectWrite Natural Symmetric</option>: TBD" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1379 +#: English/Configuration.xml:1863 msgid "Editor Compare/Merge page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "エディター 比較/マージページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1389 +#: English/Configuration.xml:1875 msgid "enabling and disabling autoscan" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1386 +#: English/Configuration.xml:1872 msgid "Automatic rescan<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "自動的に再スキャンする<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1394 +#: English/Configuration.xml:1882 msgid "" "<option>Disabled</option> (default): WinMerge rescans automatically when you " "merge a difference, or if you manually rescan (for example, click the " @@ -9260,7 +9389,7 @@ msgstr "" "キャンします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1400 +#: English/Configuration.xml:1890 msgid "" "<option>Enabled</option>: Forces WinMerge to rescan after every edit event " "(a change to files, like typing)." @@ -9269,7 +9398,7 @@ msgstr "" "イルへの変更)の後、強制的に再スキャンします。" #. type: Content of: <article><section><section><itemizedlist><listitem><note><para> -#: English/Configuration.xml:1404 +#: English/Configuration.xml:1896 msgid "" "To avoid slowing down your editing, WinMerge delays automatic rescanning a " "little: it waits one second after each edit event. Because each new edit " @@ -9281,19 +9410,19 @@ msgstr "" "ん。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1415 +#: English/Configuration.xml:1909 msgid "copy granularity" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1414 +#: English/Configuration.xml:1908 msgid "" "Copy granularity for selected differences<placeholder type=\"indexterm\" " "id=\"0\"/>" msgstr "選択された差異のコピー粒度<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1418 +#: English/Configuration.xml:1914 msgid "" "Specifies the copy granularity when copying to another pane by clicking the " "<guimenuitem>Copy to right</guimenuitem> menu item etc. with text selected." @@ -9302,21 +9431,21 @@ msgstr "" "等をクリックして別ペインにコピーするときのコピー粒度を指定します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1424 +#: English/Configuration.xml:1922 msgid "<option>Diff hunk</option>: Copies diff hunks within the selected text." msgstr "" "<option>差異ブロック</option> : 選択されたテキスト内の差異ブロックをコピーし" "ます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1429 +#: English/Configuration.xml:1929 msgid "" "<option>Inline diff</option>: Copies inline diffs within the selected text." msgstr "" "<option>行内差異</option>: 選択されたテキスト内の行内差異をコピーします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1434 +#: English/Configuration.xml:1936 msgid "" "<option>Line</option>: Copies the differences within the selected text line " "by line." @@ -9324,7 +9453,7 @@ msgstr "" "<option>行</option>: 選択されたテキスト内の差異を行単位でコピーします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1439 +#: English/Configuration.xml:1943 msgid "" "<option>Character</option> (default): Copies the differences within the " "selected text character by character." @@ -9333,31 +9462,31 @@ msgstr "" "ピーします。" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1450 +#: English/Configuration.xml:1956 msgid "viewing options" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1447 +#: English/Configuration.xml:1953 msgid "Line Difference Coloring<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "行内差異の強調<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1453 +#: English/Configuration.xml:1961 msgid "" -"These settings enable and configure the detection of <glossterm>line " -"differences</glossterm> (changes within the lines of difference blocks):" +"These settings enable and configure the detection of <glossterm> line " +"differences </glossterm> (changes within the lines of difference blocks):" msgstr "" "これらは、 <glossterm>行内差異</glossterm>(差異ブロックの行内の変更)の検出を" "有効にし、また、その設定をします。:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1459 +#: English/Configuration.xml:1970 msgid "View line differences" msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1464 +#: English/Configuration.xml:1976 msgid "" "<option>Enabled</option> (default): WinMerge highlights differences within " "lines. Also enables the <menuchoice> <guimenu>View</guimenu> " @@ -9368,12 +9497,12 @@ msgstr "" "示</guimenuitem> </menuchoice>でも有効にできます。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1471 +#: English/Configuration.xml:1984 msgid "Choose one of these suboptions:" msgstr "次のサブオプションから、1つ選択してください:" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1475 +#: English/Configuration.xml:1989 msgid "" "<guilabel>Character level</guilabel>: Highlights individual characters that " "are different. This option can be useful if you are looking for changes " @@ -9384,7 +9513,7 @@ msgstr "" "つでしょう。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1482 +#: English/Configuration.xml:1998 msgid "" "<guilabel>Word-level</guilabel> (default): Highlights entire words that are " "different." @@ -9393,7 +9522,7 @@ msgstr "" "す。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1487 +#: English/Configuration.xml:2005 msgid "" "<guilabel>Break at whitespace</guilabel> (default): Words are assumed to be " "separated by whitespace characters. This usually works for typical text " @@ -9403,7 +9532,7 @@ msgstr "" "仮定されます。 これは、大抵の典型的なテキストファイルに作用します。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1493 +#: English/Configuration.xml:2013 msgid "" "<guilabel>Break at whitespace or punctuation</guilabel>: Considers both " "whitespace and punctuation characters to be word breaks. This can useful for " @@ -9415,7 +9544,7 @@ msgstr "" "ために便利です。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:1505 +#: English/Configuration.xml:2027 msgid "" "<option>Disabled</option>: WinMerge does not highlight line differences, and " "all settings for the level and whitespace options are ignored. Also disables " @@ -9428,17 +9557,17 @@ msgstr "" "ます。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:1520 +#: English/Configuration.xml:2043 msgid "Word break characters" msgstr "" #. type: Content of: <article><section><section><note><title> -#: English/Configuration.xml:1529 +#: English/Configuration.xml:2052 msgid "Related topic" msgstr "関連トピック" #. type: Content of: <article><section><section><note><para> -#: English/Configuration.xml:1531 +#: English/Configuration.xml:2055 msgid "" "<xref linkend=\"CompareFiles_linediff-highlight\" /> explains in more detail " "how WinMerge detects and marks line differences." @@ -9447,12 +9576,12 @@ msgstr "" "どのように検出しマークするのかを、もっと詳細に説明します。" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1539 +#: English/Configuration.xml:2065 msgid "Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "色 ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1545 +#: English/Configuration.xml:2073 msgid "" "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." @@ -9461,7 +9590,7 @@ msgstr "" "で行ってください。 背景、削除、テキストを設定可能です。" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1549 English/Configuration.xml:1620 +#: English/Configuration.xml:2079 English/Configuration.xml:2172 msgid "" "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 " @@ -9472,35 +9601,35 @@ msgstr "" "と、新しい色がボックスに読み込まれます。" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1554 English/Configuration.xml:1581 -#: English/Configuration.xml:1625 +#: English/Configuration.xml:2086 English/Configuration.xml:2121 +#: English/Configuration.xml:2179 msgid "" "To revert to the default colors of a scheme, choose a different scheme and " "return to the modified scheme." msgstr "" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1560 +#: English/Configuration.xml:2094 msgid "differences colors" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1559 +#: English/Configuration.xml:2093 msgid "Differences Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:1572 +#: English/Configuration.xml:2108 msgid "color options" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1569 +#: English/Configuration.xml:2105 msgid "Syntax Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "色/シンタックス ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1575 +#: English/Configuration.xml:2113 msgid "" "By default, the WinMerge File Compare window marks the syntax of certain " "kinds of source code, as described in <xref " @@ -9514,17 +9643,17 @@ msgstr "" "ス要素を列挙し、これらのテキストの色と太さを変更可能にします。" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1587 +#: English/Configuration.xml:2129 msgid "text colors" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1586 +#: English/Configuration.xml:2128 msgid "Text Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "色/テキスト ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1592 +#: English/Configuration.xml:2136 msgid "" "Use this page to change the colors used for text. First, check the option, " "<guilabel>Use customized text colors</guilabel>. This activates the text " @@ -9539,27 +9668,27 @@ msgstr "" "択することができます。" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1601 +#: English/Configuration.xml:2147 msgid "marker colors" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1600 +#: English/Configuration.xml:2146 msgid "Marker Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "色/マーカー ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1611 +#: English/Configuration.xml:2159 msgid "folder compare colors" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1610 +#: English/Configuration.xml:2158 msgid "Folder Compare Colors page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "色/フォルダー比較 ページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1616 +#: English/Configuration.xml:2166 msgid "" "By default, the WinMerge Folder Compare window use background colors to show " "the status from a item (equal, different, not exists on all sides or " @@ -9567,41 +9696,41 @@ msgid "" msgstr "" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:1633 +#: English/Configuration.xml:2189 msgid "configuring support after installation" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1630 +#: English/Configuration.xml:2186 msgid "Archive Support page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "アーカイブサポートページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1636 +#: English/Configuration.xml:2194 msgid "This page contains options for configuring archive support using 7-Zip." msgstr "" "このページは、7-Zip を使用した Winzipアーカイブサポートの設定のためのオプショ" "ンを含んでいます。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1641 English/Open_paths.xml:60 +#: English/Configuration.xml:2201 English/Open_paths.xml:60 msgid "7-Zip archives" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1643 +#: English/Configuration.xml:2203 msgid "enabling and disabling integration" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1640 +#: English/Configuration.xml:2200 msgid "Enable archive file support<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" "アーカイブファイルサポートを有効にする<placeholder type=\"indexterm\" " "id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1646 +#: English/Configuration.xml:2208 msgid "" "This option controls how WinMerge handles archive files (based on 7-Zip " "integration)." @@ -9610,23 +9739,23 @@ msgstr "" "法を制御します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1651 +#: English/Configuration.xml:2215 msgid "<option>Enabled</option> (default): WinMerge recognizes 7-Zip archives." msgstr "" "<option>有効</option>(デフォルト): WinMerge は、7-Zipアーカイブを識別します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1656 +#: English/Configuration.xml:2222 msgid "<option>Disabled</option>: Turns off 7-Zip archive integration." msgstr "<option>無効</option>: 7-Zipアーカイブサポートを無効にします。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1664 +#: English/Configuration.xml:2232 msgid "detecting archive types" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1663 +#: English/Configuration.xml:2231 msgid "" "Detect archive type from file signature<placeholder type=\"indexterm\" " "id=\"0\"/>" @@ -9635,7 +9764,7 @@ msgstr "" "type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1669 +#: English/Configuration.xml:2239 msgid "" "<option>Disabled</option> (default): WinMerge recognizes only archives whose " "file extension is known on your system (for example, in the registry or " @@ -9646,7 +9775,7 @@ msgstr "" "in the registry or through a file association)" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1675 +#: English/Configuration.xml:2247 msgid "" "<option>Enabled</option>: WinMerge can recognize archive files even if their " "file extension is not known. To recognize an archive, WinMerge searches the " @@ -9657,7 +9786,7 @@ msgstr "" "WinMerge は、ファイルの先頭から、アーカイブシグネチャバイトを探します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para><tip><para> -#: English/Configuration.xml:1679 +#: English/Configuration.xml:2252 msgid "" "You can use this option to enable WinMerge to recognize Open Office files." msgstr "" @@ -9665,12 +9794,12 @@ msgstr "" "とができます。" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1688 +#: English/Configuration.xml:2263 msgid "System page" msgstr "システムページ" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1691 +#: English/Configuration.xml:2267 msgid "" "Send deleted files to Recycle Bin<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "" @@ -9678,7 +9807,7 @@ msgstr "" ">" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1699 +#: English/Configuration.xml:2277 msgid "" "<option>Enabled</option> (default): Files and folders that you delete in a " "Folder Compare window are moved to the Recycle Bin, if it is available." @@ -9687,7 +9816,7 @@ msgstr "" "やフォルダーは、 可能な場合、ゴミ箱へ移動されます。" #. type: Content of: <article><section><section><itemizedlist><listitem><important><para> -#: English/Configuration.xml:1704 +#: English/Configuration.xml:2284 msgid "" "Remember: if the Recycle Bin on your system has been deactivated, this " "option does not work, and deleted files are lost!" @@ -9696,7 +9825,7 @@ msgstr "" "とを、憶えておいてください。 その場合、ファイルは削除され失われます！" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1712 +#: English/Configuration.xml:2294 msgid "" "<option>Disabled</option>: Files and folders deleted in a directory compare " "actually deleted." @@ -9705,22 +9834,22 @@ msgstr "" "ダーは、 本当に削除されます。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1720 +#: English/Configuration.xml:2304 msgid "external editor" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1722 +#: English/Configuration.xml:2306 msgid "configuring" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1719 +#: English/Configuration.xml:2303 msgid "External editor<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "外部エディター<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1725 +#: English/Configuration.xml:2311 msgid "" "The WinMerge File Compare window provides common editing functions. If you " "prefer using your favorite, full-featured editor, you can configure WinMerge " @@ -9731,7 +9860,7 @@ msgstr "" "ニューから、WinMerge が外部エディターを開くように設定することができます。" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1730 +#: English/Configuration.xml:2318 msgid "" "Installation configures Notepad as the default external editor, because it " "is found on all Windows systems. To configure a different external editor, " @@ -9742,12 +9871,12 @@ msgstr "" "行ファイルのフルパスを入力してください。" #. type: Content of: <article><section><section><tip><para> -#: English/Configuration.xml:1735 +#: English/Configuration.xml:2325 msgid "" "Along with the path, you can include any command line parameters supported " -"by the external tool, in this format: <command><replaceable>path to " -"executable</replaceable></command> <option>-option1</option> <option>-" -"option2</option> <option><replaceable>...</replaceable></option>" +"by the external tool, in this format: <command> <replaceable>path to " +"executable</replaceable> </command> <option>-option1</option> <option>-" +"option2</option> <option> <replaceable>...</replaceable> </option>" msgstr "" "パスと一緒に、その外部ツールでサポートされている、いくらかのコマンドラインパ" "ラメーターを含むことができます。このようなフォーマットです。 " @@ -9756,7 +9885,7 @@ msgstr "" "replaceable></option>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1742 +#: English/Configuration.xml:2338 msgid "" "To use the configured external editor, right-click a file in the Folder " "Compare window and choose <menuchoice> <guimenuitem>Open Left</guimenuitem> " @@ -9771,22 +9900,22 @@ msgstr "" "guimenuitem> </menuchoice>を選択してください。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1756 English/Filters.xml:215 +#: English/Configuration.xml:2354 English/Filters.xml:215 msgid "Filters folders" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> -#: English/Configuration.xml:1758 +#: English/Configuration.xml:2356 msgid "specifying default private folder" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1755 +#: English/Configuration.xml:2353 msgid "Filter folder<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "フィルターフォルダー<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1761 +#: English/Configuration.xml:2361 msgid "" "Use this field to specify your own private folder for file filters. By " "default this folder is your user profile directory (for example, " @@ -9799,17 +9928,17 @@ msgstr "" "ルフィルターを作成したら、このフォルダーへ自動的に追加されます。" #. type: Content of: <article><section><section><title><indexterm><primary> -#: English/Configuration.xml:1769 +#: English/Configuration.xml:2371 msgid "temporary files, folder used" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1768 +#: English/Configuration.xml:2370 msgid "Temporary files folder<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "テンポラリファイルフォルダー<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1772 +#: English/Configuration.xml:2376 msgid "" "Specify the folder where WinMerge stores temporary files. Either one of " "these options is available:" @@ -9818,7 +9947,7 @@ msgstr "" "れか1つが有効です:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1777 +#: English/Configuration.xml:2383 msgid "" "<guilabel>System's temp folder</guilabel> (default): For example, this might " "be <filename>C:\\Windows\\Temp</filename> on your system." @@ -9827,7 +9956,7 @@ msgstr "" "<filename>C:\\Windows\\Temp</filename>かもしれません。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1782 +#: English/Configuration.xml:2390 msgid "" "<guilabel>Custom folder</guilabel>: Click <guibutton>Browse</guibutton> and " "select a different folder where you have write access." @@ -9836,29 +9965,29 @@ msgstr "" "フォルダーを選択してください。" #. type: Content of: <article><section><title><indexterm><primary> -#: English/Configuration.xml:1791 +#: English/Configuration.xml:2401 msgid "backup files, options" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1790 +#: English/Configuration.xml:2400 msgid "Backup Files page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "バックアップファイルページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1794 +#: English/Configuration.xml:2406 msgid "This page allows you to control how WinMerge creates backup files." msgstr "" "このページは、WinMerge がバックアップファイルを作る方法を制御することを可能に" "します。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1798 +#: English/Configuration.xml:2411 msgid "Create backup files in" msgstr "作成するバックアップ" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1800 +#: English/Configuration.xml:2414 msgid "" "Specify when WinMerge should create backup files. You can enable or disable " "each of these options independently:" @@ -9867,7 +9996,7 @@ msgstr "" "は、それぞれ独立に、有効、または、無効にすることができます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1805 +#: English/Configuration.xml:2421 msgid "" "<guilabel>Folder compare</guilabel> (disabled by default): Backup files are " "create whenever files are overwritten (copied)." @@ -9876,7 +10005,7 @@ msgstr "" "ピー)される度に、バックアップファイルが作成されます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1811 +#: English/Configuration.xml:2429 msgid "" "<guilabel>File compare</guilabel> (enabled by default): Backup files are " "created whenever files are saved." @@ -9885,12 +10014,12 @@ msgstr "" "に、バックアップファイルが作成されます。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1818 +#: English/Configuration.xml:2437 msgid "Create backup files into" msgstr "バックアップファイル生成先" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1820 +#: English/Configuration.xml:2440 msgid "" "Specify where backup files are created. Only one of these options can be " "enabled:" @@ -9899,7 +10028,7 @@ msgstr "" "にすることができます:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1825 +#: English/Configuration.xml:2447 msgid "" "<guilabel>Original file's folder</guilabel> (enabled by default): Backup " "files are created in the same folder as the source file. This is usually a " @@ -9912,7 +10041,7 @@ msgstr "" "だということです。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1832 +#: English/Configuration.xml:2456 msgid "" "<guilabel>Global backup folder</guilabel> (disabled by default): All backup " "files are created in one global folder. This makes them easy to clean up. " @@ -9926,12 +10055,12 @@ msgstr "" "書きします。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1842 +#: English/Configuration.xml:2467 msgid "Backup filename" msgstr "バックアップファイル名" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1844 +#: English/Configuration.xml:2470 msgid "" "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:" @@ -9940,7 +10069,7 @@ msgstr "" "次のうち、 一方か両方の拡張子構成を選ぶことができます:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1850 +#: English/Configuration.xml:2478 msgid "" "<guilabel>Append .bak extension</guilabel> (enabled by default): For " "example, the <filename>file.txt</filename> is backed up to <filename>file." @@ -9951,7 +10080,7 @@ msgstr "" "アップされます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1856 +#: English/Configuration.xml:2486 msgid "" "<guilabel>Append timestamp</guilabel> (enabled by default): Timestamps are " "almost always unique, so this option usually avoids duplicating backup file " @@ -9962,7 +10091,7 @@ msgstr "" "ルの重複を回避します。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1861 +#: English/Configuration.xml:2493 msgid "" "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 " @@ -9973,12 +10102,12 @@ msgstr "" "べきでしょう。" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1870 +#: English/Configuration.xml:2504 msgid "Codepage page<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "コードページページ<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><para> -#: English/Configuration.xml:1876 +#: English/Configuration.xml:2512 msgid "" "WinMerge detects handles file encoding transparently, and in most cases you " "should not need to change the default settings.This page allows you to " @@ -9989,7 +10118,7 @@ msgstr "" "るべきかどうかを指定します。" #. type: Content of: <article><section><note><para> -#: English/Configuration.xml:1881 +#: English/Configuration.xml:2519 msgid "" "A full explanation of text encoding and Windows codepages is beyond the " "scope of WinMerge documentation. Fortunately, there is lots of information " @@ -10001,28 +10130,28 @@ msgstr "" "す:" #. type: Content of: <article><section><note><itemizedlist><listitem><para> -#: English/Configuration.xml:1888 +#: English/Configuration.xml:2528 msgid "" -"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\">Wikipedia: Code " -"pages</ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" -"Character_encoding\">Character encoding</ulink>" +"<ulink url=\"https://en.wikipedia.org/wiki/Code_pages\"> Wikipedia: Code " +"pages </ulink>, <ulink url=\"https://en.wikipedia.org/wiki/" +"Character_encoding\"> Character encoding </ulink>" msgstr "" #. type: Content of: <article><section><note><itemizedlist><listitem><para> -#: English/Configuration.xml:1895 +#: English/Configuration.xml:2541 msgid "" "<ulink url=\"https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-" "ucoderef/28fefe92-d66c-4b03-90a9-97b473223d43\"> Microsoft: Code Pages " -"Supported by Windows</ulink>" +"Supported by Windows </ulink>" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1903 +#: English/Configuration.xml:2551 msgid "Default Codepage" msgstr "デフォルトコードページ" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1905 +#: English/Configuration.xml:2554 msgid "" "Choose one of these radio buttons to set the default codepage that WinMerge " "uses when handling ANSI files:" @@ -10031,7 +10160,7 @@ msgstr "" "めに、 次のラジオボタンから1つ選んでください:" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1910 +#: English/Configuration.xml:2561 msgid "" "<guilabel>System codepage</guilabel> (default):The codepage used by your " "Windows system. This default is usually the best choice. However if you " @@ -10045,7 +10174,7 @@ msgstr "" #. This is just a guess - don't find any info on this option. #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1917 +#: English/Configuration.xml:2570 msgid "" "<guilabel>According to WinMerge User Interface</guilabel>: The encoding used " "by your installation of WinMerge." @@ -10054,7 +10183,7 @@ msgstr "" "WinMerge のインストールに使用したエンコーディングです。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1922 +#: English/Configuration.xml:2577 msgid "" "<guilabel>Custom codepage</guilabel>: Enter the codepage number explicitly. " "For example, <userinput>UTF-8</userinput> or <userinput>ISO-8851-1</" @@ -10065,7 +10194,7 @@ msgstr "" "userinput>など。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1930 +#: English/Configuration.xml:2586 msgid "Detect codepage info for these files: .html, .rc, .xml" msgstr "html, .rc, .xml ファイルのコードページ情報を検出する" @@ -10073,7 +10202,7 @@ msgstr "html, .rc, .xml ファイルのコードページ情報を検出する" #. why is the option there? Also, should we mention WinMergeU.exe when we mention WinMerge.exe, #. or is this understood? #. type: Content of: <article><section><section><important><para> -#: English/Configuration.xml:1933 +#: English/Configuration.xml:2590 msgid "" "Uncheck this option in <filename>WinMerge.exe</filename>. Characters " "conversions can result in lossy conversions and the risk is very high. " @@ -10086,7 +10215,7 @@ msgstr "" "みを表示することができます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1943 +#: English/Configuration.xml:2602 msgid "" "<option>Disabled</option> (default): WinMerge does not read codepage " "information from the source files. It uses the default codepage setting " @@ -10097,7 +10226,7 @@ msgstr "" "ます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1949 +#: English/Configuration.xml:2610 msgid "" "<option>Enabled</option>: WinMerge detects the codepage for these " "extensions: <filename class=\"extension\">html</filename>, <filename " @@ -10112,7 +10241,7 @@ msgstr "" "ドページオプションの設定を上書きします。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1955 +#: English/Configuration.xml:2618 msgid "" "This option is of interest when your documents use a codepage that is " "different from the codepage of your Windows configuration." @@ -10121,7 +10250,7 @@ msgstr "" "を使用する場合に重要です。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1959 +#: English/Configuration.xml:2624 msgid "" "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 " @@ -10134,7 +10263,7 @@ msgstr "" "示されます。" #. type: Content of: <article><section><section><itemizedlist><listitem><para> -#: English/Configuration.xml:1964 +#: English/Configuration.xml:2631 msgid "" "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 " @@ -10145,7 +10274,7 @@ msgstr "" "オススメします。" #. type: Content of: <article><section><section><itemizedlist><listitem><caution><para> -#: English/Configuration.xml:1969 +#: English/Configuration.xml:2638 msgid "" "When you copy or paste text to an external application, the external " "application must use the same codepage as WinMerge does. Refer to the " @@ -10160,35 +10289,35 @@ msgstr "" "ムコードページをサポートしていない場合、 このオプションは無効にしてください。" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1981 +#: English/Configuration.xml:2651 msgid "Detect codepage for text files using mlang.dll" msgstr "" #. type: Content of: <article><section><title> -#: English/Configuration.xml:1989 +#: English/Configuration.xml:2659 msgid "Shell Integration page" msgstr "シェル統合ページ" #. type: Content of: <article><title><indexterm><primary> -#: English/Configuration.xml:1993 English/Faq.xml:95 English/Install.xml:175 +#: English/Configuration.xml:2664 English/Faq.xml:95 English/Install.xml:175 #: English/Install.xml:190 English/Install.xml:353 #: English/Version_control.xml:4 msgid "integration" msgstr "統合" #. type: Content of: <article><section><title><indexterm><secondary> -#: English/Configuration.xml:1995 English/Install.xml:192 +#: English/Configuration.xml:2666 English/Install.xml:192 #: English/Install.xml:355 msgid "with Windows shell" msgstr "" #. type: Content of: <article><section><section><title> -#: English/Configuration.xml:1992 +#: English/Configuration.xml:2663 msgid "Explorer<placeholder type=\"indexterm\" id=\"0\"/>" msgstr "エクスプローラー<placeholder type=\"indexterm\" id=\"0\"/>" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:1998 +#: English/Configuration.xml:2671 msgid "" "The <option>Add to context menu</option> option enables you to launch " "WinMerge directly from Windows Explorer, comparing items that you have " @@ -10202,12 +10331,12 @@ msgstr "" "きます:" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:2006 +#: English/Configuration.xml:2680 msgid "Enable advanced menu" msgstr "拡張メニューを有効にする" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:2011 +#: English/Configuration.xml:2686 msgid "" "<option>Disabled</option> (default): Only the <guimenuitem>WinMerge</" "guimenuitem> shortcut is included in the Windows Explorer context menu." @@ -10217,7 +10346,7 @@ msgstr "" "す。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:2017 +#: English/Configuration.xml:2694 msgid "" "<option>Enabled</option>: Replaces the <guimenuitem>WinMerge</guimenuitem> " "shortcut in the Explorer context menu with <guimenuitem>Compare</" @@ -10228,12 +10357,12 @@ msgstr "" "guimenuitem>ショートカットで置き換えます。" #. type: Content of: <article><section><section><variablelist><varlistentry><term> -#: English/Configuration.xml:2029 +#: English/Configuration.xml:2707 msgid "Enable Compare As menu" msgstr "「形式を指定して比較」メニューを有効にする" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:2034 +#: English/Configuration.xml:2713 msgid "" "<option>Disabled</option> (default): Removes <guimenuitem>Compare As</" "guimenuitem> menu item from Explorer context menu." @@ -10242,7 +10371,7 @@ msgstr "" "guimenuitem>メニューをエクスプローラーのコンテキストメニューから削除します。" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><itemizedlist><listitem><para> -#: English/Configuration.xml:2040 +#: English/Configuration.xml:2721 msgid "" "<option>Enabled</option>: Adds <guimenuitem>Compare As</guimenuitem> menu " "item to Explorer context menu." @@ -10251,7 +10380,7 @@ msgstr "" "をエクスプローラーのコンテキストメニューに追加します。" #. type: Content of: <article><section><section><para> -#: English/Configuration.xml:2049 +#: English/Configuration.xml:2732 msgid "" "<xref linkend=\"OpenPaths_shell-integ\" /> describes how to use the WinMerge " "and Compare shortcuts." @@ -20334,6 +20463,11 @@ msgstr "" "<guibutton>OK</guibutton>をクリックして、展開プラグインの選択ダイアログを閉じ" "てください。" +#~ msgid "" +#~ "Allow only one instance to run<placeholder type=\"indexterm\" id=\"0\"/>" +#~ msgstr "" +#~ "複数のインスタンスを起動しない<placeholder type=\"indexterm\" id=\"0\"/>" + #~ msgid "" #~ "Diff algorithm (Experimental)<placeholder type=\"indexterm\" id=\"0\"/>" #~ msgstr "Diff アルゴリズム<placeholder type=\"indexterm\" id=\"0\"/>"