msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-10-27 07:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 <EMAIL>, 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/keyboard-shortcuts.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:8
#: C/introduction.page:10
#: C/keyboard-shortcuts.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:10
#: C/introduction.page:12
#: C/keyboard-shortcuts.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 <app>Meld</app> 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 <link xref=\"file-mode\">file comparison</link>, start <app>Meld</app> with <cmd>meld <var>file1</var> <var>file2</var></cmd> or <cmd>meld <var>file1</var> <var>file2</var> <var>file3</var></cmd> respectively."
msgstr ""

#. (itstool) path: page/p
#: C/command-line.page:26
msgid "For a two- or three-way <link xref=\"folder-mode\">directory comparison</link>, start <app>Meld</app> with <cmd>meld <var>dir1</var> <var>dir2</var></cmd> or <cmd>meld <var>dir1</var> <var>dir2</var> <var>dir3</var></cmd>."
msgstr ""

#. (itstool) path: page/p
#: C/command-line.page:31
msgid "You can start a <link xref=\"vc-mode\">version control</link> comparison by just giving a single argument; if that file or directory is managed by a <link xref=\"vc-supported\">recognized version control system</link>, it will start a version control comparison on that argument. For example, <cmd>meld .</cmd> would start a version control view of the current directory."
msgstr ""

#. (itstool) path: note/p
#: C/command-line.page:40
msgid "Run <cmd>meld --help</cmd> 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 "<app>Meld</app> deals with differences between files as a list of <em>change blocks</em> or more simply <em>changes</em>. Each change is a group of lines which correspond between files. Since these changes are what you're usually interested in, <app>Meld</app> gives you specific tools to navigate between these changes and to edit them. You can find these tools in the <gui style=\"menu\">Changes</gui> 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 <guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Previous change</gui></guiseq> and <guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Next change</gui></guiseq> menu items. 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:46
msgid "Changing changes"
msgstr ""

#. (itstool) path: section/p
#: C/file-changes.page:48
msgid "In addition to directly editing text files, <app>Meld</app> 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:52
msgid "The default action is <em>replace</em>. This action replaces the contents of the corresponding change with the current change."
msgstr ""

#. (itstool) path: section/p
#: C/file-changes.page:59
msgid "Hold down the <key>Shift</key> key to change the current action to <em>delete</em>. This action deletes the current change."
msgstr ""

#. (itstool) path: section/p
#: C/file-changes.page:62
msgid "Hold down the <key>Ctrl</key> key to change the current action to <em>insert</em>. 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 <file>.git</file> directory, or ignore all images."
msgstr ""

#. (itstool) path: page/p
#: C/file-filters.page:25
msgid "<app>Meld</app> has several different ways of controlling which files and what kind of differences you see. You can filter based on <link xref=\"#file-state-filter\">differences between a file across folders</link> or <link xref=\"#file-name-filter\">file and folder names</link>. You can also tell <app>Meld</app> to treat filenames as being <link xref=\"#file-case-filter\">case insensitive</link>. Finally, you can use <link xref=\"text-filters\">text filters</link> to change what both folder and file comparisons see."
msgstr ""

#. (itstool) path: note/p
#: C/file-filters.page:37
msgid "Any <link xref=\"text-filters\">text filters</link> you've defined <em>automatically apply</em> 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 <em>Modified</em>, <em>New</em> or <em>Same</em>:"
msgstr ""

#. (itstool) path: item/title
#. (itstool) path: td/p
#: C/file-filters.page:58
#: C/folder-mode.page:148
#: C/vc-mode.page:107
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:162
#: C/vc-mode.page:121
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:118
#: C/vc-mode.page:93
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 <gui style=\"button\">Same</gui>, <gui style=\"button\">New</gui> and <gui style=\"button\">Modified</gui> buttons on the toolbar or the <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">File Status</gui></guiseq> menu."
msgstr ""

#. (itstool) path: note/p
#: C/file-filters.page:80
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 <app>Meld</app> 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:94
msgid "Filename filtering"
msgstr ""

#. (itstool) path: section/p
#: C/file-filters.page:96
msgid "<app>Meld</app> 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 <gui style=\"button\">Filters</gui> button on the toolbar or the <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">File Filters</gui></guiseq> menu."
msgstr ""

