# English/Canada translation of meld. # Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation # This file is distributed under the same licence as the meld package. # Adam Weinberger , 2004, 2005. # # msgid "" msgstr "" "Project-Id-Version: meld\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-03 20:02-0500\n" "PO-Revision-Date: 2005-06-23 16:51-0400\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: dirdiff.py:250 dirdiff.py:265 #, python-format msgid "Error converting pattern '%s' to regular expression" msgstr "Error converting pattern '%s' to regular expression" #: dirdiff.py:281 #, python-format msgid "Hide %s" msgstr "Hide %s" #: dirdiff.py:361 dirdiff.py:370 vcview.py:212 vcview.py:240 #, python-format msgid "[%s] Scanning %s" msgstr "[%s] Scanning %s" #: dirdiff.py:403 #, python-format msgid "'%s' hidden by '%s'" msgstr "'%s' hidden by '%s'" #: dirdiff.py:409 #, python-format msgid "" "You are running a case insensitive comparison on a case sensitive " "filesystem. Some files are not visible:\n" "%s" msgstr "" "You are running a case-insensitive comparison on a case-sensitive " "filesystem. Some files are not visible:\n" "%s" #: dirdiff.py:478 #, python-format msgid "[%s] Done" msgstr "[%s] Done" #: dirdiff.py:524 #, python-format msgid "" "'%s' exists.\n" "Overwrite?" msgstr "" "'%s' exists.\n" "Overwrite?" #: dirdiff.py:531 #, python-format msgid "" "Error copying '%s' to '%s'\n" "\n" "%s." msgstr "" "Error copying '%s' to '%s'\n" "\n" "%s." #: dirdiff.py:549 vcview.py:403 #, python-format msgid "" "'%s' is a directory.\n" "Remove recusively?" msgstr "" "'%s' is a directory.\n" "Remove recusively?" #: dirdiff.py:556 vcview.py:408 #, python-format msgid "" "Error removing %s\n" "\n" "%s." msgstr "" "Error removing %s\n" "\n" "%s." #: dirdiff.py:567 #, python-format msgid "%i second" msgid_plural "%i seconds" msgstr[0] "%i second" msgstr[1] "%i seconds" #: dirdiff.py:568 #, python-format msgid "%i minute" msgid_plural "%i minutes" msgstr[0] "%i minute" msgstr[1] "%i minutes" #: dirdiff.py:569 #, python-format msgid "%i hour" msgid_plural "%i hours" msgstr[0] "%i hour" msgstr[1] "%i hours" #: dirdiff.py:570 #, python-format msgid "%i day" msgid_plural "%i days" msgstr[0] "%i day" msgstr[1] "%i days" #: dirdiff.py:571 #, python-format msgid "%i week" msgid_plural "%i weeks" msgstr[0] "%i week" msgstr[1] "%i weeks" #: dirdiff.py:572 #, python-format msgid "%i month" msgid_plural "%i months" msgstr[0] "%i month" msgstr[1] "%i months" #: dirdiff.py:573 #, python-format msgid "%i year" msgid_plural "%i years" msgstr[0] "%i year" msgstr[1] "%i years" #. Abbreviation for insert,overwrite so that it will fit in the status bar #: filediff.py:214 msgid "INS,OVR" msgstr "INS,OVR" #. Abbreviation for line, column so that it will fit in the status bar #: filediff.py:216 #, python-format msgid "Ln %i, Col %i" msgstr "Ln %i, Col %i" #: filediff.py:274 #, python-format msgid "" "Regular expression '%s' changed the number of lines in the file. Comparison " "will be incorrect. See the user manual for more details." msgstr "" "Regular expression '%s' changed the number of lines in the file. Comparison " "will be incorrect. See the user manual for more details." #: filediff.py:520 #, python-format msgid "" "Regular expression error\n" "'%s'" msgstr "" "Regular expression error\n" "'%s'" #: filediff.py:532 #, python-format msgid "The regular expression '%s' was not found." msgstr "The regular expression '%s' was not found." #: filediff.py:534 #, python-format msgid "The text '%s' was not found." msgstr "The text '%s' was not found." #: filediff.py:578 #, python-format msgid "[%s] Set num panes" msgstr "[%s] Set num panes" #: filediff.py:585 #, python-format msgid "[%s] Opening files" msgstr "[%s] Opening files" #: filediff.py:602 filediff.py:616 filediff.py:632 filediff.py:639 #, python-format msgid "Could not read from '%s'" msgstr "Could not read from '%s'" #: filediff.py:603 filediff.py:640 msgid "The error was:" msgstr "The error was:" #: filediff.py:608 #, python-format msgid "[%s] Reading files" msgstr "[%s] Reading files" #: filediff.py:617 msgid "" "It contains ascii nulls.\n" "Perhaps it is a binary file." msgstr "" "It contains ASCII NULLs.\n" "Perhaps it is a binary file." #: filediff.py:633 #, python-format msgid "I tried encodings %s." msgstr "I tried encodings %s." #: filediff.py:662 #, python-format msgid "[%s] Computing differences" msgstr "[%s] Computing differences" #: filediff.py:766 #, python-format msgid "" "\"%s\" exists!\n" "Overwrite?" msgstr "" "\"%s\" exists!\n" "Overwrite?" #: filediff.py:779 #, python-format msgid "" "Error writing to %s\n" "\n" "%s." msgstr "" "Error writing to %s\n" "\n" "%s." #: filediff.py:788 #, python-format msgid "Choose a name for buffer %i." msgstr "Choose a name for buffer %i." #: filediff.py:801 #, python-format msgid "" "This file '%s' contains a mixture of line endings.\n" "\n" "Which format would you like to use?" msgstr "" "This file '%s' contains a mixture of line endings.\n" "\n" "Which format would you like to use?" #: filediff.py:817 #, python-format msgid "" "'%s' contains characters not encodable with '%s'\n" "Would you like to save as UTF-8?" msgstr "" "'%s' contains characters not encodable with '%s'\n" "Would you like to save as UTF-8?" #. save as #: filediff.py:852 msgid "Save patch as..." msgstr "Save patch as..." #: filediff.py:906 #, python-format msgid "" "Refreshing will discard changes in:\n" "%s\n" "\n" "You cannot undo this operation." msgstr "" "Refreshing will discard changes in:\n" "%s\n" "\n" "You cannot undo this operation." #: glade2/dirdiff.glade.h:1 msgid "Case" msgstr "Case" #: glade2/dirdiff.glade.h:2 msgid "Compare" msgstr "Compare" #: glade2/dirdiff.glade.h:3 glade2/vcview.glade.h:6 msgid "Compare selected" msgstr "Compare selected" #: glade2/dirdiff.glade.h:4 msgid "Copy To Left" msgstr "Copy To Left" #: glade2/dirdiff.glade.h:5 msgid "Copy To Right" msgstr "Copy To Right" #: glade2/dirdiff.glade.h:6 msgid "Delete selected" msgstr "Delete selected" #: glade2/dirdiff.glade.h:7 glade2/filediff.glade.h:7 msgid "Edit" msgstr "Edit" #: glade2/dirdiff.glade.h:8 msgid "Hide selected" msgstr "Hide selected" #: glade2/dirdiff.glade.h:9 msgid "Hide..." msgstr "Hide..." #: glade2/dirdiff.glade.h:10 msgid "Ignore case of entries" msgstr "Ignore case of entries" #: glade2/dirdiff.glade.h:11 msgid "Left" msgstr "Left" #: glade2/dirdiff.glade.h:12 msgid "Modified" msgstr "Modified" #: glade2/dirdiff.glade.h:13 msgid "New" msgstr "New" #: glade2/dirdiff.glade.h:14 msgid "Right" msgstr "Right" #: glade2/dirdiff.glade.h:15 msgid "Same" msgstr "Same" #: glade2/dirdiff.glade.h:16 msgid "Show identical" msgstr "Show identical" #: glade2/dirdiff.glade.h:17 glade2/vcview.glade.h:18 msgid "Show modified" msgstr "Show modified" #: glade2/dirdiff.glade.h:18 msgid "Show new" msgstr "Show new" #: glade2/dirdiff.glade.h:19 glade2/meldapp.glade.h:86 #: glade2/vcview.glade.h:25 msgid "_Compare" msgstr "_Compare" #: glade2/dirdiff.glade.h:20 msgid "_Delete Selected" msgstr "_Delete Selected" #: glade2/filediff.glade.h:1 msgid "" "Some files have been modified.\n" "Which ones would you like to save?" msgstr "" "Some files have been modified.\n" "Which ones would you like to save?" #: glade2/filediff.glade.h:3 msgid "Copy All To _Left" msgstr "Copy All To _Left" #: glade2/filediff.glade.h:4 msgid "Copy All To _Right" msgstr "Copy All To _Right" #: glade2/filediff.glade.h:5 msgid "Copy to Clipboard" msgstr "Copy to Clipboard" #: glade2/filediff.glade.h:6 msgid "Create Patch" msgstr "Create Patch" #: glade2/filediff.glade.h:8 msgid "Find" msgstr "Find" #: glade2/filediff.glade.h:9 msgid "Match _entire word only" msgstr "Match _entire word only" #: glade2/filediff.glade.h:10 msgid "Regular e_xpression" msgstr "Regular e_xpression" #: glade2/filediff.glade.h:11 msgid "Save modified files?" msgstr "Save modified files?" #: glade2/filediff.glade.h:12 msgid "Search for:" msgstr "Search for:" #: glade2/filediff.glade.h:13 msgid "_Match case" msgstr "_Match case" #: glade2/filediff.glade.h:14 msgid "_Wrap around" msgstr "_Wrap around" #: glade2/meldapp.glade.h:1 msgid "(gnome-default-editor)" msgstr "(gnome-default-editor)" #: glade2/meldapp.glade.h:2 msgid "Drawing Style" msgstr "Drawing Style" #: glade2/meldapp.glade.h:3 msgid "Edit Menu" msgstr "Edit Menu" #: glade2/meldapp.glade.h:4 msgid "Font" msgstr "Font" #: glade2/meldapp.glade.h:5 msgid "Global options" msgstr "Global options" #: glade2/meldapp.glade.h:6 msgid "Loading" msgstr "Loading" #: glade2/meldapp.glade.h:7 msgid "Misc" msgstr "Misc" #: glade2/meldapp.glade.h:8 msgid "Saving" msgstr "Saving" #: glade2/meldapp.glade.h:9 msgid "Toolbar Appearance" msgstr "Toolbar Appearance" #: glade2/meldapp.glade.h:10 msgid "Update Options" msgstr "Update Options" #: glade2/meldapp.glade.h:11 msgid "Whitespace" msgstr "Whitespace" #: glade2/meldapp.glade.h:12 msgid "CVS" msgstr "CVS" #: glade2/meldapp.glade.h:13 msgid "Compare" msgstr "Compare" #: glade2/meldapp.glade.h:14 msgid "Display" msgstr "Display" #: glade2/meldapp.glade.h:15 msgid "Editor" msgstr "Editor" #: glade2/meldapp.glade.h:16 msgid "Encoding" msgstr "Encoding" #: glade2/meldapp.glade.h:17 msgid "File Filters" msgstr "File Filters" #: glade2/meldapp.glade.h:18 msgid "Text Filters" msgstr "Text Filters" #: glade2/meldapp.glade.h:19 msgid "Automatically supply missing newline at end of file." msgstr "Automatically supply missing newline at end of file." #: glade2/meldapp.glade.h:20 msgid "CVS" msgstr "CVS" #: glade2/meldapp.glade.h:21 msgid "CVS Directory" msgstr "CVS Directory" #: glade2/meldapp.glade.h:22 msgid "CVS binary" msgstr "CVS binary" #: glade2/meldapp.glade.h:23 msgid "Choose Files" msgstr "Choose Files" #: glade2/meldapp.glade.h:24 msgid "" "Choose how the central bar of the diff viewer is drawn. You may wish to " "choose a simpler mode if you find scrolling is slow." msgstr "" "Choose how the central bar of the diff viewer is drawn. You may wish to " "choose a simpler mode if you find scrolling is slow." #: glade2/meldapp.glade.h:25 msgid "Copyright (C) 2002 Stephen Kennedy" msgstr "Copyright (C) 2002 Stephen Kennedy" #: glade2/meldapp.glade.h:26 msgid "Create missing directories (-d)" msgstr "Create missing directories (-d)" #: glade2/meldapp.glade.h:27 msgid "Curved : Filled Curves" msgstr "Curved : Filled Curves" #: glade2/meldapp.glade.h:28 msgid "Custom command" msgstr "Custom command" #: glade2/meldapp.glade.h:29 msgid "Directory" msgstr "Directory" #: glade2/meldapp.glade.h:30 msgid "Display" msgstr "Display" #: glade2/meldapp.glade.h:31 msgid "Edit menu popup invokes" msgstr "Edit menu popup invokes" #: glade2/meldapp.glade.h:32 msgid "Editor" msgstr "Editor" #: glade2/meldapp.glade.h:33 msgid "Encoding" msgstr "Encoding" #: glade2/meldapp.glade.h:34 msgid "File Filters" msgstr "File Filters" #: glade2/meldapp.glade.h:35 msgid "Gnome Default" msgstr "Gnome Default" #: glade2/meldapp.glade.h:36 msgid "Gnome default editor" msgstr "Gnome default editor" #: glade2/meldapp.glade.h:37 msgid "Icons Only" msgstr "Icons Only" #: glade2/meldapp.glade.h:38 msgid "Ignore .cvsrc (-f)" msgstr "Ignore .cvsrc (-f)" #: glade2/meldapp.glade.h:39 msgid "Ignore changes in amount of white space" msgstr "Ignore changes in amount of white space" #: glade2/meldapp.glade.h:40 msgid "" "Ignore changes in case; consider upper and lower-case letters equivalent" msgstr "" "Ignore changes in case; consider upper and lower-case letters equivalent" #: glade2/meldapp.glade.h:41 msgid "Ignore changes that just insert or delete blank lines" msgstr "Ignore changes that just insert or delete blank lines" #: glade2/meldapp.glade.h:42 msgid "Ignore changes which insert or delete blank lines" msgstr "Ignore changes which insert or delete blank lines" #: glade2/meldapp.glade.h:43 msgid "Internal editor" msgstr "Internal editor" #: glade2/meldapp.glade.h:44 msgid "Line Wrapping " msgstr "Line Wrapping " #: glade2/meldapp.glade.h:45 msgid "Locate CVS binary : Meld" msgstr "Locate CVS binary : Meld" #: glade2/meldapp.glade.h:46 msgid "Meld" msgstr "Meld" #: glade2/meldapp.glade.h:47 msgid "Mine" msgstr "Mine" #: glade2/meldapp.glade.h:48 msgid "My Directory" msgstr "My Directory" #: glade2/meldapp.glade.h:49 msgid "My File" msgstr "My File" #: glade2/meldapp.glade.h:50 msgid "New..." msgstr "New..." #: glade2/meldapp.glade.h:51 msgid "Original" msgstr "Original" #: glade2/meldapp.glade.h:52 msgid "Original Directory" msgstr "Original Directory" #: glade2/meldapp.glade.h:53 msgid "Original File" msgstr "Original File" #: glade2/meldapp.glade.h:54 msgid "Other" msgstr "Other" #: glade2/meldapp.glade.h:55 msgid "Other Directory" msgstr "Other Directory" #: glade2/meldapp.glade.h:56 msgid "Other File" msgstr "Other File" #: glade2/meldapp.glade.h:57 msgid "Preferences : Meld" msgstr "Preferences : Meld" #: glade2/meldapp.glade.h:58 msgid "Prune empty directories (-P)" msgstr "Prune empty directories (-P)" #: glade2/meldapp.glade.h:59 msgid "Quiet mode (-q)" msgstr "Quiet mode (-q)" #: glade2/meldapp.glade.h:60 msgid "Report _Bug" msgstr "Report _Bug" #: glade2/meldapp.glade.h:61 msgid "Save _As" msgstr "Save _As" #: glade2/meldapp.glade.h:62 msgid "Save in UTF-8 encoding" msgstr "Save in UTF-8 encoding" #: glade2/meldapp.glade.h:63 msgid "Save in the files original encoding" msgstr "Save in the files original encoding" #: glade2/meldapp.glade.h:64 msgid "Show line numbers" msgstr "Show line numbers" #: glade2/meldapp.glade.h:65 msgid "Simple : Lines only" msgstr "Simple : Lines only" #: glade2/meldapp.glade.h:66 msgid "Solid : Filled Quadilaterals" msgstr "Solid : Filled Quadilaterals" #: glade2/meldapp.glade.h:67 msgid "Tab width" msgstr "Tab width" #: glade2/meldapp.glade.h:68 msgid "Text Beside Icons" msgstr "Text Beside Icons" #: glade2/meldapp.glade.h:69 msgid "Text Filters" msgstr "Text Filters" #: glade2/meldapp.glade.h:70 msgid "Text Only" msgstr "Text Only" #: glade2/meldapp.glade.h:71 msgid "Text Under Icons" msgstr "Text Under Icons" #: glade2/meldapp.glade.h:72 msgid "Three way directory" msgstr "Three way directory" #: glade2/meldapp.glade.h:73 msgid "Three way file" msgstr "Three way file" #: glade2/meldapp.glade.h:74 msgid "Two way directory" msgstr "Two way directory" #: glade2/meldapp.glade.h:75 msgid "Two way file" msgstr "Two way file" #: glade2/meldapp.glade.h:76 msgid "Use Compression (-z)" msgstr "Use Compression (-z)" #: glade2/meldapp.glade.h:77 msgid "Use GNOME monospace font." msgstr "Use GNOME monospace font." #: glade2/meldapp.glade.h:78 msgid "Use custom font." msgstr "Use custom font." #: glade2/meldapp.glade.h:79 msgid "Use syntax highlighting" msgstr "Use syntax highlighting" #: glade2/meldapp.glade.h:80 msgid "Version control view" msgstr "Version control view" #: glade2/meldapp.glade.h:81 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)" msgstr "When loading, try these codecs in order. (e.g. utf8, iso8859)" #: glade2/meldapp.glade.h:82 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 "" "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." #: glade2/meldapp.glade.h:83 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 "" "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." #: glade2/meldapp.glade.h:84 msgid "Whitespace is significant" msgstr "Whitespace is significant" #: glade2/meldapp.glade.h:85 msgid "_Character" msgstr "_Character" #: glade2/meldapp.glade.h:87 msgid "_Contents" msgstr "_Contents" #: glade2/meldapp.glade.h:88 msgid "_Directory Comparison" msgstr "_Directory Comparison" #: glade2/meldapp.glade.h:89 msgid "_Down" msgstr "_Down" #: glade2/meldapp.glade.h:90 msgid "_File Comparison" msgstr "_File Comparison" #: glade2/meldapp.glade.h:91 msgid "_Logo" msgstr "_Logo" #: glade2/meldapp.glade.h:92 msgid "_New..." msgstr "_New..." #: glade2/meldapp.glade.h:93 msgid "_None" msgstr "_None" #: glade2/meldapp.glade.h:94 msgid "_Save" msgstr "_Save" #: glade2/meldapp.glade.h:95 msgid "_Three Way Compare" msgstr "_Three Way Compare" #: glade2/meldapp.glade.h:96 msgid "_Up" msgstr "_Up" #: glade2/meldapp.glade.h:97 msgid "_Version Control Browser" msgstr "_Version Control Browser" #: glade2/meldapp.glade.h:98 msgid "_Word" msgstr "_Word" #: glade2/vcview.glade.h:1 msgid "Add _Binary" msgstr "Add _Binary" #: glade2/vcview.glade.h:2 msgid "Add to VC" msgstr "Add to VC" #: glade2/vcview.glade.h:3 msgid "Commit" msgstr "Commit" #: glade2/vcview.glade.h:4 msgid "Commit Files" msgstr "Commit Files" #: glade2/vcview.glade.h:5 msgid "Compare Options" msgstr "Compare Options" #: glade2/vcview.glade.h:7 msgid "Date" msgstr "Date" #: glade2/vcview.glade.h:8 msgid "Delete locally" msgstr "Delete locally" #: glade2/vcview.glade.h:9 msgid "Flatten directories" msgstr "Flatten directories" #: glade2/vcview.glade.h:10 msgid "Ignored" msgstr "Ignored" #: glade2/vcview.glade.h:11 msgid "Local copy against other remote revision" msgstr "Local copy against other remote revision" #: glade2/vcview.glade.h:12 msgid "Local copy against same remote revision" msgstr "Local copy against same remote revision" #: glade2/vcview.glade.h:13 msgid "Log Message" msgstr "Log Message" #: glade2/vcview.glade.h:14 msgid "Non _VC" msgstr "Non _VC" #: glade2/vcview.glade.h:15 msgid "Previous Logs" msgstr "Previous Logs" #: glade2/vcview.glade.h:16 msgid "Remove _Locally" msgstr "Remove _Locally" #: glade2/vcview.glade.h:17 msgid "Remove from VC" msgstr "Remove from VC" #: glade2/vcview.glade.h:19 msgid "Show unversioned files" msgstr "Show unversioned files" #: glade2/vcview.glade.h:20 vcview.py:173 msgid "Tag" msgstr "Tag" #: glade2/vcview.glade.h:21 msgid "Update" msgstr "Update" #: glade2/vcview.glade.h:22 msgid "VC Log" msgstr "VC Log" #: glade2/vcview.glade.h:23 msgid "_Add" msgstr "_Add" #: glade2/vcview.glade.h:24 msgid "_Commit" msgstr "_Commit" #: glade2/vcview.glade.h:26 msgid "_Edit" msgstr "_Edit" #: glade2/vcview.glade.h:27 msgid "_Flatten" msgstr "_Flatten" #: glade2/vcview.glade.h:28 msgid "_Modified" msgstr "_Modified" #: glade2/vcview.glade.h:29 msgid "_Normal" msgstr "_Normal" #: glade2/vcview.glade.h:30 msgid "_Remove" msgstr "_Remove" #: glade2/vcview.glade.h:31 msgid "_Update" msgstr "_Update" #: meld:60 meld:70 meld:80 #, c-format msgid "Meld requires %s or higher." msgstr "Meld requires %s or higher." #: meld:81 msgid "" "Due to incompatible API changes some functions may not operate as expected." msgstr "" "Due to incompatible API changes some functions may not operate as expected." #: meld.desktop.in.h:1 msgid "Compare and merge your files." msgstr "Compare and merge your files." #: meld.desktop.in.h:2 msgid "Meld Diff Viewer" msgstr "Meld Diff Viewer" #: meldapp.py:292 msgid "Line numbers are only available if you have gnome-python-desktop installed." msgstr "Line numbers are only available if you have gnome-python-desktop installed." #: meldapp.py:296 msgid "" "Syntax highlighting is only available if you have gnome-python-desktop installed." msgstr "" "Syntax highlighting is only available if you have gnome-python-desktop installed." #: meldapp.py:750 msgid "Cannot compare a mixture of files and directories.\n" msgstr "Cannot compare a mixture of files and directories.\n" #. ############################################################################### #. #. usage #. #. ############################################################################### #: meldapp.py:796 msgid "" "Meld is a file and directory comparison tool. Usage:\n" "\n" " meld Start with no windows open\n" " meld Start with VC browser in 'dir'\n" " meld Start with VC diff of 'file'\n" " meld [file] Start with 2 or 3 way file comparison\n" " meld [dir] Start with 2 or 3 way directory comparison\n" "\n" "Options:\n" " -h, --help Show this help text and exit\n" " -v, --version Display the version and exit\n" "\n" "For more information choose help -> contents.\n" "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n" "Discuss meld at http://mail.gnome.org/mailman/listinfo/meld-list\n" msgstr "" "Meld is a file and directory comparison tool. Usage:\n" "\n" " meld Start with no windows open\n" " meld Start with VC browser in 'dir'\n" " meld Start with VC diff of 'file'\n" " meld [file] Start with 2 or 3 way file comparison\n" " meld [dir] Start with 2 or 3 way directory comparison\n" "\n" "Options:\n" " -h, --help Show this help text and exit\n" " -v, --version Display the version and exit\n" "\n" "For more information choose help -> contents.\n" "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n" "Discuss meld at http://mail.gnome.org/mailman/listinfo/meld-list\n" #: meldapp.py:813 #, python-format msgid "" "Meld %s\n" "Written by Stephen Kennedy " msgstr "" "Meld %s\n" "Written by Stephen Kennedy " #: meldapp.py:863 #, python-format msgid "Wrong number of arguments (Got %i)" msgstr "Wrong number of arguments (Got %i)" #: melddoc.py:45 msgid "untitled" msgstr "untitled" #. no common path. empty names get changed to "[None]" #: misc.py:118 msgid "[None]" msgstr "[None]" #: vcview.py:153 msgid "Name" msgstr "Name" #: vcview.py:170 msgid "Location" msgstr "Location" #: vcview.py:171 msgid "Status" msgstr "Status" #: vcview.py:172 msgid "Rev" msgstr "Rev" #: vcview.py:174 msgid "Options" msgstr "Options" #: vcview.py:256 msgid "(Empty)" msgstr "(Empty)" #: vcview.py:293 #, python-format msgid "[%s] Fetching differences" msgstr "[%s] Fetching differences" #: vcview.py:300 #, python-format msgid "[%s] Applying patch" msgstr "[%s] Applying patch" #: vcview.py:304 msgid "No differences found." msgstr "No differences found." #: vcview.py:380 msgid "Select some files first." msgstr "Select some files first." #. These are the possible states of files. Be sure to get the colons correct. #: vc/_vc.py:37 msgid "" "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:" "Missing" msgstr "" "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:" "Missing" #: vc/cvs.py:160 #, python-format msgid "" "Error converting to a regular expression\n" "The pattern was '%s'\n" "The error was '%s'" msgstr "" "Error converting to a regular expression\n" "The pattern was '%s'\n" "The error was '%s'"