# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/meld/issues\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" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: data/org.gnome.Meld.desktop.in.in:3 data/org.gnome.Meld.appdata.xml.in.in:10 #: meld/resources/ui/appwindow.ui:9 meld/resources/ui/appwindow.ui:17 msgid "Meld" msgstr "" #: data/org.gnome.Meld.desktop.in.in:4 msgid "Diff Viewer" msgstr "" #: data/org.gnome.Meld.desktop.in.in:5 data/org.gnome.Meld.appdata.xml.in.in:11 msgid "Compare and merge your files" msgstr "" #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! #: data/org.gnome.Meld.desktop.in.in:7 msgid "diff;merge;" msgstr "" #: data/org.gnome.Meld.appdata.xml.in.in:13 msgid "" "Meld is a visual diff and merge tool targeted at developers. Meld helps you " "compare files, directories, and version controlled projects. It provides " "two- and three-way comparison of both files and directories, and supports " "many version control systems including Git, Mercurial, Bazaar and Subversion." msgstr "" #: data/org.gnome.Meld.appdata.xml.in.in:20 msgid "" "Meld helps you review code changes, understand patches, and makes enormous " "merge conflicts slightly less painful." msgstr "" #: data/org.gnome.Meld.appdata.xml.in.in:59 msgid "Kai Willadsen" msgstr "" #: data/mime/org.gnome.Meld.xml.in:4 msgid "Meld comparison description" msgstr "" #: data/org.gnome.Meld.gschema.xml:37 msgid "Default window width" msgstr "" #: data/org.gnome.Meld.gschema.xml:41 msgid "Default window height" msgstr "" #: data/org.gnome.Meld.gschema.xml:45 msgid "Default window maximized state" msgstr "" #: data/org.gnome.Meld.gschema.xml:54 msgid "Prefer application-wide dark theme" msgstr "" #: data/org.gnome.Meld.gschema.xml:55 msgid "" "If true, the GTK dark theme variant will be used, if available. Note that " "this is separate from the syntax highlighting scheme." msgstr "" #: data/org.gnome.Meld.gschema.xml:61 msgid "Additional automatically detected text encodings" msgstr "" #: data/org.gnome.Meld.gschema.xml:62 msgid "" "Meld will use these text encodings to try to decode loaded text files before " "trying any other encodings. In addition to the encodings in this list, UTF-8 " "and the current locale-default encoding will always be used; other encodings " "may also be tried, depending on the user’s locale." msgstr "" #: data/org.gnome.Meld.gschema.xml:69 msgid "Width of an indentation step" msgstr "" #: data/org.gnome.Meld.gschema.xml:70 msgid "The number of spaces to use for a single indent step" msgstr "" #: data/org.gnome.Meld.gschema.xml:74 msgid "Whether to indent using spaces or tabs" msgstr "" #: data/org.gnome.Meld.gschema.xml:75 msgid "If true, any new indentation will use spaces instead of tabs." msgstr "" #: data/org.gnome.Meld.gschema.xml:79 meld/resources/ui/statusbar-menu.ui:5 msgid "Show line numbers" msgstr "" #: data/org.gnome.Meld.gschema.xml:80 msgid "If true, line numbers will be shown in the gutter of file comparisons." msgstr "" #: data/org.gnome.Meld.gschema.xml:84 msgid "Highlight syntax" msgstr "" #: data/org.gnome.Meld.gschema.xml:85 msgid "" "Whether to highlight syntax in comparisons. Because of Meld’s own color " "highlighting, this is off by default." msgstr "" #: data/org.gnome.Meld.gschema.xml:89 msgid "Color scheme to use for syntax highlighting" msgstr "" #: data/org.gnome.Meld.gschema.xml:90 msgid "Used by GtkSourceView to determine colors for syntax highlighting" msgstr "" #: data/org.gnome.Meld.gschema.xml:94 msgid "Draw whitespace" msgstr "" #: data/org.gnome.Meld.gschema.xml:95 msgid "" "If true, whitespace characters will be drawn in comparisons even if they are " "not in a changed area." msgstr "" #: data/org.gnome.Meld.gschema.xml:104 msgid "Wrap mode" msgstr "" #: data/org.gnome.Meld.gschema.xml:105 msgid "" "Lines in file comparisons will be wrapped according to this setting, either " "not at all ('none'), at any character ('char') or only at the end of words " "('word')." msgstr "" #: data/org.gnome.Meld.gschema.xml:112 meld/resources/ui/statusbar-menu.ui:13 msgid "Highlight current line" msgstr "" #: data/org.gnome.Meld.gschema.xml:113 msgid "" "If true, the line containing the cursor will be highlighted in file " "comparisons." msgstr "" #: data/org.gnome.Meld.gschema.xml:117 msgid "Use the system default monospace font" msgstr "" #: data/org.gnome.Meld.gschema.xml:118 msgid "" "If false, custom-font will be used instead of the system monospace font." msgstr "" #: data/org.gnome.Meld.gschema.xml:122 msgid "Custom font" msgstr "" #: data/org.gnome.Meld.gschema.xml:123 msgid "" "The custom font to use, stored as a string and parsed as a Pango font " "description." msgstr "" #: data/org.gnome.Meld.gschema.xml:129 msgid "Show overview source map" msgstr "" #: data/org.gnome.Meld.gschema.xml:130 msgid "" "If true, file comparisons will have paired source maps for compared files." msgstr "" #: data/org.gnome.Meld.gschema.xml:135 msgid "Style of overview map" msgstr "" #: data/org.gnome.Meld.gschema.xml:136 msgid "Style options for how the overview map is displayed." msgstr "" #: data/org.gnome.Meld.gschema.xml:142 msgid "Ignore blank lines when comparing files" msgstr "" #: data/org.gnome.Meld.gschema.xml:143 msgid "" "If true, blank lines will be trimmed when highlighting changes between files." msgstr "" #: data/org.gnome.Meld.gschema.xml:150 msgid "Use the system default editor" msgstr "" #: data/org.gnome.Meld.gschema.xml:151 msgid "" "If false, custom-editor-command will be used instead of the system editor " "when opening files externally." msgstr "" #: data/org.gnome.Meld.gschema.xml:155 msgid "The custom editor launch command" msgstr "" #: data/org.gnome.Meld.gschema.xml:156 msgid "" "The command used to launch a custom editor. Some limited templating is " "supported here; at the moment '{file}' and '{line}' are recognised tokens." msgstr "" #: data/org.gnome.Meld.gschema.xml:162 msgid "Columns to display" msgstr "" #: data/org.gnome.Meld.gschema.xml:163 msgid "" "List of column names in folder comparison and whether they should be " "displayed." msgstr "" #: data/org.gnome.Meld.gschema.xml:167 meld/resources/ui/preferences.ui:968 msgid "Ignore symbolic links" msgstr "" #: data/org.gnome.Meld.gschema.xml:168 msgid "" "If true, folder comparisons do not follow symbolic links when traversing the " "folder tree." msgstr "" #: data/org.gnome.Meld.gschema.xml:172 msgid "Use shallow comparison" msgstr "" #: data/org.gnome.Meld.gschema.xml:173 msgid "" "If true, folder comparisons compare files based solely on size and mtime, " "considering files to be identical if their size and mtime match, and " "different otherwise." msgstr "" #: data/org.gnome.Meld.gschema.xml:177 msgid "File timestamp resolution" msgstr "" #: data/org.gnome.Meld.gschema.xml:178 msgid "" "When comparing based on mtime, this is the minimum difference in nanoseconds " "between two files before they’re considered to have different mtimes. This " "is useful when comparing files between filesystems with different timestamp " "resolution." msgstr "" #: data/org.gnome.Meld.gschema.xml:182 meld/resources/ui/preferences.ui:867 msgid "Apply text filters during folder comparisons" msgstr "" #: data/org.gnome.Meld.gschema.xml:183 msgid "" "If true, folder comparisons that compare file contents also apply active " "text filters and the blank line trimming option, and ignore newline " "differences." msgstr "" #: data/org.gnome.Meld.gschema.xml:187 msgid "File status filters" msgstr "" #: data/org.gnome.Meld.gschema.xml:188 msgid "List of statuses used to filter visible files in folder comparison." msgstr "" #: data/org.gnome.Meld.gschema.xml:194 msgid "Show the version control console output" msgstr "" #: data/org.gnome.Meld.gschema.xml:195 msgid "" "If true, a console output section will be shown in version control views, " "showing the commands run for version control operations." msgstr "" #: data/org.gnome.Meld.gschema.xml:199 msgid "Version control pane position" msgstr "" #: data/org.gnome.Meld.gschema.xml:200 msgid "" "This is the height of the main version control tree when the console pane is " "shown." msgstr "" #: data/org.gnome.Meld.gschema.xml:204 msgid "Present version comparisons as left-local/right-remote" msgstr "" #: data/org.gnome.Meld.gschema.xml:205 msgid "" "If true, version control comparisons will use a left-is-local, right-is-" "remote scheme to determine what order to present files in panes. Otherwise, " "a left-is-theirs, right-is-mine scheme is used." msgstr "" #: data/org.gnome.Meld.gschema.xml:209 msgid "Order for files in three-way version control merge comparisons" msgstr "" #: data/org.gnome.Meld.gschema.xml:210 msgid "" "Choices for file order are remote/merged/local and local/merged/remote. This " "preference only affects three-way comparisons launched from the version " "control view, so is used solely for merges/conflict resolution within Meld." msgstr "" #: data/org.gnome.Meld.gschema.xml:214 msgid "Show margin in commit message editor" msgstr "" #: data/org.gnome.Meld.gschema.xml:215 msgid "" "If true, a guide will be displayed to show what column the margin is at in " "the version control commit message editor." msgstr "" #: data/org.gnome.Meld.gschema.xml:219 msgid "Margin column in commit message editor" msgstr "" #: data/org.gnome.Meld.gschema.xml:220 msgid "" "The column at which to show the margin in the version control commit message " "editor." msgstr "" #: data/org.gnome.Meld.gschema.xml:224 msgid "Automatically hard-wrap commit messages" msgstr "" #: data/org.gnome.Meld.gschema.xml:225 msgid "" "If true, the version control commit message editor will hard-wrap (i.e., " "insert line breaks) at the commit margin before commit." msgstr "" #: data/org.gnome.Meld.gschema.xml:229 msgid "Version control status filters" msgstr "" #: data/org.gnome.Meld.gschema.xml:230 msgid "" "List of statuses used to filter visible files in version control comparison." msgstr "" #. #. Translators: A list of default filters, each of which is #. composed of a (name, enabled, pattern) in GVariant syntax. #. Please only translate the name of each filter. #: data/org.gnome.Meld.gschema.xml:240 msgid "" "[\n" " (\"Backups\", true, \"#*# .#* ~* *~ *.{orig,bak,swp}\"),\n" " (\"OS-Specific Metadata\", true, \".DS_Store ._* .Spotlight-" "V100 .Trashes Thumbs.db Desktop.ini\"),\n" " (\"Version Control\", true, \"_MTN .bzr .svn .svn .hg ." "fslckout _FOSSIL_ .fos CVS _darcs .git .svn .osc\"),\n" " (\"Binaries\", true, \"*.{pyc,a,obj,o,so,la,lib,dll,exe}\"),\n" " (\"Media\", false, \"*.{jxl,jpg,jpeg,gif,png,avif,webp,heif," "heic,bmp,tif,tiff,raw,dng,cr2,wav,wave,mp3,ogg,oga,vorbis,spx,opus,flac,ac3," "aac,aif,aiff,aifc,alac,m4a,3gp,wma,aup,aup3,avi,mov,mpg,mpeg,mp4,m4v,webm," "ogv,flv,xcf,xpm,ora,kra,psd,psp}\")\n" " ]" msgstr "" #: data/org.gnome.Meld.gschema.xml:249 msgid "Filename-based filters" msgstr "" #: data/org.gnome.Meld.gschema.xml:250 msgid "" "List of predefined filename-based filters that, if active, will remove " "matching files from a folder comparison." msgstr "" #. #. Translators: A list of default filters, each of which is #. composed of a (name, enabled, pattern) in GVariant syntax. #. Please only translate the name of each filter. #: data/org.gnome.Meld.gschema.xml:258 msgid "" "[\n" " (\"CVS/SVN Keywords\", false, \"\\\\$\\\\w+(:[^\\\\n$]+)?\\\\$" "\"),\n" " (\"C++ Comment\", false, \"//.*\"),\n" " (\"C Comment\", false, \"/\\\\*.*?\\\\*/\"),\n" " (\"All Whitespace\", false, \"[ \\\\t\\\\r\\\\f\\\\v]*\"),\n" " (\"Leading Whitespace\", false, \"^[ \\\\t\\\\r\\\\f\\" "\\v]*\"),\n" " (\"Trailing Whitespace\", false, \"[ \\\\t\\\\r\\\\f\\\\v]*$" "\"),\n" " (\"Script Comment\", false, \"#.*\")\n" " ]" msgstr "" #: data/org.gnome.Meld.gschema.xml:269 msgid "Text-based filters" msgstr "" #: data/org.gnome.Meld.gschema.xml:270 msgid "" "List of predefined text-based regex filters that, if active, will remove " "text from being used in a file comparison. The text will still be displayed, " "but won’t contribute to the comparison itself." msgstr "" #: data/styles/meld-base.style-scheme.xml.in:1 msgid "Classic (Meld)" msgstr "" #: data/styles/meld-base.style-scheme.xml.in:3 msgid "Base color scheme for Meld highlighting" msgstr "" #: data/styles/meld-dark.style-scheme.xml.in:1 msgid "Meld dark scheme" msgstr "" #: data/styles/meld-dark.style-scheme.xml.in:3 msgid "Dark color scheme for Meld highlighting" msgstr "" #: meld/resources/gtk/help-overlay.ui:14 msgctxt "shortcut window" msgid "Windows and Tabs" msgstr "" #: meld/resources/gtk/help-overlay.ui:19 msgctxt "shortcut window" msgid "New comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:26 msgctxt "shortcut window" msgid "Close a comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:33 msgctxt "shortcut window" msgid "Quit Meld" msgstr "" #: meld/resources/gtk/help-overlay.ui:41 msgctxt "shortcut window" msgid "General" msgstr "" #: meld/resources/gtk/help-overlay.ui:46 msgctxt "shortcut window" msgid "Show help" msgstr "" #: meld/resources/gtk/help-overlay.ui:53 msgctxt "shortcut window" msgid "Show preferences" msgstr "" #: meld/resources/gtk/help-overlay.ui:60 msgctxt "shortcut window" msgid "Keyboard shortcuts" msgstr "" #: meld/resources/gtk/help-overlay.ui:68 msgctxt "shortcut window" msgid "Open menu" msgstr "" #: meld/resources/gtk/help-overlay.ui:75 msgctxt "shortcut window" msgid "Fullscreen" msgstr "" #: meld/resources/gtk/help-overlay.ui:84 msgctxt "shortcut window" msgid "Common Actions" msgstr "" #: meld/resources/gtk/help-overlay.ui:89 msgctxt "shortcut window" msgid "Stop the current action" msgstr "" #: meld/resources/gtk/help-overlay.ui:96 msgctxt "shortcut window" msgid "Refresh comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:103 msgctxt "shortcut window" msgid "Open externally" msgstr "" #: meld/resources/gtk/help-overlay.ui:111 msgctxt "shortcut window" msgid "Panes" msgstr "" #: meld/resources/gtk/help-overlay.ui:116 msgctxt "shortcut window" msgid "Previous comparison pane" msgstr "" #: meld/resources/gtk/help-overlay.ui:123 msgctxt "shortcut window" msgid "Next comparison pane" msgstr "" #: meld/resources/gtk/help-overlay.ui:130 msgctxt "shortcut window" msgid "Swap left and right panes" msgstr "" #: meld/resources/gtk/help-overlay.ui:139 msgctxt "shortcut window" msgid "Changes" msgstr "" #: meld/resources/gtk/help-overlay.ui:144 msgctxt "shortcut window" msgid "Go to previous change" msgstr "" #: meld/resources/gtk/help-overlay.ui:151 msgctxt "shortcut window" msgid "Go to next change" msgstr "" #: meld/resources/gtk/help-overlay.ui:160 msgctxt "shortcut window" msgid "Tabs" msgstr "" #: meld/resources/gtk/help-overlay.ui:165 msgctxt "shortcut window" msgid "Go to previous tab" msgstr "" #: meld/resources/gtk/help-overlay.ui:172 msgctxt "shortcut window" msgid "Go to next tab" msgstr "" #: meld/resources/gtk/help-overlay.ui:179 msgctxt "shortcut window" msgid "Switch to tab" msgstr "" #: meld/resources/gtk/help-overlay.ui:186 msgctxt "shortcut window" msgid "Move tab left" msgstr "" #: meld/resources/gtk/help-overlay.ui:193 msgctxt "shortcut window" msgid "Move tab right" msgstr "" #: meld/resources/gtk/help-overlay.ui:202 msgctxt "shortcut window" msgid "Editing" msgstr "" #: meld/resources/gtk/help-overlay.ui:207 msgctxt "shortcut window" msgid "Undo" msgstr "" #: meld/resources/gtk/help-overlay.ui:214 msgctxt "shortcut window" msgid "Redo" msgstr "" #: meld/resources/gtk/help-overlay.ui:221 msgctxt "shortcut window" msgid "Cut" msgstr "" #: meld/resources/gtk/help-overlay.ui:228 msgctxt "shortcut window" msgid "Copy" msgstr "" #: meld/resources/gtk/help-overlay.ui:235 msgctxt "shortcut window" msgid "Paste" msgstr "" #: meld/resources/gtk/help-overlay.ui:242 msgctxt "shortcut window" msgid "Find" msgstr "" #: meld/resources/gtk/help-overlay.ui:249 msgctxt "shortcut window" msgid "Find Next" msgstr "" #: meld/resources/gtk/help-overlay.ui:256 msgctxt "shortcut window" msgid "Find Previous" msgstr "" #: meld/resources/gtk/help-overlay.ui:263 msgctxt "shortcut window" msgid "Replace" msgstr "" #: meld/resources/gtk/help-overlay.ui:270 msgctxt "shortcut window" msgid "Go to line" msgstr "" #: meld/resources/gtk/help-overlay.ui:279 msgctxt "shortcut window" msgid "File comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:284 msgctxt "shortcut window" msgid "Save current file" msgstr "" #: meld/resources/gtk/help-overlay.ui:291 msgctxt "shortcut window" msgid "Save current file to new path" msgstr "" #: meld/resources/gtk/help-overlay.ui:298 msgctxt "shortcut window" msgid "Save all files in comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:305 msgctxt "shortcut window" msgid "Previous conflict" msgstr "" #: meld/resources/gtk/help-overlay.ui:312 msgctxt "shortcut window" msgid "Next conflict" msgstr "" #: meld/resources/gtk/help-overlay.ui:319 msgctxt "shortcut window" msgid "Push change to left" msgstr "" #: meld/resources/gtk/help-overlay.ui:326 msgctxt "shortcut window" msgid "Push change to right" msgstr "" #: meld/resources/gtk/help-overlay.ui:333 msgctxt "shortcut window" msgid "Pull change from left" msgstr "" #: meld/resources/gtk/help-overlay.ui:340 msgctxt "shortcut window" msgid "Pull change from right" msgstr "" #: meld/resources/gtk/help-overlay.ui:347 msgctxt "shortcut window" msgid "Copy change above left" msgstr "" #: meld/resources/gtk/help-overlay.ui:354 msgctxt "shortcut window" msgid "Copy change below left" msgstr "" #: meld/resources/gtk/help-overlay.ui:361 msgctxt "shortcut window" msgid "Copy change above right" msgstr "" #: meld/resources/gtk/help-overlay.ui:368 msgctxt "shortcut window" msgid "Copy change below right" msgstr "" #: meld/resources/gtk/help-overlay.ui:375 #: meld/resources/gtk/help-overlay.ui:410 msgctxt "shortcut window" msgid "Delete change" msgstr "" #: meld/resources/gtk/help-overlay.ui:382 msgctxt "shortcut window" msgid "Show overview map" msgstr "" #: meld/resources/gtk/help-overlay.ui:391 msgctxt "shortcut window" msgid "Folder comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:396 msgctxt "shortcut window" msgid "Copy to left" msgstr "" #: meld/resources/gtk/help-overlay.ui:403 msgctxt "shortcut window" msgid "Copy to right" msgstr "" #: meld/resources/gtk/help-overlay.ui:417 msgctxt "shortcut window" msgid "Expand the current folder" msgstr "" #: meld/resources/gtk/help-overlay.ui:424 msgctxt "shortcut window" msgid "Collapse the current folder" msgstr "" #: meld/resources/gtk/help-overlay.ui:433 msgctxt "shortcut window" msgid "Version control comparison" msgstr "" #: meld/resources/gtk/help-overlay.ui:438 msgctxt "shortcut window" msgid "Commit to version control" msgstr "" #: meld/resources/gtk/help-overlay.ui:445 msgctxt "shortcut window" msgid "Show/hide console output" msgstr "" #: meld/resources/gtk/menus.ui:7 msgid "Save As…" msgstr "" #: meld/resources/gtk/menus.ui:11 msgid "Save A_ll" msgstr "" #: meld/resources/gtk/menus.ui:15 msgid "Revert Files…" msgstr "" #: meld/resources/gtk/menus.ui:19 meld/resources/ui/dirdiff-menus.ui:51 msgid "_Open Externally" msgstr "" #: meld/resources/gtk/menus.ui:26 msgid "Refresh Comparison" msgstr "" #: meld/resources/gtk/menus.ui:33 msgid "_Find…" msgstr "" #: meld/resources/gtk/menus.ui:37 msgid "_Replace…" msgstr "" #: meld/resources/gtk/menus.ui:43 msgid "_View" msgstr "" #: meld/resources/gtk/menus.ui:47 msgid "Fullscreen" msgstr "" #: meld/resources/gtk/menus.ui:51 msgid "Overview Map" msgstr "" #: meld/resources/gtk/menus.ui:55 msgid "Version Control Console" msgstr "" #: meld/resources/gtk/menus.ui:59 msgid "Lock Scrolling" msgstr "" #: meld/resources/gtk/menus.ui:66 msgid "Swap Left and Right Panes" msgstr "" #: meld/resources/gtk/menus.ui:72 msgid "_Comparison" msgstr "" #: meld/resources/gtk/menus.ui:74 msgid "_Stop" msgstr "" #: meld/resources/gtk/menus.ui:80 msgid "Merge All from _Left" msgstr "" #: meld/resources/gtk/menus.ui:84 msgid "Merge All from _Right" msgstr "" #: meld/resources/gtk/menus.ui:88 msgid "Merge _All" msgstr "" #: meld/resources/gtk/menus.ui:95 msgid "Format as _Patch…" msgstr "" #: meld/resources/gtk/menus.ui:104 msgid "_Preferences" msgstr "" #: meld/resources/gtk/menus.ui:108 msgid "Keyboard Shortcuts" msgstr "" #: meld/resources/gtk/menus.ui:112 msgid "_Help" msgstr "" #: meld/resources/gtk/menus.ui:116 msgid "_About Meld" msgstr "" #: meld/resources/gtk/menus.ui:129 msgid "File Status" msgstr "" #: meld/resources/gtk/menus.ui:131 msgid "Same" msgstr "" #: meld/resources/gtk/menus.ui:135 msgid "New" msgstr "" #: meld/resources/gtk/menus.ui:139 meld/resources/gtk/menus.ui:162 #: meld/vc/_vc.py:77 msgid "Modified" msgstr "" #: meld/resources/gtk/menus.ui:149 msgid "Ignore Filename Case" msgstr "" #: meld/resources/gtk/menus.ui:153 msgid "Normalize Unicode Paths" msgstr "" #: meld/resources/gtk/menus.ui:166 msgid "Normal" msgstr "" #: meld/resources/gtk/menus.ui:170 meld/vc/_vc.py:71 msgid "Unversioned" msgstr "" #: meld/resources/gtk/menus.ui:174 meld/vc/_vc.py:70 msgid "Ignored" msgstr "" #: meld/resources/gtk/menus.ui:181 msgid "Flatten Folders" msgstr "" #: meld/resources/ui/about-dialog.ui:8 msgid "" "Copyright © 2002-2009 Stephen Kennedy\n" "Copyright © 2009-2022 Kai Willadsen" msgstr "" #: meld/resources/ui/about-dialog.ui:14 msgid "translator-credits" msgstr "" #: meld/resources/ui/appwindow.ui:30 msgid "Start a new comparison" msgstr "" #: meld/resources/ui/appwindow.ui:46 msgid "Open a recent comparison" msgstr "" #: meld/resources/ui/appwindow.ui:74 msgid "Go to the previous change" msgstr "" #: meld/resources/ui/appwindow.ui:94 msgid "Go to the next change" msgstr "" #: meld/resources/ui/appwindow.ui:124 msgid "Go to the previous conflict" msgstr "" #: meld/resources/ui/appwindow.ui:144 msgid "Go to the next conflict" msgstr "" #: meld/resources/ui/appwindow.ui:194 msgid "Version Filters" msgstr "" #: meld/resources/ui/appwindow.ui:210 meld/resources/ui/preferences.ui:1506 msgid "File Filters" msgstr "" #: meld/resources/ui/appwindow.ui:226 meld/resources/ui/preferences.ui:1698 msgid "Text Filters" msgstr "" #: meld/resources/ui/column-list.ui:37 meld/resources/ui/filter-list.ui:39 msgid "Active" msgstr "" #: meld/resources/ui/column-list.ui:50 msgid "Column Name" msgstr "" #: meld/resources/ui/column-list.ui:83 meld/resources/ui/filter-list.ui:127 #: meld/resources/ui/vcview-menus.ui:22 meld/vcview.py:748 msgid "_Remove" msgstr "" #: meld/resources/ui/column-list.ui:96 meld/resources/ui/filter-list.ui:151 msgid "Move item up" msgstr "" #: meld/resources/ui/column-list.ui:98 meld/resources/ui/filter-list.ui:153 msgid "Move _Up" msgstr "" #: meld/resources/ui/column-list.ui:112 meld/resources/ui/filter-list.ui:167 msgid "Move item down" msgstr "" #: meld/resources/ui/column-list.ui:114 meld/resources/ui/filter-list.ui:169 msgid "Move _Down" msgstr "" #: meld/resources/ui/commit-dialog.ui:8 msgid "Commit" msgstr "" #: meld/resources/ui/commit-dialog.ui:36 msgid "Commit Files" msgstr "" #: meld/resources/ui/commit-dialog.ui:117 msgid "Log Message" msgstr "" #: meld/resources/ui/commit-dialog.ui:181 msgid "Previous logs:" msgstr "" #: meld/resources/ui/commit-dialog.ui:244 meld/resources/ui/patch-dialog.ui:41 #: meld/resources/ui/push-dialog.ui:24 meld/resources/ui/revert-dialog.ui:24 #: meld/resources/ui/save-confirm-dialog.ui:41 meld/dirdiff.py:1276 #: meld/iohelpers.py:56 meld/iohelpers.py:116 msgid "_Cancel" msgstr "" #: meld/resources/ui/commit-dialog.ui:259 msgid "Co_mmit" msgstr "" #: meld/resources/ui/dirdiff-actions.ui:20 msgid "Copy to left" msgstr "" #: meld/resources/ui/dirdiff-actions.ui:42 msgid "Copy to right" msgstr "" #: meld/resources/ui/dirdiff-actions.ui:66 msgid "Delete selected" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:7 msgid "_Compare Selected Files" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:14 msgid "_Mark Selected File" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:18 msgid "Compare _with Marked File" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:25 msgid "Copy to _Left" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:29 msgid "Copy to _Right" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:33 msgid "_Delete Selected" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:40 msgid "Collapse Recursively" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:44 msgid "Expand Recursively" msgstr "" #: meld/resources/ui/dirdiff-menus.ui:55 msgid "_Copy File Paths" msgstr "" #: meld/resources/ui/dirdiff.ui:34 meld/resources/ui/dirdiff.ui:74 #: meld/resources/ui/dirdiff.ui:114 meld/resources/ui/vcview.ui:139 msgid "Select Folder" msgstr "" #: meld/resources/ui/dirdiff.ui:35 meld/resources/ui/dirdiff.ui:75 #: meld/resources/ui/dirdiff.ui:115 msgid "Select folder to open in this pane" msgstr "" #: meld/resources/ui/dirdiff.ui:43 msgid "Folder 1" msgstr "" #: meld/resources/ui/dirdiff.ui:83 msgid "Folder 2" msgstr "" #: meld/resources/ui/dirdiff.ui:123 msgid "Folder 3" msgstr "" #: meld/resources/ui/encoding-selector.ui:31 msgid "Search text encoding…" msgstr "" #: meld/resources/ui/filediff-actions.ui:20 msgid "Push current change to the left" msgstr "" #: meld/resources/ui/filediff-actions.ui:42 msgid "Push current change to the right" msgstr "" #: meld/resources/ui/filediff-actions.ui:65 msgid "Copy chunks" msgstr "" #: meld/resources/ui/filediff-actions.ui:87 msgid "Delete change" msgstr "" #: meld/resources/ui/filediff-menus.ui:7 msgid "Copy change above the left chunk" msgstr "" #: meld/resources/ui/filediff-menus.ui:11 msgid "Copy change below the left chunk" msgstr "" #: meld/resources/ui/filediff-menus.ui:15 msgid "Copy change above the right chunk" msgstr "" #: meld/resources/ui/filediff-menus.ui:19 msgid "Copy change below the right chunk" msgstr "" #: meld/resources/ui/filediff-menus.ui:28 msgid "_Undo" msgstr "" #: meld/resources/ui/filediff-menus.ui:32 msgid "_Redo" msgstr "" #: meld/resources/ui/filediff-menus.ui:39 msgid "Cu_t" msgstr "" #: meld/resources/ui/filediff-menus.ui:43 msgid "_Copy" msgstr "" #: meld/resources/ui/filediff-menus.ui:47 msgid "_Paste" msgstr "" #: meld/resources/ui/filediff-menus.ui:54 #: meld/resources/ui/imagediff-menus.ui:7 meld/resources/ui/path-label.ui:81 msgid "Open Containing Folder" msgstr "" #: meld/resources/ui/filediff-menus.ui:58 #: meld/resources/ui/imagediff-menus.ui:11 msgid "Copy Full Path" msgstr "" #: meld/resources/ui/filediff.ui:32 meld/resources/ui/filediff.ui:100 #: meld/resources/ui/filediff.ui:168 msgid "" "This file can not be written to. You may click here to unlock this file and " "make changes anyway, but these changes must be saved to a new file." msgstr "" #: meld/resources/ui/filediff.ui:46 meld/resources/ui/filediff.ui:114 #: meld/resources/ui/filediff.ui:182 msgid "Save file in this pane" msgstr "" #: meld/resources/ui/filediff.ui:71 meld/resources/ui/filediff.ui:139 #: meld/resources/ui/filediff.ui:207 msgid "Open file in this pane" msgstr "" #: meld/resources/ui/filediff.ui:79 msgid "File 3" msgstr "" #: meld/resources/ui/filediff.ui:147 msgid "File 2" msgstr "" #: meld/resources/ui/filediff.ui:215 meld/resources/ui/vcview.ui:148 msgid "File 1" msgstr "" #. Create icon and filename CellRenderer #: meld/resources/ui/filter-list.ui:53 meld/resources/ui/vcview.ui:217 #: meld/dirdiff.py:620 msgid "Name" msgstr "" #: meld/resources/ui/filter-list.ui:67 msgid "Pattern" msgstr "" #: meld/resources/ui/filter-list.ui:109 msgid "Add new filter" msgstr "" #: meld/resources/ui/filter-list.ui:111 meld/resources/ui/vcview-menus.ui:18 msgid "_Add" msgstr "" #: meld/resources/ui/filter-list.ui:125 msgid "Remove selected filter" msgstr "" #: meld/resources/ui/findbar.ui:16 msgid "Previous Result" msgstr "" #: meld/resources/ui/findbar.ui:38 msgid "Next Result" msgstr "" #: meld/resources/ui/findbar.ui:69 msgid "Find" msgstr "" #: meld/resources/ui/findbar.ui:86 msgid "Replace" msgstr "" #: meld/resources/ui/findbar.ui:108 msgid "_Match case" msgstr "" #: meld/resources/ui/findbar.ui:124 msgid "Who_le word" msgstr "" #: meld/resources/ui/findbar.ui:140 msgid "Regular e_xpression" msgstr "" #: meld/resources/ui/findbar.ui:181 msgid "Wrapped" msgstr "" #: meld/resources/ui/findbar.ui:199 msgid "Replace _All" msgstr "" #: meld/resources/ui/findbar.ui:214 meld/dirdiff.py:1278 meld/iohelpers.py:117 msgid "_Replace" msgstr "" #: meld/resources/ui/findbar.ui:232 msgid "Switch between Find and Find-and-Replace" msgstr "" #: meld/resources/ui/language-selector.ui:31 msgid "Search highlight mode…" msgstr "" #: meld/resources/ui/new-diff-tab.ui:21 meld/meldwindow.py:352 #: meld/newdifftab.py:49 msgid "New comparison" msgstr "" #: meld/resources/ui/new-diff-tab.ui:76 msgid "File" msgstr "" #: meld/resources/ui/new-diff-tab.ui:126 msgid "Folder" msgstr "" #: meld/resources/ui/new-diff-tab.ui:176 msgid "Version control" msgstr "" #: meld/resources/ui/new-diff-tab.ui:243 meld/resources/ui/new-diff-tab.ui:364 msgid "_3-way comparison" msgstr "" #: meld/resources/ui/new-diff-tab.ui:263 msgid "Select First File" msgstr "" #: meld/resources/ui/new-diff-tab.ui:277 msgid "Select Second File" msgstr "" #: meld/resources/ui/new-diff-tab.ui:292 msgid "Select Third File" msgstr "" #: meld/resources/ui/new-diff-tab.ui:328 msgid "Select First Folder" msgstr "" #: meld/resources/ui/new-diff-tab.ui:341 msgid "Select Second Folder" msgstr "" #: meld/resources/ui/new-diff-tab.ui:355 msgid "Select Third Folder" msgstr "" #: meld/resources/ui/new-diff-tab.ui:406 msgid "Select A Version-Controlled Folder" msgstr "" #: meld/resources/ui/new-diff-tab.ui:455 msgid "_Blank comparison" msgstr "" #: meld/resources/ui/new-diff-tab.ui:473 msgid "C_ompare" msgstr "" #: meld/resources/ui/notebook-label.ui:26 msgid "Close Tab" msgstr "" #: meld/resources/ui/patch-dialog.ui:9 msgid "Format as Patch" msgstr "" #: meld/resources/ui/patch-dialog.ui:26 msgid "Copy to Clipboard" msgstr "" #: meld/resources/ui/patch-dialog.ui:57 meld/patchdialog.py:159 msgid "Save Patch" msgstr "" #: meld/resources/ui/patch-dialog.ui:88 msgid "Use differences between:" msgstr "" #: meld/resources/ui/patch-dialog.ui:105 msgid "Left and middle panes" msgstr "" #: meld/resources/ui/patch-dialog.ui:123 msgid "Middle and right panes" msgstr "" #: meld/resources/ui/patch-dialog.ui:149 msgid "_Reverse patch direction" msgstr "" #: meld/resources/ui/path-label.ui:23 msgid "Path" msgstr "" #: meld/resources/ui/path-label.ui:65 msgid "Copy Path" msgstr "" #: meld/resources/ui/path-label.ui:70 msgid "Copy the full path" msgstr "" #: meld/resources/ui/path-label.ui:86 msgid "View the folder in file manager" msgstr "" #: meld/resources/ui/preferences.ui:22 meld/resources/ui/preferences.ui:31 msgid "Preferences" msgstr "" #: meld/resources/ui/preferences.ui:75 msgid "Font" msgstr "" #: meld/resources/ui/preferences.ui:112 msgid "_Use the system fixed width font" msgstr "" #: meld/resources/ui/preferences.ui:136 msgid "_Editor font:" msgstr "" #. TRANSLATORS: This is the status bar label for a group of settings, #. such as text wrapping, show line numbers, whitespace, etc. #: meld/resources/ui/preferences.ui:199 meld/ui/statusbar.py:293 msgid "Display" msgstr "" #: meld/resources/ui/preferences.ui:245 msgid "_Tab width:" msgstr "" #: meld/resources/ui/preferences.ui:278 msgid "_Insert spaces instead of tabs" msgstr "" #: meld/resources/ui/preferences.ui:294 msgid "Enable text _wrapping" msgstr "" #: meld/resources/ui/preferences.ui:316 msgid "Do not _split words over two lines" msgstr "" #: meld/resources/ui/preferences.ui:337 msgid "Highlight _current line" msgstr "" #: meld/resources/ui/preferences.ui:353 msgid "Show _line numbers" msgstr "" #: meld/resources/ui/preferences.ui:369 msgid "Show w_hitespace" msgstr "" #: meld/resources/ui/preferences.ui:385 msgid "Prefer dark theme" msgstr "" #: meld/resources/ui/preferences.ui:401 msgid "Use s_yntax highlighting" msgstr "" #: meld/resources/ui/preferences.ui:425 msgid "Syntax highlighting color scheme:" msgstr "" #: meld/resources/ui/preferences.ui:490 msgid "Code Overview" msgstr "" #: meld/resources/ui/preferences.ui:527 msgid "Show overview map" msgstr "" #: meld/resources/ui/preferences.ui:551 msgid "Overview map style:" msgstr "" #: meld/resources/ui/preferences.ui:619 msgid "External Editor" msgstr "" #: meld/resources/ui/preferences.ui:657 msgid "Use _default system editor" msgstr "" #: meld/resources/ui/preferences.ui:681 msgid "Edito_r command:" msgstr "" #: meld/resources/ui/preferences.ui:737 msgid "Editor" msgstr "" #: meld/resources/ui/preferences.ui:760 msgid "Shallow Comparison" msgstr "" #: meld/resources/ui/preferences.ui:798 msgid "C_ompare files based only on size and timestamp" msgstr "" #: meld/resources/ui/preferences.ui:822 msgid "_Timestamp resolution:" msgstr "" #: meld/resources/ui/preferences.ui:886 msgid "Note: enabling text filters may make comparing large files much slower" msgstr "" #: meld/resources/ui/preferences.ui:936 msgid "Symbolic Links" msgstr "" #: meld/resources/ui/preferences.ui:1006 msgid "Visible Columns" msgstr "" #: meld/resources/ui/preferences.ui:1075 msgid "Folder Comparisons" msgstr "" #: meld/resources/ui/preferences.ui:1099 msgid "Version Comparisons" msgstr "" #: meld/resources/ui/preferences.ui:1145 msgid "_Order when comparing file revisions:" msgstr "" #: meld/resources/ui/preferences.ui:1193 msgid "Order when _merging files:" msgstr "" #: meld/resources/ui/preferences.ui:1262 msgid "Commit Messages" msgstr "" #: meld/resources/ui/preferences.ui:1306 msgid "Show _right margin at:" msgstr "" #: meld/resources/ui/preferences.ui:1347 msgid "Automatically _break lines at right margin on commit" msgstr "" #: meld/resources/ui/preferences.ui:1397 msgid "Version Control" msgstr "" #: meld/resources/ui/preferences.ui:1421 msgid "Filename filters" msgstr "" #. Translators: 'filter out' refers to removing matched files and folders from the display #: meld/resources/ui/preferences.ui:1461 msgid "" "When performing directory comparisons, you may filter out files and " "directories by name. Each pattern is a list of shell style wildcards " "separated by spaces." msgstr "" #: meld/resources/ui/preferences.ui:1530 msgid "Change trimming" msgstr "" #: meld/resources/ui/preferences.ui:1568 msgid "Trim blank line differences from the start and end of changes" msgstr "" #: meld/resources/ui/preferences.ui:1613 msgid "Text filters" msgstr "" #: meld/resources/ui/preferences.ui:1653 msgid "" "When performing file comparisons, you may ignore certain types of changes. " "Each pattern here is a python regular expression which replaces matching " "text with the empty string before comparison is performed. If the expression " "contains groups, only the groups are replaced. See the user manual for more " "details." msgstr "" #: meld/resources/ui/preferences.ui:1744 msgid "Left is remote, right is local" msgstr "" #: meld/resources/ui/preferences.ui:1748 msgid "Left is local, right is remote" msgstr "" #: meld/resources/ui/preferences.ui:1762 msgid "Simple change map" msgstr "" #: meld/resources/ui/preferences.ui:1766 msgid "Compact source map" msgstr "" #: meld/resources/ui/preferences.ui:1770 msgid "Full source map" msgstr "" #: meld/resources/ui/preferences.ui:1784 msgid "Remote, merge, local" msgstr "" #: meld/resources/ui/preferences.ui:1788 msgid "Local, merge, remote" msgstr "" #: meld/resources/ui/preferences.ui:1810 msgid "1ns (ext4)" msgstr "" #: meld/resources/ui/preferences.ui:1814 msgid "100ns (NTFS)" msgstr "" #: meld/resources/ui/preferences.ui:1818 msgid "1s (ext2/ext3)" msgstr "" #: meld/resources/ui/preferences.ui:1822 msgid "2s (VFAT)" msgstr "" #: meld/resources/ui/preferences.ui:1826 msgid "Ignore timestamp" msgstr "" #: meld/resources/ui/push-dialog.ui:9 msgid "Push local commits to remote?" msgstr "" #: meld/resources/ui/push-dialog.ui:10 msgid "The commits to be pushed are determined by your version control system." msgstr "" #: meld/resources/ui/push-dialog.ui:38 msgid "_Push commits" msgstr "" #: meld/resources/ui/recent-selector.ui:16 msgid "Search recent comparisons…" msgstr "" #: meld/resources/ui/recent-selector.ui:43 msgid "_Open" msgstr "" #: meld/resources/ui/revert-dialog.ui:9 msgid "Discard unsaved changes to documents?" msgstr "" #: meld/resources/ui/revert-dialog.ui:10 msgid "Changes made to the following documents will be permanently lost:" msgstr "" #: meld/resources/ui/revert-dialog.ui:38 msgid "_Discard" msgstr "" #: meld/resources/ui/save-confirm-dialog.ui:9 msgid "Save changes to documents before closing?" msgstr "" #: meld/resources/ui/save-confirm-dialog.ui:10 msgid "If you don’t save, changes will be permanently lost." msgstr "" #: meld/resources/ui/save-confirm-dialog.ui:24 msgid "Close _without Saving" msgstr "" #: meld/resources/ui/save-confirm-dialog.ui:55 msgid "_Save" msgstr "" #: meld/resources/ui/statusbar-menu.ui:9 msgid "Show whitespace" msgstr "" #: meld/resources/ui/statusbar-menu.ui:17 msgid "Text wrapping" msgstr "" #: meld/resources/ui/vcview-menus.ui:7 msgid "_Compare" msgstr "" #: meld/resources/ui/vcview-menus.ui:11 msgid "Co_mmit…" msgstr "" #: meld/resources/ui/vcview-menus.ui:26 msgid "Re_vert" msgstr "" #: meld/resources/ui/vcview-menus.ui:30 msgid "Delete" msgstr "" #: meld/resources/ui/vcview-menus.ui:37 msgid "Resolve Conflict" msgstr "" #: meld/resources/ui/vcview.ui:17 msgid "Commit changes to version control" msgstr "" #: meld/resources/ui/vcview.ui:22 msgid "Commit…" msgstr "" #: meld/resources/ui/vcview.ui:39 msgid "Pull remote changes to the local repository" msgstr "" #: meld/resources/ui/vcview.ui:52 msgid "Push local changes to remote" msgstr "" #: meld/resources/ui/vcview.ui:75 msgid "Add to version control" msgstr "" #: meld/resources/ui/vcview.ui:88 msgid "Remove from version control" msgstr "" #: meld/resources/ui/vcview.ui:101 msgid "Revert working copy to original state" msgstr "" #: meld/resources/ui/vcview.ui:114 msgid "Mark as resolved in version control" msgstr "" #: meld/resources/ui/vcview.ui:140 msgid "Open version controlled folder in this pane" msgstr "" #: meld/resources/ui/vcview.ui:229 msgid "Location" msgstr "" #: meld/resources/ui/vcview.ui:238 msgid "Status" msgstr "" #: meld/resources/ui/vcview.ui:247 msgid "Extra" msgstr "" #: meld/resources/ui/vcview.ui:279 msgid "Console output" msgstr "" #: meld/actiongutter.py:265 msgid "Copy _up" msgstr "" #: meld/actiongutter.py:266 msgid "Copy _down" msgstr "" #: meld/const.py:34 msgid "UNIX (LF)" msgstr "" #: meld/const.py:35 msgid "DOS/Windows (CR-LF)" msgstr "" #: meld/const.py:36 msgid "Mac OS (CR)" msgstr "" #. Create file size CellRenderer #: meld/dirdiff.py:640 meld/preferences.py:132 msgid "Size" msgstr "" #. Create date-time CellRenderer #: meld/dirdiff.py:648 meld/preferences.py:133 msgid "Modification time" msgstr "" #. Create ISO-format date-time CellRenderer #: meld/dirdiff.py:656 meld/preferences.py:134 msgid "Modification time (ISO)" msgstr "" #. Create permissions CellRenderer #: meld/dirdiff.py:664 meld/preferences.py:135 msgid "Permissions" msgstr "" #: meld/dirdiff.py:917 #, python-brace-format msgid "{filename} (scanning…)" msgstr "" #: meld/dirdiff.py:948 meld/dirdiff.py:981 #, python-brace-format msgid "[{label}] Scanning {folder}" msgstr "" #: meld/dirdiff.py:1122 #, python-brace-format msgid "[{label}] Done" msgstr "" #: meld/dirdiff.py:1135 msgid "Folder {} is being compared to itself" msgstr "" #: meld/dirdiff.py:1141 msgid "Folders have no differences" msgstr "" #: meld/dirdiff.py:1143 msgid "Contents of scanned files in folders are identical." msgstr "" #: meld/dirdiff.py:1145 msgid "" "Scanned files in folders appear identical, but contents have not been " "scanned." msgstr "" #: meld/dirdiff.py:1148 msgid "File filters are in use, so not all files have been scanned." msgstr "" #: meld/dirdiff.py:1150 msgid "Text filters are in use and may be masking content differences." msgstr "" #: meld/dirdiff.py:1166 meld/filediff.py:2122 msgid "Hide" msgstr "" #: meld/dirdiff.py:1168 meld/filediff.py:2124 meld/filediff.py:2154 #: meld/filediff.py:2156 meld/ui/msgarea.py:127 meld/ui/msgarea.py:140 msgid "Hi_de" msgstr "" #: meld/dirdiff.py:1179 msgid "Multiple errors occurred while scanning this folder" msgstr "" #: meld/dirdiff.py:1180 msgid "Files with invalid encodings found" msgstr "" #. TRANSLATORS: This is followed by a list of files #: meld/dirdiff.py:1182 msgid "Some files were in an incorrect encoding. The names are something like:" msgstr "" #: meld/dirdiff.py:1184 msgid "Files hidden by case insensitive comparison" msgstr "" #. TRANSLATORS: This is followed by a list of files #: meld/dirdiff.py:1186 msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. The following files in this folder are hidden:" msgstr "" #: meld/dirdiff.py:1189 msgid "Files had mismatched leading or trailing whitespace" msgstr "" #: meld/dirdiff.py:1192 msgid "" "This comparison found some files that differed only in leading or trailing " "whitespace. Their names appear as:" msgstr "" #: meld/dirdiff.py:1203 #, python-brace-format msgid "“{first_file}” hidden by “{second_file}”" msgstr "" #: meld/dirdiff.py:1283 #, python-format msgid "Replace folder “%s”?" msgstr "" #: meld/dirdiff.py:1285 #, python-format msgid "" "Another folder with the same name already exists in “%s”.\n" "If you replace the existing folder, all files in it will be lost." msgstr "" #: meld/dirdiff.py:1298 msgid "Error copying file" msgstr "" #: meld/dirdiff.py:1299 #, python-brace-format msgid "" "Couldn’t copy {source}\n" "to {dest}.\n" "\n" "{error}" msgstr "" #: meld/dirdiff.py:1324 meld/vcview.py:771 msgid "Error deleting {}" msgstr "" #: meld/dirdiff.py:1883 msgid "No folder" msgstr "" #: meld/dirdiff.py:1896 msgid "Folder comparison:" msgstr "" #: meld/externalhelpers.py:107 msgid "Failed to launch custom editor" msgstr "" #: meld/externalhelpers.py:120 msgid "Unsupported file type" msgstr "" #: meld/externalhelpers.py:121 #, python-brace-format msgid "External opening of files of type {file_type} is not supported" msgstr "" #: meld/filediff.py:1198 msgid "Comparison results will be inaccurate" msgstr "" #: meld/filediff.py:1200 msgid "" "A filter changed the number of lines in the file, which is unsupported. The " "comparison will not be accurate." msgstr "" #: meld/filediff.py:1271 msgid "Mark conflict as resolved?" msgstr "" #: meld/filediff.py:1273 msgid "" "If the conflict was resolved successfully, you may mark it as resolved now." msgstr "" #: meld/filediff.py:1276 msgid "Cancel" msgstr "" #: meld/filediff.py:1277 msgid "Mark _Resolved" msgstr "" #: meld/filediff.py:1474 meld/filediff.py:1490 msgid "Add Synchronization Point" msgstr "" #: meld/filediff.py:1478 msgid "Remove Synchronization Point" msgstr "" #: meld/filediff.py:1482 msgid "Move Synchronization Point" msgstr "" #: meld/filediff.py:1486 msgid "Match Synchronization Point" msgstr "" #: meld/filediff.py:1510 msgid "Clear Synchronization Points" msgstr "" #: meld/filediff.py:1570 meld/imagediff.py:254 msgid "File comparison:" msgstr "" #: meld/filediff.py:1716 #, python-brace-format msgid "" "Line {line_number} exceeded maximum line length ({line_length} > " "{LINE_LENGTH_LIMIT})" msgstr "" #: meld/filediff.py:1766 #, python-format msgid "There was a problem opening the file “%s”." msgstr "" #: meld/filediff.py:1788 #, python-format msgid "File %s appears to be a binary file." msgstr "" #: meld/filediff.py:1790 msgid "Do you want to open the file using the default application?" msgstr "" #: meld/filediff.py:1792 msgid "Open" msgstr "" #: meld/filediff.py:1814 #, python-format msgid "[%s] Merging files" msgstr "" #: meld/filediff.py:1828 #, python-format msgid "[%s] Computing differences" msgstr "" #: meld/filediff.py:1892 #, python-format msgid "File %s has changed on disk" msgstr "" #: meld/filediff.py:1893 msgid "Do you want to reload the file?" msgstr "" #: meld/filediff.py:1895 msgid "_Reload" msgstr "" #: meld/filediff.py:2080 msgid "File {} is being compared to itself" msgstr "" #: meld/filediff.py:2088 msgid "Files are identical" msgstr "" #: meld/filediff.py:2101 msgid "" "Text filters are being used, and may be masking differences between files. " "Would you like to compare the unfiltered files?" msgstr "" #: meld/filediff.py:2106 msgid "Files differ in line endings only" msgstr "" #: meld/filediff.py:2108 #, python-format msgid "" "Files are identical except for differing line endings:\n" "%s" msgstr "" #: meld/filediff.py:2127 msgid "Show without filters" msgstr "" #: meld/filediff.py:2148 msgid "Change highlighting incomplete" msgstr "" #: meld/filediff.py:2149 msgid "" "Some changes were not highlighted because they were too large. You can force " "Meld to take longer to highlight larger changes, though this may be slow." msgstr "" #: meld/filediff.py:2158 msgid "Keep highlighting" msgstr "" #: meld/filediff.py:2160 msgid "_Keep highlighting" msgstr "" #: meld/filediff.py:2173 msgid "Saving failed" msgstr "" #: meld/filediff.py:2174 msgid "" "Please consider copying any critical changes to another program or file to " "avoid data loss." msgstr "" #: meld/filediff.py:2183 msgid "Save Left Pane As" msgstr "" #: meld/filediff.py:2185 msgid "Save Middle Pane As" msgstr "" #: meld/filediff.py:2187 msgid "Save Right Pane As" msgstr "" #: meld/filediff.py:2198 #, python-format msgid "File %s has changed on disk since it was opened" msgstr "" #: meld/filediff.py:2200 msgid "If you save it, any external changes will be lost." msgstr "" #: meld/filediff.py:2204 msgid "Save Anyway" msgstr "" #: meld/filediff.py:2205 msgid "Don’t Save" msgstr "" #: meld/filediff.py:2247 msgid "" "File “{}” contains characters that can’t be encoded using its current " "encoding “{}”." msgstr "" #: meld/filediff.py:2251 meld/patchdialog.py:138 #, python-format msgid "" "Couldn’t save file due to:\n" "%s" msgstr "" #: meld/filediff.py:2255 meld/patchdialog.py:137 #, python-format msgid "Could not save file %s." msgstr "" #: meld/filediff.py:2664 msgid "Live comparison updating disabled" msgstr "" #: meld/filediff.py:2665 msgid "" "Live updating of comparisons is disabled when synchronization points are " "active. You can still manually refresh the comparison, and live updates will " "resume when synchronization points are cleared." msgstr "" #: meld/filediff.py:2694 msgid "Can't swap unsaved files" msgstr "" #: meld/filediff.py:2696 msgid "Files must be saved to disk before swapping panes." msgstr "" #: meld/filediff.py:2703 msgid "Can't swap version control comparisons" msgstr "" #: meld/filediff.py:2705 msgid "Swapping panes is not supported in version control mode." msgstr "" #: meld/iohelpers.py:41 msgid "Deleting remote folders is not supported" msgstr "" #: meld/iohelpers.py:43 msgid "Not a file or directory" msgstr "" #: meld/iohelpers.py:47 msgid "“{}” can’t be put in the trash. Do you want to delete it immediately?" msgstr "" #: meld/iohelpers.py:52 msgid "This remote location does not support sending items to the trash." msgstr "" #: meld/iohelpers.py:58 msgid "_Delete Permanently" msgstr "" #: meld/iohelpers.py:110 #, python-format msgid "Replace file “%s”?" msgstr "" #: meld/iohelpers.py:112 #, python-format msgid "" "A file with this name already exists in “%s”.\n" "If you replace the existing file, its contents will be lost." msgstr "" #: meld/meldapp.py:188 msgid "wrong number of arguments supplied to --diff" msgstr "" #: meld/meldapp.py:193 msgid "Start with an empty window" msgstr "" #: meld/meldapp.py:194 meld/meldapp.py:196 msgid "file" msgstr "" #: meld/meldapp.py:194 meld/meldapp.py:198 msgid "folder" msgstr "" #: meld/meldapp.py:195 msgid "Start a version control comparison" msgstr "" #: meld/meldapp.py:197 msgid "Start a 2- or 3-way file comparison" msgstr "" #: meld/meldapp.py:199 msgid "Start a 2- or 3-way folder comparison" msgstr "" #: meld/meldapp.py:205 msgid "" "\n" "\n" "For file comparisons, the special argument @blank may be used instead of\n" "a argument to create a blank pane." msgstr "" #: meld/meldapp.py:249 #, python-format msgid "Error: %s\n" msgstr "" #: meld/meldapp.py:256 msgid "Meld is a file and directory comparison tool." msgstr "" #: meld/meldapp.py:260 msgid "Set label to use instead of file name" msgstr "" #: meld/meldapp.py:263 msgid "Open a new tab in an already running instance" msgstr "" #: meld/meldapp.py:266 msgid "Automatically compare all differing files on startup" msgstr "" #: meld/meldapp.py:269 msgid "Ignored for compatibility" msgstr "" #: meld/meldapp.py:273 msgid "Set the target file for saving a merge result" msgstr "" #: meld/meldapp.py:276 msgid "Automatically merge files" msgstr "" #: meld/meldapp.py:280 msgid "Load a saved comparison from a Meld comparison file" msgstr "" #: meld/meldapp.py:284 msgid "Create a diff tab for the supplied files or folders" msgstr "" #: meld/meldapp.py:304 #, python-format msgid "too many arguments (wanted 0-3, got %d)" msgstr "" #: meld/meldapp.py:307 msgid "can’t auto-merge less than 3 files" msgstr "" #: meld/meldapp.py:309 msgid "can’t auto-merge directories" msgstr "" #: meld/meldapp.py:324 msgid "Error reading saved comparison file" msgstr "" #: meld/meldapp.py:352 #, python-format msgid "invalid path or URI “%s”" msgstr "" #: meld/meldapp.py:359 msgid "remote folder “{}” not supported" msgstr "" #. TRANSLATORS: This is the label of a new, currently-unnamed file. #: meld/meldbuffer.py:125 msgid "" msgstr "" #: meld/melddoc.py:39 msgid "untitled" msgstr "" #: meld/meldwindow.py:161 msgid "Filename" msgstr "" #: meld/meldwindow.py:397 #, python-format msgid "Need three files to auto-merge, got: %r" msgstr "" #: meld/meldwindow.py:427 msgid "Cannot compare a mixture of files and directories" msgstr "" #: meld/misc.py:154 msgid "" "{}\n" "\n" "Meld encountered a critical error while running:\n" "{}" msgstr "" #: meld/misc.py:205 msgid "[None]" msgstr "" #: meld/preferences.py:37 meld/preferences.py:129 msgid "label" msgstr "" #: meld/preferences.py:37 meld/preferences.py:129 msgid "pattern" msgstr "" #: meld/recent.py:119 msgid "Version control:" msgstr "" #: meld/style.py:97 msgid "Couldn’t find color scheme details for {}; this is a bad install" msgstr "" #: meld/ui/bufferselectors.py:110 #, python-brace-format msgid "{name} ({charset})" msgstr "" #: meld/ui/bufferselectors.py:140 meld/ui/bufferselectors.py:148 msgid "Plain Text" msgstr "" #: meld/ui/pathlabel.py:36 msgid "Unnamed file" msgstr "" #. Abbreviation for line, column so that it will fit in the status bar #: meld/ui/statusbar.py:125 #, python-brace-format msgid "Ln {line}, Col {column}" msgstr "" #: meld/ui/statusbar.py:187 msgid "Line you want to move the cursor to" msgstr "" #: meld/ui/vcdialogs.py:50 msgid "No files will be committed" msgstr "" #. Translators: First element is replaced by translated "%d #. unpushed commits", second element is replaced by translated #. "%d branches" #: meld/vc/git.py:93 #, python-brace-format msgid "{unpushed_commits} in {unpushed_branches}" msgstr "" #: meld/vc/git.py:95 meld/vc/git.py:105 #, python-format msgid "%d unpushed commit" msgid_plural "%d unpushed commits" msgstr[0] "" msgstr[1] "" #: meld/vc/git.py:98 #, python-format msgid "%d branch" msgid_plural "%d branches" msgstr[0] "" msgstr[1] "" #: meld/vc/git.py:353 #, python-brace-format msgid "Mode changed from {old_mode} to {new_mode}" msgstr "" #: meld/vc/git.py:361 msgid "Partially staged" msgstr "" #: meld/vc/git.py:361 msgid "Staged" msgstr "" #. Translators: This is the displayed name of a version control system #. when no version control system is actually found. #: meld/vc/_null.py:38 msgid "None" msgstr "" #: meld/vc/svn.py:203 #, python-format msgid "Rev %s" msgstr "" #: meld/vc/_vc.py:55 msgid "Merged" msgstr "" #: meld/vc/_vc.py:55 msgid "Base" msgstr "" #: meld/vc/_vc.py:55 msgid "Local" msgstr "" #: meld/vc/_vc.py:55 msgid "Remote" msgstr "" #: meld/vc/_vc.py:74 msgid "Error" msgstr "" #: meld/vc/_vc.py:76 msgid "Newly added" msgstr "" #: meld/vc/_vc.py:78 msgid "Renamed" msgstr "" #: meld/vc/_vc.py:79 msgid "Conflict" msgstr "" #: meld/vc/_vc.py:80 msgid "Removed" msgstr "" #: meld/vc/_vc.py:81 msgid "Missing" msgstr "" #: meld/vc/_vc.py:82 msgid "Not present" msgstr "" #: meld/vc/_vc.py:83 msgid "Scanning…" msgstr "" #. Translators: This error message is shown when no #. repository of this type is found. #: meld/vcview.py:335 #, python-format msgid "%(name)s (not found)" msgstr "" #. Translators: This error message is shown when a version #. control binary isn't installed. #: meld/vcview.py:339 #, python-format msgid "%(name)s (%(cmd)s not installed)" msgstr "" #. Translators: This error message is shown when a version #. controlled repository is invalid. #: meld/vcview.py:343 #, python-format msgid "%(name)s (invalid repository)" msgstr "" #: meld/vcview.py:357 msgid "No valid version control system found in this folder" msgstr "" #: meld/vcview.py:359 msgid "Choose which version control system to use" msgstr "" #. TRANSLATORS: This is the name of the version control #. system being used, e.g., "Git" or "Subversion" #: meld/vcview.py:417 #, python-brace-format msgid "{vc} comparison:" msgstr "" #. Initial yield so when we add this to our tasks, we don't #. create iterators that may be invalidated. #: meld/vcview.py:426 msgid "Scanning repository" msgstr "" #: meld/vcview.py:455 #, python-format msgid "Scanning %s" msgstr "" #: meld/vcview.py:494 msgid "(Empty)" msgstr "" #: meld/vcview.py:542 #, python-format msgid "%s — local" msgstr "" #: meld/vcview.py:543 #, python-format msgid "%s — remote" msgstr "" #: meld/vcview.py:551 #, python-format msgid "%s (local, merge, remote)" msgstr "" #: meld/vcview.py:556 #, python-format msgid "%s (remote, merge, local)" msgstr "" #: meld/vcview.py:567 #, python-format msgid "%s — repository" msgstr "" #: meld/vcview.py:573 #, python-format msgid "%s (working, repository)" msgstr "" #: meld/vcview.py:577 #, python-format msgid "%s (repository, working)" msgstr "" #: meld/vcview.py:742 msgid "Remove folder and all its files?" msgstr "" #: meld/vcview.py:744 msgid "" "This will remove all selected files and folders, and all files within any " "selected folders, from version control." msgstr "" #: meld/vcview.py:858 msgid "Clear" msgstr ""