#. (itstool) path: section/p
#: C/file-filters.page:106
msgid "You can add, remove or change filename filters from the <gui style=\"tab\">File Filters</gui> section of the <gui>Preferences</gui> dialog. Filename filters specify patterns of filenames that will <em>not</em> 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:116
msgid "Filename filters match according to shell glob patterns. For example, <code>*.jpg</code> will match all filenames ending in <code>.jpg</code>. The following table lists all of the shell glob characters that <app>Meld</app> recognises."
msgstr ""

#. (itstool) path: table/title
#: C/file-filters.page:124
msgid "Shell glob patterns"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:128
msgid "Wildcard"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:128
msgid "Matches"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:134
msgid "<code>*</code>"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:135
msgid "anything (i.e., zero or more characters)"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:138
msgid "<code>?</code>"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:139
msgid "exactly one character"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:142
msgid "<code>[abc]</code>"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:143
msgid "any one of the listed characters"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:146
msgid "<code>[!abc]</code>"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:147
msgid "anything <em>except</em> one of the listed characters"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:150
msgid "<code>{cat,dog}</code>"
msgstr ""

#. (itstool) path: td/p
#: C/file-filters.page:151
msgid "either \"cat\" or \"dog\""
msgstr ""

#. (itstool) path: note/p
#: C/file-filters.page:157
msgid "Changing a filter's <gui>Active</gui> setting in the <gui>Preferences</gui> dialog changes whether that filter is active <em>by default</em>."
msgstr ""

#. (itstool) path: note/p
#: C/file-filters.page:163
msgid "Activating a filter from the menu or the toolbar turns the filter on or off for <em>this comparison only</em>."
msgstr ""

#. (itstool) path: section/title
#: C/file-filters.page:174
msgid "Case insensitive filenames"
msgstr ""

#. (itstool) path: section/p
#: C/file-filters.page:176
msgid "Files are compared across directories according to their name. This comparison is case sensitive by default; that is, the files <file>README</file>, <file>readme</file> and <file>ReadMe</file> would all be seen as different files."
msgstr ""

#. (itstool) path: section/p
#: C/file-filters.page:183
msgid "When comparing folders on some filesystems (e.g., HFS+ or FAT) you may wish to make <app>Meld</app> treat filenames as case insensitive. You can do this by selecting <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">Ignore filename case</gui></guiseq> from the menus."
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 "<app>Meld</app> lets you compare two or three text files side-by-side. You can start a new file comparison by selecting the <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item."
msgstr ""

#. (itstool) path: page/p
#: C/file-mode.page:26
msgid "Once you've selected your files, <app>Meld</app> 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 <link xref=\"file-changes\"/>."
msgstr ""

#. (itstool) path: section/title
#: C/file-mode.page:35
msgid "<app>Meld</app>'s file comparisons"
msgstr ""

#. (itstool) path: section/p
#: C/file-mode.page:37
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:43
msgid "On the left and right-hand sides of the window, there are two small vertical bars showing various coloured blocks. These bars are designed to give you an overview of all of the differences between your two files. Each coloured block represents a section that is inserted, deleted, changed or in conflict between your files, depending on the block's colour used."
msgstr ""

#. (itstool) path: section/p
#: C/file-mode.page:50
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 <link xref=\"file-changes#change-actions\"/>."
msgstr ""

#. (itstool) path: section/title
#: C/file-mode.page:62
msgid "Saving your changes"
msgstr ""

#. (itstool) path: section/p
#: C/file-mode.page:64
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:68
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, the notebook label will show an asterisk (<code>*</code>) after any file that hasn't been saved."
msgstr ""

#. (itstool) path: section/p
#: C/file-mode.page:74
msgid "You can save the current file by selecting the <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">Save</gui></guiseq> menu item, or using the <keyseq><key>Ctrl</key><key>S</key></keyseq> keyboard shortcut."
msgstr ""

#. (itstool) path: note/p
#: C/file-mode.page:81
msgid "Saving only saves the <em>currently focused</em> 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, <app>Meld</app> includes a <em>flattened view</em> of a folder; only files that have not been filtered out (e.g., by <link xref=\"vc-mode#vc-state-filtering\"/>) are shown, and the folder hierarchy is stripped away, with file paths shown in the <em>Location</em> column."
msgstr ""

