msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2024-11-01 15:57+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" msgstr "" #. (itstool) path: info/title #: C/command-line.page:5 #: C/file-changes.page:5 #: C/file-filters.page:5 #: C/flattened-view.page:5 #: C/resolving-conflicts.page:5 #: C/text-filters.page:5 msgctxt "sort" msgid "2" msgstr "" #. (itstool) path: credit/name #: C/command-line.page:10 #: C/file-changes.page:10 #: C/file-filters.page:10 #: C/file-mode.page:11 #: C/flattened-view.page:10 #: C/folder-mode.page:10 #: C/index.page:12 #: C/introduction.page:10 #: C/missing-functionality.page:10 #: C/preferences.page:10 #: C/resolving-conflicts.page:10 #: C/text-filters.page:11 #: C/vc-mode.page:10 #: C/vc-supported.page:10 msgid "Kai Willadsen" msgstr "" #. (itstool) path: credit/years #: C/command-line.page:12 #: C/file-changes.page:12 #: C/file-filters.page:12 #: C/file-mode.page:13 #: C/flattened-view.page:12 #: C/folder-mode.page:12 #: C/index.page:14 #: C/introduction.page:12 #: C/missing-functionality.page:12 #: C/resolving-conflicts.page:12 #: C/text-filters.page:13 #: C/vc-mode.page:12 #: C/vc-supported.page:12 msgid "2012" msgstr "" #. (itstool) path: page/title #: C/command-line.page:15 msgid "Command line usage" msgstr "" #. (itstool) path: page/p #: C/command-line.page:17 msgid "If you start Meld from the command line, you can tell it what to do when it starts." msgstr "" #. (itstool) path: page/p #: C/command-line.page:20 msgid "For a two- or three-way file comparison, start Meld with meld file1 file2 or meld file1 file2 file3 respectively." msgstr "" #. (itstool) path: page/p #: C/command-line.page:26 msgid "For a two- or three-way directory comparison, start Meld with meld dir1 dir2 or meld dir1 dir2 dir3." msgstr "" #. (itstool) path: page/p #: C/command-line.page:31 msgid "You can start a version control comparison by just giving a single argument; if that file or directory is managed by a recognized version control system, it will start a version control comparison on that argument. For example, meld . would start a version control view of the current directory." msgstr "" #. (itstool) path: note/p #: C/command-line.page:40 msgid "Run meld --help for a list of all command line options." msgstr "" #. (itstool) path: page/title #: C/file-changes.page:16 msgid "Dealing with changes" msgstr "" #. (itstool) path: page/p #: C/file-changes.page:18 msgid "Meld deals with differences between files as a list of change blocks or more simply changes. Each change is a group of lines which correspond between files. Since these changes are what you're usually interested in, Meld gives you specific tools to navigate between these changes and to edit them. You can find these tools in the Changes menu." msgstr "" #. (itstool) path: section/title #: C/file-changes.page:30 msgid "Navigating between changes" msgstr "" #. (itstool) path: section/p #: C/file-changes.page:32 msgid "You can navigate between changes with the previous and next change buttons in the toolbar. You can also use your mouse's scroll wheel to move between changes, by scrolling on the central change bar." msgstr "" #. (itstool) path: section/title #: C/file-changes.page:43 msgid "Changing changes" msgstr "" #. (itstool) path: section/p #: C/file-changes.page:45 msgid "In addition to directly editing text files, Meld gives you tools to move, copy or delete individual differences between files. The bar between two files not only shows you what parts of the two files correspond, but also lets you selectively merge or delete differing changes by clicking the arrow or cross icons next to the start of each change." msgstr "" #. (itstool) path: section/p #: C/file-changes.page:49 msgid "The default action is replace. This action replaces the contents of the corresponding change with the current change." msgstr "" #. (itstool) path: section/p #: C/file-changes.page:56 msgid "Hold down the Shift key to change the current action to delete. This action deletes the current change." msgstr "" #. (itstool) path: section/p #: C/file-changes.page:59 msgid "Hold down the Ctrl key to change the current action to insert. This action inserts the current change above or below (as selected) the corresponding change." msgstr "" #. (itstool) path: page/title #: C/file-filters.page:15 msgid "Filtering out files" msgstr "" #. (itstool) path: page/p #: C/file-filters.page:17 msgid "When you compare folders, you may want to be able to ignore some files. For example, you may wish to only see files that are present and different in both folders, ignoring those that are the same or only exist in one folder. Alternatively, you might want to ignore all the files in your .git directory, or ignore all images." msgstr "" #. (itstool) path: page/p #: C/file-filters.page:25 msgid "Meld has several different ways of controlling which files and what kind of differences you see. You can filter based on differences between a file across folders or file and folder names. You can also tell Meld to treat filenames as being case insensitive. Finally, you can use text filters to change what both folder and file comparisons see." msgstr "" #. (itstool) path: note/p #: C/file-filters.page:37 msgid "Any text filters you've defined automatically apply when comparing folders. Files that are identical after all of the text filters are applied are not highlighted as being different, but are shown in italics." msgstr "" #. (itstool) path: section/title #: C/file-filters.page:48 msgid "File differences filtering" msgstr "" #. (itstool) path: section/p #: C/file-filters.page:50 msgid "In a folder comparison, each line contains a single file or folder that is present in at least one of the folders being compared. Each of these lines is classified as being either Modified, New or Same:" msgstr "" #. (itstool) path: item/title #. (itstool) path: td/p #: C/file-filters.page:58 #: C/folder-mode.page:144 #: C/vc-mode.page:105 msgid "Modified" msgstr "" #. (itstool) path: item/p #: C/file-filters.page:59 msgid "The file exists in multiple folders, but the files are different" msgstr "" #. (itstool) path: item/title #. (itstool) path: td/p #: C/file-filters.page:62 #: C/folder-mode.page:158 #: C/folder-mode.page:230 #: C/vc-mode.page:119 msgid "New" msgstr "" #. (itstool) path: item/p #: C/file-filters.page:63 msgid "The file exists in one folder but not in the others" msgstr "" #. (itstool) path: item/title #. (itstool) path: td/p #: C/file-filters.page:66 #: C/folder-mode.page:114 #: C/vc-mode.page:91 msgid "Same" msgstr "" #. (itstool) path: item/p #: C/file-filters.page:67 msgid "The file exists in all folders, and is the same everywhere" msgstr "" #. (itstool) path: section/p #: C/file-filters.page:70 msgid "You can change which types of differences you see in your current comparison by using the File Filters button on the toolbar." msgstr "" #. (itstool) path: note/p #: C/file-filters.page:77 msgid "Currently, you can only filter files based on their state; folders can't be filtered in this way. For example, you can't tell Meld to ignore all folders that contain only new files. A folder containing only \"New\" files would show up as empty, but still present." msgstr "" #. (itstool) path: section/title #: C/file-filters.page:91 msgid "Filename filtering" msgstr "" #. (itstool) path: section/p #: C/file-filters.page:93 msgid "Meld comes with a useful set of filename filters that let you ignore uninteresting files and folders like common backup files and the metadata folders of version control systems. Each filename filter can be separately activated or deactivated from the File Filters button on the toolbar." msgstr "" #. (itstool) path: section/p #: C/file-filters.page:101 msgid "You can add, remove or change filename filters from the File Filters section of the Preferences dialog. Filename filters specify patterns of filenames that will not be looked at when performing a folder comparison. Any file that matches an active filter won't even show up in the tree comparison. Filename filters match both files and folders; if a folder matches a filter, it and all of its contents are ignored." msgstr "" #. (itstool) path: section/p #: C/file-filters.page:111 msgid "Filename filters match according to shell glob patterns. For example, *.jpg will match all filenames ending in .jpg. The following table lists all of the shell glob characters that Meld recognises." msgstr "" #. (itstool) path: table/title #: C/file-filters.page:119 msgid "Shell glob patterns" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:123 msgid "Wildcard" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:123 msgid "Matches" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:129 msgid "*" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:130 msgid "anything (i.e., zero or more characters)" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:133 msgid "?" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:134 msgid "exactly one character" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:137 msgid "[abc]" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:138 msgid "any one of the listed characters" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:141 msgid "[!abc]" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:142 msgid "anything except one of the listed characters" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:145 msgid "{cat,dog}" msgstr "" #. (itstool) path: td/p #: C/file-filters.page:146 msgid "either \"cat\" or \"dog\"" msgstr "" #. (itstool) path: note/p #: C/file-filters.page:152 msgid "Changing a filter's Active setting in the Preferences dialog changes whether that filter is active by default." msgstr "" #. (itstool) path: note/p #: C/file-filters.page:158 msgid "Activating a filter from the menu or the toolbar turns the filter on or off for this comparison only." msgstr "" #. (itstool) path: section/title #: C/file-filters.page:169 msgid "Case insensitive filenames" msgstr "" #. (itstool) path: section/p #: C/file-filters.page:171 msgid "Files are compared across directories according to their name. This comparison is case sensitive by default; that is, the files README, readme and ReadMe would all be seen as different files." msgstr "" #. (itstool) path: section/p #: C/file-filters.page:178 msgid "When comparing folders on some filesystems (e.g., HFS+ or FAT) you may wish to make Meld treat filenames as case insensitive. You can do this by using the File Filters button on the toolbar and selecting Ignore Filename Case." msgstr "" #. (itstool) path: info/title #: C/file-mode.page:5 #: C/folder-mode.page:5 #: C/introduction.page:5 #: C/missing-functionality.page:5 #: C/preferences.page:5 msgctxt "sort" msgid "1" msgstr "" #. (itstool) path: page/title #: C/file-mode.page:17 msgid "Getting started comparing files" msgstr "" #. (itstool) path: page/p #: C/file-mode.page:19 msgid "Meld lets you compare two or three text files side-by-side. You can start a new file comparison using the new comparison button on the toolbar." msgstr "" #. (itstool) path: page/p #: C/file-mode.page:24 msgid "Once you've selected your files, Meld will show them side-by-side. Differences between the files will be highlighted to make individual changes easier to see. Editing the files will cause the comparison to update on-the-fly. For details on navigating between individual changes, and on how to use change-based editing, see ." msgstr "" #. (itstool) path: section/title #: C/file-mode.page:33 msgid "Meld's file comparisons" msgstr "" #. (itstool) path: section/p #: C/file-mode.page:35 msgid "There are several different parts to a file comparison. The most important parts are the editors where your files appear. In addition to these editors, the areas around and between your files give you a visual overview and actions to help you handle changes between the files." msgstr "" #. (itstool) path: section/p #: C/file-mode.page:41 msgid "On the right-hand side of the window, there are small vertical bars showing various colored blocks. These bars are designed to give you an overview of all of the differences between your files. Each colored block represents a section that is inserted, deleted, changed or in conflict between your files, depending on the block's color used." msgstr "" #. (itstool) path: section/p #: C/file-mode.page:48 msgid "In between each pair of files is a segment that shows how the changed sections between your files correspond to each other. You can click on the arrows in a segment to replace sections in one file with sections from the other. You can also delete, copy or merge changes. For details on what you can do with individual change segments, see ." msgstr "" #. (itstool) path: section/title #: C/file-mode.page:60 msgid "Saving your changes" msgstr "" #. (itstool) path: section/p #: C/file-mode.page:62 msgid "Once you've finished editing your files, you need to save each file you've changed." msgstr "" #. (itstool) path: section/p #: C/file-mode.page:66 msgid "You can tell whether your files have been saved since they last changed by the save icon that appears next to the file name above each file. Also, if you have multiple comparisons open, their notebook labels will show an asterisk (*) after any file that hasn't been saved." msgstr "" #. (itstool) path: section/p #: C/file-mode.page:73 msgid "You can save the current file by selecting the save button above the file being compared, or using the CtrlS keyboard shortcut." msgstr "" #. (itstool) path: note/p #: C/file-mode.page:79 msgid "Saving only saves the currently focused file, which is the file containing the cursor. If you can't tell which file is focused, you can click on the file to focus it before saving." msgstr "" #. (itstool) path: page/title #: C/flattened-view.page:15 msgid "Flattened view" msgstr "" #. (itstool) path: page/p #: C/flattened-view.page:17 msgid "When viewing large folders, you may be interested in only a few files among the thousands in the folder itself. For this reason, Meld includes a flattened view of a folder; only files that have not been filtered out (e.g., by ) are shown, and the folder hierarchy is stripped away, with file paths shown in the Location column." msgstr "" #. (itstool) path: page/p #: C/flattened-view.page:27 msgid "You can toggle the flattened view on or off using the Version Filters button on the toolbar and selecting Flatten Folders." msgstr "" #. (itstool) path: page/title #: C/folder-mode.page:16 msgid "Getting started comparing folders" msgstr "" #. (itstool) path: page/p #: C/folder-mode.page:18 msgid "Meld lets you compare two or three folders side-by-side. You can start a new folder comparison using the new comparison button on the toolbar, and clicking on the Directory Comparison tab." msgstr "" #. (itstool) path: page/p #: C/folder-mode.page:25 msgid "Your selected folders will be shown as side-by-side trees, with differences between files in each folder highlighted. You can copy or delete files from either folder, or compare individual text files in more detail." msgstr "" #. (itstool) path: section/title #: C/folder-mode.page:35 msgid "The folder comparison view" msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:37 msgid "The main parts of a folder comparison are the trees showing the folders you're comparing. You can easily move around these comparisons to find changes that you're interested in. When you select a file or folder, more detailed information is given in the status bar at the bottom of the window. Pressing Enter on a selected file, or double-clicking any file in the tree will open a side-by-side file comparison of the files in a new tab, but this will only work properly if they're text files!" msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:49 msgid "There are bars on the right-hand side of the window that show you a simple colored summary of the comparison results. Each file or folder in the comparison corresponds to a small section of these bars, though Meld doesn't show Same files so that it's easier to see any actually important differences. You can click anywhere on this bar to jump straight to that place in the comparison." msgstr "" #. (itstool) path: section/title #: C/folder-mode.page:62 msgid "Navigating folder comparisons" msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:64 msgid "You can jump between changed files (that is, any files/folders that are not classified as being identical) with the previous and next change buttons in the toolbar." msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:69 msgid "You can use the Left and Right arrow keys to move between the folders you're comparing. This is useful so that you can select an individual file for copying or deletion." msgstr "" #. (itstool) path: section/title #: C/folder-mode.page:79 msgid "States in folder comparisons" msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:81 msgid "Each file or folder in a tree has its own state, telling you how it differed from its corresponding files/folders. The possible states are:" msgstr "" #. (itstool) path: table/title #: C/folder-mode.page:102 msgid "Folder comparison states" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:106 #: C/vc-mode.page:83 msgid "State" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:107 #: C/folder-mode.page:223 #: C/vc-mode.page:84 msgid "Appearance" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:108 #: C/folder-mode.page:224 #: C/vc-mode.page:85 msgid "Meaning" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:116 #: C/vc-mode.page:93 msgid "Normal font" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:122 msgid "The file/folder is the same across all compared folders." msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:128 msgid "Same when filtered" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:130 msgid "Italics" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:136 msgid "These files are different across folders, but once text filters are applied, these files become identical." msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:146 msgid "Blue and bold" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:152 msgid "These files differ between the folders being compared." msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:160 #: C/vc-mode.page:121 msgid "Green and bold" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:166 msgid "This file/folder exists in this folder, but not in the others." msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:172 #: C/vc-mode.page:165 msgid "Missing" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:174 msgid "Grayed out text with a line through the middle" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:180 msgid "This file/folder doesn't exist in this folder, but does in one of the others." msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:187 #: C/vc-mode.page:210 msgid "Error" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:189 #: C/vc-mode.page:212 msgid "Bright red with a yellow background and bold" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:195 msgid "When comparing this file, an error occurred. The most common error causes are file permissions (i.e., Meld was not allowed to open the file) and filename encoding errors." msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:205 msgid "You can filter out files based on these states, for example, to show only files that have been Modified. You can read more about this in ." msgstr "" #. (itstool) path: section/p #: C/folder-mode.page:211 msgid "The icons in some rows have emblems added to them to show additional information. Note that these icons may change depending on your icon theme, so these descriptions are only a guide." msgstr "" #. (itstool) path: table/title #: C/folder-mode.page:218 msgid "Additional emblems" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:222 msgid "Emblem" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:231 msgid "Small blue dot" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:232 msgid "Used to indicate the \"newest\" (i.e., most recently modified) file in the row" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:236 msgid "Symbolic link" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:237 msgid "Arrow" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:238 msgid "Shows that the row item is a symbolic link" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:241 msgid "Selected" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:242 msgid "Tick mark" msgstr "" #. (itstool) path: td/p #: C/folder-mode.page:243 msgid "Shows that a file has been selected for a marked comparison, used to compare differently named files across folders" msgstr "" #. (itstool) path: info/title #: C/index.page:6 msgctxt "link:trail" msgid "Meld Help" msgstr "" #. (itstool) path: info/title #: C/index.page:7 msgctxt "link" msgid "Meld Help" msgstr "" #. (itstool) path: info/title #: C/index.page:8 msgctxt "text" msgid "Meld Help" msgstr "" #. (itstool) path: page/title #: C/index.page:18 msgid "<_:media-1/> Meld Help" msgstr "" #. (itstool) path: section/title #: C/index.page:24 msgid "Introduction" msgstr "" #. (itstool) path: section/title #: C/index.page:28 msgid "Comparing Files" msgstr "" #. (itstool) path: section/title #: C/index.page:32 msgid "Comparing Folders" msgstr "" #. (itstool) path: section/title #: C/index.page:36 msgid "Using Meld with Version Control" msgstr "" #. (itstool) path: section/title #: C/index.page:40 msgid "Advanced Usage" msgstr "" #. (itstool) path: page/title #: C/introduction.page:15 msgid "What is Meld?" msgstr "" #. (itstool) path: page/p #: C/introduction.page:16 msgid "Meld is a tool for comparing files and directories, and for resolving differences between them. It is also useful for comparing changes captured by version control systems." msgstr "" #. (itstool) path: page/p #: C/introduction.page:22 msgid "Meld shows differences between two or three files (or two or three directories) and allows you to move content between them, or edit the files manually. Meld's focus is on helping developers compare and merge source files, and get a visual overview of changes in their favorite version control system." msgstr "" #. (itstool) path: p/link #: C/legal.xml:4 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License" msgstr "" #. (itstool) path: license/p #: C/legal.xml:3 msgid "This work is licensed under a <_:link-1/>." msgstr "" #. (itstool) path: license/p #: C/legal.xml:6 msgid "As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction." msgstr "" #. (itstool) path: page/title #: C/missing-functionality.page:15 msgid "Things that Meld doesn't do" msgstr "" #. (itstool) path: page/p #: C/missing-functionality.page:17 msgid "Have you ever spent half an hour poking around an application trying to find out how to do something, thinking that surely there must be an option for this?" msgstr "" #. (itstool) path: page/p #: C/missing-functionality.page:23 msgid "This section lists a few of the common things that Meld doesn't do, either as a deliberate choice, or because we just haven't had time." msgstr "" #. (itstool) path: section/title #: C/missing-functionality.page:30 msgid "Aligning changes by adding lines" msgstr "" #. (itstool) path: section/p #: C/missing-functionality.page:31 msgid "When Meld shows differences between files, it shows both files as they would appear in a normal text editor. It does not insert additional lines so that the left and right sides of a particular change are the same size. There is no option to do this." msgstr "" #. (itstool) path: credit/years #: C/preferences.page:12 msgid "2013" msgstr "" #. (itstool) path: page/title #: C/preferences.page:15 msgid "Meld's preferences" msgstr "" #. (itstool) path: terms/title #: C/preferences.page:18 msgid "Editor preferences" msgstr "" #. (itstool) path: item/title #: C/preferences.page:20 msgid "Editor command" msgstr "" #. (itstool) path: item/p #: C/preferences.page:21 msgid "The name of the command to run to open text files in an external editor. This may be just the command (e.g., gedit) in which case the file to be opened will be passed as the last argument. Alternatively, you can add {file} and {line} elements to the command, in which case Meld will substitute the file path and current line number respectively (e.g., gedit {file}:{line})." msgstr "" #. (itstool) path: terms/title #: C/preferences.page:31 msgid "Folder Comparison preferences" msgstr "" #. (itstool) path: item/title #: C/preferences.page:33 msgid "Apply text filters during folder comparisons" msgstr "" #. (itstool) path: item/p #: C/preferences.page:34 msgid "When comparing files in folder comparison mode, text filters and other text manipulation options can be applied to the contents of files. If this option is enabled, all currently enabled text filters will be applied, the blank line trimming option will be applied as appropriate, and differences in line endings will be ignored." msgstr "" #. (itstool) path: item/p #: C/preferences.page:40 msgid "Enabling this option means that Meld must fully read all non-binary files into memory during the folder comparison. With large text files, this can be slow and may cause memory issues." msgstr "" #. (itstool) path: item/p #: C/preferences.page:44 msgid "This option only has an effect if \"Compare files based only on size and timestamp\" is not enabled." msgstr "" #. (itstool) path: page/title #: C/resolving-conflicts.page:15 msgid "Resolving merge conflicts" msgstr "" #. (itstool) path: page/p #: C/resolving-conflicts.page:17 msgid "One of the best uses of Meld is to resolve conflicts that occur while merging different branches." msgstr "" #. (itstool) path: page/p #: C/resolving-conflicts.page:22 msgid "For example, when using Git, git mergetool will start a 'merge helper'; Meld is one such helper. If you want to make git mergetool use Meld by default, you can add" msgstr "" #. (itstool) path: page/code #: C/resolving-conflicts.page:27 #, no-wrap msgid "" "\n" "[merge]\n" " tool = meld\n" "" msgstr "" #. (itstool) path: page/p #: C/resolving-conflicts.page:31 msgid "to .git/gitconfig. See the git mergetool manual for details." msgstr "" #. (itstool) path: page/title #: C/text-filters.page:17 msgid "Filtering out text" msgstr "" #. (itstool) path: page/p #: C/text-filters.page:19 msgid "When comparing several files, you may have sections of text where differences aren't really important. For example, you may want to focus on changed sections of code, and ignore any changes in comment lines. With text filters you can tell Meld to ignore text that matches a pattern (i.e., a regular expression) when showing differences between files." msgstr "" #. (itstool) path: note/p #: C/text-filters.page:28 msgid "Text filters don't just affect file comparisons, but also folder comparisons. Check the file filtering notes for more details." msgstr "" #. (itstool) path: section/title #: C/text-filters.page:37 msgid "Adding and using text filters" msgstr "" #. (itstool) path: section/p #: C/text-filters.page:39 msgid "You can turn text filters on or off from the the Text Filters tab in Preferences dialog. Meld comes with a few simple filters that you might find useful, but you can add your own as well." msgstr "" #. (itstool) path: section/p #: C/text-filters.page:45 msgid "In Meld, text filters are regular expressions that are matched against the text of files you're comparing. Any text that is matched is ignored during the comparison; you'll still see this text in the comparison view, but it won't be taken into account when finding differences. Text filters are applied in order, so it's possible for the first filter to remove text that now makes the second filter match, and so on." msgstr "" #. (itstool) path: note/p #: C/text-filters.page:55 msgid "If you're not familiar with regular expressions, you might want to check out the Python Regular Expression HOWTO." msgstr "" #. (itstool) path: section/title #: C/text-filters.page:67 msgid "Getting text filters right" msgstr "" #. (itstool) path: section/p #: C/text-filters.page:69 msgid "It's easy to get text filtering wrong, and Meld's support for filtering isn't complete. In particular, a text filter can't change the number of lines in a file. For example, if we had the built-in Script comment filter enabled, and compared the following files:" msgstr "" #. (itstool) path: listing/title #: C/text-filters.page:80 msgid "comment1.txt" msgstr "" #. (itstool) path: listing/code #: C/text-filters.page:81 #, no-wrap msgid "" "\n" "a\n" "b#comment\n" "c\n" "d" msgstr "" #. (itstool) path: listing/title #: C/text-filters.page:90 msgid "comment2.txt" msgstr "" #. (itstool) path: listing/code #: C/text-filters.page:91 #, no-wrap msgid "" "\n" "a\n" "b\n" "c\n" "#comment" msgstr "" #. (itstool) path: section/p #: C/text-filters.page:101 msgid "then the lines starting with b would be shown as identical (the comment is stripped out) but the d line would be shown as different to the comment line on the right. This happens because the #comment is removed from the right-hand side, but the line itself can not be removed; Meld will show the d line as being different to what it sees as a blank line on the other side." msgstr "" #. (itstool) path: section/title #: C/text-filters.page:114 msgid "Blank lines and filters" msgstr "" #. (itstool) path: section/p #: C/text-filters.page:116 msgid "The Ignore changes which insert or delete blank lines preference in the Text Filters tab requires special explanation. If this special filter is enabled, then any change consisting only of blank lines is completely ignored. This may occur because there was an actual whitespace change in the text, but it may also arise if your active text filters have removed all of the other content from a change, leaving only blank lines." msgstr "" #. (itstool) path: section/p #: C/text-filters.page:125 msgid "You can use this option to get around some of the problems and limitations resulting from filters not being able to remove whole lines, but it can also be useful in and of itself." msgstr "" #. (itstool) path: info/title #: C/vc-mode.page:5 msgctxt "sort" msgid "0" msgstr "" #. (itstool) path: page/title #: C/vc-mode.page:16 msgid "Viewing version-controlled files" msgstr "" #. (itstool) path: page/p #: C/vc-mode.page:18 msgid "Meld integrates with many version control systems to let you review local changes and perform simple version control tasks. You can start a new version control comparison using the new comparison button on the toolbar, and clicking on the Version Control tab." msgstr "" #. (itstool) path: section/title #: C/vc-mode.page:28 msgid "Version control comparisons" msgstr "" #. (itstool) path: section/p #: C/vc-mode.page:30 msgid "Version control comparisons show the differences between the contents of your folder and the current repository version. Each file in your local copy has a state that indicates how it differs from the repository copy." msgstr "" #. (itstool) path: section/p #: C/vc-mode.page:44 msgid "If you want to look at a particular file's differences, you can select it and press Enter, or double-click the file to start a file comparison. You can also interact with your version control system using the Changes menu." msgstr "" #. (itstool) path: section/title #. (itstool) path: table/title #: C/vc-mode.page:54 #: C/vc-mode.page:79 msgid "Version control states" msgstr "" #. (itstool) path: section/p #: C/vc-mode.page:56 msgid "Each file or folder in a version control comparison has a state, obtained from the version control system itself. Meld maps these different states into a standard set of very similar concepts. As such, Meld might use slightly different names for states than your version control system does. The possible states are:" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:99 msgid "The file/folder is the same as the repository version." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:107 msgid "Red and bold" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:113 msgid "This file is different to the repository version." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:127 msgid "This file/folder is new, and is scheduled to be added to the repository." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:134 msgid "Removed" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:136 msgid "Red bold text with a line through the middle" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:142 msgid "This file/folder existed, but is scheduled to be removed from the repository." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:149 msgid "Conflict" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:151 msgid "Bright red bold text" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:157 msgid "When trying to merge with the repository, the differences between the local file and the repository could not be resolved, and the file is now in conflict with the repository contents" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:167 msgid "Blue bold text with a line through the middle" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:173 msgid "This file/folder should be present, but isn't." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:179 msgid "Ignored" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:181 #: C/vc-mode.page:197 msgid "Grayed out text" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:187 msgid "This file/folder has been explicitly ignored (e.g., by an entry in .gitignore) and is not being tracked by version control." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:195 msgid "Unversioned" msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:203 msgid "This file is not in the version control system; it is only in the local copy." msgstr "" #. (itstool) path: td/p #: C/vc-mode.page:218 msgid "The version control system has reported a problem with this file." msgstr "" #. (itstool) path: section/title #: C/vc-mode.page:228 msgid "Version control state filtering" msgstr "" #. (itstool) path: section/p #: C/vc-mode.page:230 msgid "Most often, you will only want to see files that are identified as being in some way different; this is the default setting in Meld. You can change which file states you see by using the Version Filters button on the toolbar and selecting Flatten Folders and selecting the Modified, Normal, Unversioned and Ignored buttons on the toolbar." msgstr "" #. (itstool) path: info/title #: C/vc-supported.page:5 msgctxt "sort" msgid "3" msgstr "" #. (itstool) path: page/title #: C/vc-supported.page:15 msgid "Supported version control systems" msgstr "" #. (itstool) path: page/p #: C/vc-supported.page:17 msgid "Meld supports a wide range of version control systems:" msgstr "" #. (itstool) path: item/p #: C/vc-supported.page:22 msgid "Bazaar" msgstr "" #. (itstool) path: item/p #: C/vc-supported.page:23 msgid "Darcs" msgstr "" #. (itstool) path: item/p #: C/vc-supported.page:24 msgid "Git" msgstr "" #. (itstool) path: item/p #: C/vc-supported.page:25 msgid "Mercurial" msgstr "" #. (itstool) path: item/p #: C/vc-supported.page:26 msgid "SVN" msgstr "" #. (itstool) path: page/p #: C/vc-supported.page:29 msgid "Less common version control systems or unusual configurations may not be properly tested; please report any version control support bugs to the Meld issue tracker." msgstr ""