#. (itstool) path: page/p
#: C/flattened-view.page:27
msgid "You can turn this flattened view on or off by unchecking the <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">Flatten</gui></guiseq> menu item, or by clicking the corresponding <gui style=\"button\">Flatten</gui> button on the toolbar."
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 "<app>Meld</app> lets you compare two or three folders side-by-side. You can start a new folder comparison by selecting the <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item, and clicking on the <gui style=\"tab\">Directory Comparison</gui> tab."
msgstr ""

#. (itstool) path: page/p
#: C/folder-mode.page:26
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:36
msgid "The folder comparison view"
msgstr ""

#. (itstool) path: section/p
#: C/folder-mode.page:38
msgid "The main parts of a folder comparison are the trees showing the folders you're comparing. You can easily <link xref=\"#folder-navigation\">move around</link> 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 <key>Enter</key> on a selected file, or double-clicking any file in the tree will open a side-by-side <link xref=\"file-mode\">file comparison</link> 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:50
msgid "There are bars on the left and right-hand sides of the window that show you a simple coloured summary of the comparison results. Each file or folder in the comparison corresponds to a small section of these bars, though <app>Meld</app> doesn't show <em>Same</em> 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:63
msgid "Navigating folder comparisons"
msgstr ""

#. (itstool) path: section/p
#: C/folder-mode.page:65
msgid "You can jump between changed files (that is, any files/folders that are <em>not</em> classified as being identical) with the <guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Previous change</gui></guiseq> and <guiseq><gui style=\"menu\">Changes</gui><gui style=\"menuitem\">Next change</gui></guiseq> menu items, or using the corresponding buttons on the toolbar."
msgstr ""

#. (itstool) path: section/p
#: C/folder-mode.page:73
msgid "You can use the <key>Left</key> and <key>Right</key> 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:83
msgid "States in folder comparisons"
msgstr ""

#. (itstool) path: section/p
#: C/folder-mode.page:85
msgid "Each file or folder in a tree has its own <em>state</em>, telling you how it differed from its corresponding files/folders. The possible states are:"
msgstr ""

#. (itstool) path: table/title
#: C/folder-mode.page:106
msgid "Folder comparison states"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:110
#: C/vc-mode.page:85
msgid "State"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:111
#: C/vc-mode.page:86
msgid "Appearance"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:112
#: C/vc-mode.page:87
msgid "Meaning"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:120
#: C/vc-mode.page:95
msgid "Normal font"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:126
msgid "The file/folder is the same across all compared folders."
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:132
msgid "Same when filtered"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:134
msgid "Italics"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:140
msgid "These files are different across folders, but once <link xref=\"text-filters\">text filters</link> are applied, these files become identical."
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:150
msgid "Blue and bold"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:156
msgid "These files differ between the folders being compared."
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:164
#: C/vc-mode.page:123
msgid "Green and bold"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:170
msgid "This file/folder exists in this folder, but not in the others."
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:176
#: C/vc-mode.page:167
msgid "Missing"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:178
msgid "Greyed out text with a line through the middle"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:184
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:191
#: C/vc-mode.page:212
msgid "Error"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:193
#: C/vc-mode.page:214
msgid "Bright red with a yellow background and bold"
msgstr ""

#. (itstool) path: td/p
#: C/folder-mode.page:199
msgid "When comparing this file, an error occurred. The most common error causes are file permissions (i.e., <app>Meld</app> was not allowed to open the file) and filename encoding errors."
msgstr ""

#. (itstool) path: section/p
#: C/folder-mode.page:217
msgid "You can filter out files based on these states, for example, to show only files that have been <em>Modified</em>. You can read more about this in <link xref=\"file-filters#file-state-filter\"/>."
msgstr ""

#. (itstool) path: section/p
#: C/folder-mode.page:223
msgid "Finally, the most recently modified file/folder has a small star emblem attached to it."
msgstr ""

#. (itstool) path: page/title
#: C/index.page:14
msgid "Meld Help"
msgstr ""

#. (itstool) path: section/title
#: C/index.page:17
msgid "Introduction"
msgstr ""

#. (itstool) path: section/title
#: C/index.page:21
msgid "Comparing Files"
msgstr ""

#. (itstool) path: section/title
#: C/index.page:25
msgid "Comparing Folders"
msgstr ""

#. (itstool) path: section/title
#: C/index.page:29
msgid "Using Meld with Version Control"
msgstr ""

#. (itstool) path: section/title
#: C/index.page:33
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 "<app>Meld</app> 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 "<app>Meld</app> 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. <app>Meld</app>'s focus is on helping developers compare and merge source files, and get a visual overview of changes in their favourite version control system."
msgstr ""

#. (itstool) path: page/title
#: C/keyboard-shortcuts.page:15
msgid "Keyboard shortcuts"
msgstr ""

#. (itstool) path: table/title
#: C/keyboard-shortcuts.page:18
msgid "Shortcuts for working with files and comparisons"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:22
#: C/keyboard-shortcuts.page:56
#: C/keyboard-shortcuts.page:109
#: C/keyboard-shortcuts.page:131
#: C/keyboard-shortcuts.page:153
msgid "Shortcut"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:22
#: C/keyboard-shortcuts.page:56
#: C/keyboard-shortcuts.page:109
#: C/keyboard-shortcuts.page:131
#: C/keyboard-shortcuts.page:153
msgid "Description"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:29
msgid "<keyseq><key>Ctrl</key><key>N</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:30
msgid "Start a new comparison."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:33
msgid "<keyseq><key>Ctrl</key><key>S</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:34
msgid "Save the current document to disk."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:37
msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>S</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:38
msgid "Save the current document with a new filename."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:41
msgid "<keyseq><key>Ctrl</key><key>W</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:42
msgid "Close the current comparison."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:45
msgid "<keyseq><key>Ctrl</key><key>Q</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:46
msgid "Quit <app>Meld</app>."
msgstr ""

#. (itstool) path: table/title
#: C/keyboard-shortcuts.page:52
msgid "Shortcuts for editing documents"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:62
msgid "<keyseq><key>Ctrl</key><key>Z</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:63
msgid "Undo the last action."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:66
msgid "<keyseq><key>Ctrl</key><key>Shift</key><key>Z</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:67
msgid "Redo the last undone action."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:70
msgid "<keyseq><key>Ctrl</key><key>X</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:71
msgid "Cut the selected text or region and place it on the clipboard."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:74
msgid "<keyseq><key>Ctrl</key><key>C</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:75
msgid "Copy the selected text or region onto the clipboard."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:78
msgid "<keyseq><key>Ctrl</key><key>V</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:79
msgid "Paste the contents of the clipboard."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:82
msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:83
msgid "Find a string."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:86
msgid "<keyseq><key>Ctrl</key><key>G</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:87
msgid "Find the next instance of the string."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:90
msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:91
msgid "Go to the next difference. (Also <keyseq><key>Ctrl</key><key>D</key></keyseq>)"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:96
msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:97
msgid "Go to the previous difference. (Also <keyseq><key>Ctrl</key><key>E</key></keyseq>)"
msgstr ""

#. (itstool) path: table/title
#: C/keyboard-shortcuts.page:105
msgid "Shortcuts for folder comparison"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:115
msgid "<keyseq><key>+</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:116
msgid "Expand the current folder."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:119
msgid "<keyseq><key>-</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:120
msgid "Collapse the current folder."
msgstr ""

#. (itstool) path: table/title
#: C/keyboard-shortcuts.page:127
msgid "Shortcuts for view settings"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:137
msgid "<keyseq><key>Escape</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:138
msgid "Stop the current comparison."
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:141
msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:142
msgid "Refresh the current comparison."
msgstr ""

#. (itstool) path: table/title
#: C/keyboard-shortcuts.page:149
msgid "Shortcuts for help"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:159
msgid "<keyseq><key>F1</key></keyseq>"
msgstr ""

#. (itstool) path: td/p
#: C/keyboard-shortcuts.page:160
msgid "Open <app>Meld</app>'s user manual."
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 <app>Meld</app> 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 <em>surely</em> 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 <app>Meld</app> <em>doesn't</em> 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 <app>Meld</app> shows differences between files, it shows both files as they would appear in a normal text editor. It does <em>not</em> 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., <cmd>gedit</cmd>) in which case the file to be opened will be passed as the last argument. Alternatively, you can add <code>{file}</code> and <code>{line}</code> elements to the command, in which case <app>Meld</app> will substitute the file path and current line number respectively (e.g., <cmd>gedit {file}:{line}</cmd>)."
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 <app>Meld</app> 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 <app>Meld</app> 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 <app>Git</app>, <cmd>git mergetool</cmd> will start a 'merge helper'; <app>Meld</app> is one such helper. If you want to make <app>git mergetool</app> use <app>Meld</app> 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 <file>.git/gitconfig</file>. See the <app>git mergetool</app> 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 <app>Meld</app> 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 <link xref=\"file-filters\">file filtering notes</link> 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 <gui>Text Filters</gui> tab in <gui>Preferences</gui> dialog. <app>Meld</app> 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 <app>Meld</app>, 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 <link href=\"http://docs.python.org/howto/regex.html\">Regular Expression HOWTO</link>."
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 <gui>Script comment</gui> filter enabled, and compared the following files:"
msgstr ""

#. (itstool) path: listing/title
#: C/text-filters.page:80
msgid "<file>comment1.txt</file>"
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 "<file>comment2.txt</file>"
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 <code>b</code> would be shown as identical (the comment is stripped out) but the <code>d</code> line would be shown as different to the comment line on the right. This happens because the <code>#comment</code> is removed from the right-hand side, but the line itself can not be removed; <app>Meld</app> will show the <code>d</code> 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 <gui>Ignore changes which insert or delete blank lines</gui> preference in the <gui>Text Filters</gui> 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 <link xref=\"#text-filter-problems\">problems and limitations</link> 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 "<app>Meld</app> integrates with <link xref=\"vc-supported\">many version control systems</link> to let you review local changes and perform simple version control tasks. You can start a new version control comparison by selecting the <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">New...</gui></guiseq> menu item, and clicking on the <gui style=\"tab\">Version Control</gui> tab."
msgstr ""

#. (itstool) path: section/title
#: C/vc-mode.page:30
msgid "Version control comparisons"
msgstr ""

#. (itstool) path: section/p
#: C/vc-mode.page:32
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 <link xref=\"#vc-state\">state</link> that indicates how it differs from the repository copy."
msgstr ""

#. (itstool) path: section/p
#: C/vc-mode.page:46
msgid "If you want to look at a particular file's differences, you can select it and press <key>Enter</key>, or double-click the file to start a <link xref=\"file-mode\">file comparison</link>. You can also interact with your version control system using the <gui style=\"menu\">Changes</gui> menu."
msgstr ""

#. (itstool) path: section/title
#. (itstool) path: table/title
#: C/vc-mode.page:56
#: C/vc-mode.page:81
msgid "Version control states"
msgstr ""

#. (itstool) path: section/p
#: C/vc-mode.page:58
msgid "Each file or folder in a version control comparison has a <em>state</em>, obtained from the version control system itself. <app>Meld</app> maps these different states into a standard set of very similar concepts. As such, <app>Meld</app> 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:101
msgid "The file/folder is the same as the repository version."
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:109
msgid "Red and bold"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:115
msgid "This file is different to the repository version."
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:129
msgid "This file/folder is new, and is scheduled to be added to the repository."
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:136
msgid "Removed"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:138
msgid "Red bold text with a line through the middle"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:144
msgid "This file/folder existed, but is scheduled to be removed from the repository."
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:151
msgid "Conflict"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:153
msgid "Bright red bold text"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:159
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:169
msgid "Blue bold text with a line through the middle"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:175
msgid "This file/folder should be present, but isn't."
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:181
msgid "Ignored"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:183
#: C/vc-mode.page:199
msgid "Greyed out text"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:189
msgid "This file/folder has been explicitly ignored (e.g., by an entry in <file>.gitignore</file>) and is not being tracked by version control."
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:197
msgid "Unversioned"
msgstr ""

#. (itstool) path: td/p
#: C/vc-mode.page:205
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:220
msgid "The version control system has reported a problem with this file."
msgstr ""

#. (itstool) path: section/title
#: C/vc-mode.page:230
msgid "Version control state filtering"
msgstr ""

#. (itstool) path: section/p
#: C/vc-mode.page:232
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 <app>Meld</app>. You can change which file states you see by using the <guiseq><gui style=\"menu\">View</gui><gui style=\"menuitem\">Version Status</gui></guiseq> menu, or by clicking the corresponding <gui style=\"button\">Modified</gui>, <gui style=\"button\">Normal</gui>, <gui style=\"button\">Unversioned</gui> and <gui style=\"button\">Ignored</gui> 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 "<app>Meld</app> 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 <link href=\"https://gitlab.gnome.org/GNOME/meld/issues\">Meld issue tracker</link>."
msgstr ""