# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.2\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" "POT-Creation-Date: 2011-09-02 17:19+0200\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=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #: lib/c-stack.c:204 lib/c-stack.c:297 msgid "program error" msgstr "" #: lib/c-stack.c:205 lib/c-stack.c:298 msgid "stack overflow" msgstr "" #: lib/error.c:185 msgid "Unknown system error" msgstr "" #: lib/file-type.c:38 msgid "regular empty file" msgstr "" #: lib/file-type.c:38 msgid "regular file" msgstr "" #: lib/file-type.c:41 msgid "directory" msgstr "" #: lib/file-type.c:44 msgid "block special file" msgstr "" #: lib/file-type.c:47 msgid "character special file" msgstr "" #: lib/file-type.c:50 msgid "fifo" msgstr "" #: lib/file-type.c:53 msgid "symbolic link" msgstr "" #: lib/file-type.c:56 msgid "socket" msgstr "" #: lib/file-type.c:59 msgid "message queue" msgstr "" #: lib/file-type.c:62 msgid "semaphore" msgstr "" #: lib/file-type.c:65 msgid "shared memory object" msgstr "" #: lib/file-type.c:68 msgid "typed memory object" msgstr "" #: lib/file-type.c:70 msgid "weird file" msgstr "" #: lib/getopt.c:547 lib/getopt.c:576 #, c-format msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "" #: lib/getopt.c:624 lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:637 lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:685 lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "" #: lib/getopt.c:742 lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" #: lib/getopt.c:753 lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: lib/getopt.c:805 lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" #: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" #: lib/getopt.c:934 lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" #: lib/getopt.c:974 lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:1013 lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "" #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for #. "'". If the catalog has no translation, #. locale_quoting_style quotes `like this', and #. clocale_quoting_style quotes "like this". #. #. For example, an American English Unicode locale should #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) #. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. #. #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. #: lib/quotearg.c:271 msgid "`" msgstr "" #: lib/quotearg.c:272 msgid "'" msgstr "" #: lib/regcomp.c:133 msgid "Success" msgstr "" #: lib/regcomp.c:136 msgid "No match" msgstr "" #: lib/regcomp.c:139 msgid "Invalid regular expression" msgstr "" #: lib/regcomp.c:142 msgid "Invalid collation character" msgstr "" #: lib/regcomp.c:145 msgid "Invalid character class name" msgstr "" #: lib/regcomp.c:148 msgid "Trailing backslash" msgstr "" #: lib/regcomp.c:151 msgid "Invalid back reference" msgstr "" #: lib/regcomp.c:154 msgid "Unmatched [ or [^" msgstr "" #: lib/regcomp.c:157 msgid "Unmatched ( or \\(" msgstr "" #: lib/regcomp.c:160 msgid "Unmatched \\{" msgstr "" #: lib/regcomp.c:163 msgid "Invalid content of \\{\\}" msgstr "" #: lib/regcomp.c:166 msgid "Invalid range end" msgstr "" #: lib/regcomp.c:169 msgid "Memory exhausted" msgstr "" #: lib/regcomp.c:172 msgid "Invalid preceding regular expression" msgstr "" #: lib/regcomp.c:175 msgid "Premature end of regular expression" msgstr "" #: lib/regcomp.c:178 msgid "Regular expression too big" msgstr "" #: lib/regcomp.c:181 msgid "Unmatched ) or \\)" msgstr "" #: lib/regcomp.c:702 msgid "No previous regular expression" msgstr "" #: lib/xalloc-die.c:34 msgid "memory exhausted" msgstr "" #: lib/xfreopen.c:35 msgid "stdin" msgstr "" #: lib/xfreopen.c:36 msgid "stdout" msgstr "" #: lib/xfreopen.c:37 msgid "stderr" msgstr "" #: lib/xfreopen.c:38 msgid "unknown stream" msgstr "" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" msgstr "" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument `%s'" msgstr "" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument `%s'" msgstr "" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument `%s' too large" msgstr "" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" msgstr "" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" msgstr "" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" msgstr "" #: lib/version-etc.c:86 msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later .\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 #, c-format msgid "Written by %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:106 #, c-format msgid "Written by %s and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:110 #, c-format msgid "Written by %s, %s, and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:117 #, c-format msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:124 #, c-format msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:131 #, c-format msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:139 #, c-format msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:147 #, c-format msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:156 #, c-format msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. #: lib/version-etc.c:167 #, c-format msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" #. TRANSLATORS: The placeholder indicates the bug-reporting address #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). #: lib/version-etc.c:245 #, c-format msgid "" "\n" "Report bugs to: %s\n" msgstr "" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" msgstr "" #: lib/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" msgstr "" #: lib/version-etc.c:253 #, c-format msgid "%s home page: \n" msgstr "" #: lib/version-etc.c:256 msgid "General help using GNU software: \n" msgstr "" #: src/analyze.c:459 src/diff.c:1279 #, c-format msgid "Files %s and %s differ\n" msgstr "" #: src/analyze.c:462 #, c-format msgid "Binary files %s and %s differ\n" msgstr "" #: src/analyze.c:713 src/diff3.c:1437 src/util.c:572 msgid "No newline at end of file" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:43 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/cmp.c:44 msgid "David MacKenzie" msgstr "" #: src/cmp.c:118 src/diff.c:836 src/diff3.c:414 src/sdiff.c:155 #, c-format msgid "Try `%s --help' for more information." msgstr "" #: src/cmp.c:137 #, c-format msgid "invalid --ignore-initial value `%s'" msgstr "" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "" #: src/cmp.c:155 src/diff.c:845 src/diff3.c:422 src/sdiff.c:164 #: src/sdiff.c:312 src/sdiff.c:319 src/sdiff.c:883 src/util.c:191 #: src/util.c:284 src/util.c:291 msgid "write failed" msgstr "" #: src/cmp.c:157 src/diff.c:847 src/diff.c:1344 src/diff3.c:424 #: src/sdiff.c:166 msgid "standard output" msgstr "" #: src/cmp.c:161 msgid "-b, --print-bytes print differing bytes" msgstr "" #: src/cmp.c:162 msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "" #: src/cmp.c:163 msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" #: src/cmp.c:165 msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" #: src/cmp.c:166 msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" msgstr "" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" msgstr "" #: src/cmp.c:168 msgid " --help display this help and exit" msgstr "" #: src/cmp.c:169 msgid "-v, --version output version information and exit" msgstr "" #: src/cmp.c:178 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" msgstr "" #: src/cmp.c:180 msgid "Compare two files byte by byte." msgstr "" #: src/cmp.c:182 msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." msgstr "" #: src/cmp.c:185 src/diff.c:952 src/diff3.c:462 src/sdiff.c:207 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" #: src/cmp.c:191 msgid "" "SKIP values may be followed by the following multiplicative suffixes:\n" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." msgstr "" #: src/cmp.c:194 msgid "If a FILE is `-' or missing, read standard input." msgstr "" #: src/cmp.c:195 src/diff.c:940 src/sdiff.c:217 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" #: src/cmp.c:240 #, c-format msgid "invalid --bytes value `%s'" msgstr "" #: src/cmp.c:266 src/diff.c:754 src/diff3.c:318 src/sdiff.c:562 #, c-format msgid "missing operand after `%s'" msgstr "" #: src/cmp.c:278 src/diff.c:756 src/diff3.c:320 src/sdiff.c:564 #, c-format msgid "extra operand `%s'" msgstr "" #: src/cmp.c:491 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "" #: src/cmp.c:507 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "" #: src/cmp.c:559 #, c-format msgid "cmp: EOF on %s\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:48 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:49 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:50 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:51 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:52 msgid "Len Tower" msgstr "" #: src/diff.c:340 #, c-format msgid "invalid context length `%s'" msgstr "" #: src/diff.c:423 #, c-format msgid "pagination not supported on this host" msgstr "" #: src/diff.c:438 src/diff3.c:300 #, c-format msgid "too many file label options" msgstr "" #: src/diff.c:515 #, c-format msgid "invalid width `%s'" msgstr "" #: src/diff.c:519 msgid "conflicting width options" msgstr "" #: src/diff.c:544 #, c-format msgid "invalid horizon length `%s'" msgstr "" #: src/diff.c:595 #, c-format msgid "invalid tabsize `%s'" msgstr "" #: src/diff.c:599 msgid "conflicting tabsize options" msgstr "" #: src/diff.c:731 msgid "--from-file and --to-file both specified" msgstr "" #: src/diff.c:851 msgid " --normal output a normal diff (the default)" msgstr "" #: src/diff.c:852 msgid "-q, --brief report only when files differ" msgstr "" #: src/diff.c:853 msgid "-s, --report-identical-files report when two files are the same" msgstr "" #: src/diff.c:854 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" #: src/diff.c:855 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" #: src/diff.c:856 msgid "-e, --ed output an ed script" msgstr "" #: src/diff.c:857 msgid "-n, --rcs output an RCS format diff" msgstr "" #: src/diff.c:858 msgid "-y, --side-by-side output in two columns" msgstr "" #: src/diff.c:859 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" #: src/diff.c:860 msgid "" " --left-column output only the left column of common lines" msgstr "" #: src/diff.c:861 msgid " --suppress-common-lines do not output common lines" msgstr "" #: src/diff.c:863 msgid "-p, --show-c-function show which C function each change is in" msgstr "" #: src/diff.c:864 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" #: src/diff.c:865 msgid "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" msgstr "" #: src/diff.c:868 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" #: src/diff.c:869 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" #: src/diff.c:870 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" #: src/diff.c:871 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" #: src/diff.c:872 msgid "-l, --paginate pass output through `pr' to paginate it" msgstr "" #: src/diff.c:874 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" #: src/diff.c:875 msgid "-N, --new-file treat absent files as empty" msgstr "" #: src/diff.c:876 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" #: src/diff.c:877 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" #: src/diff.c:878 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" #: src/diff.c:879 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" #: src/diff.c:880 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" #: src/diff.c:881 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" #: src/diff.c:882 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" #: src/diff.c:884 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" #: src/diff.c:887 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" #: src/diff.c:888 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" #: src/diff.c:889 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" #: src/diff.c:890 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" #: src/diff.c:891 msgid "-w, --ignore-all-space ignore all white space" msgstr "" #: src/diff.c:892 msgid "" "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" #: src/diff.c:893 src/sdiff.c:178 msgid "-I, --ignore-matching-lines=RE ignore changes whose lines all match RE" msgstr "" #: src/diff.c:895 msgid "-a, --text treat all files as text" msgstr "" #: src/diff.c:896 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" #: src/diff.c:898 msgid " --binary read and write data in binary mode" msgstr "" #: src/diff.c:901 msgid "" "-D, --ifdef=NAME output merged file with `#ifdef NAME' diffs" msgstr "" #: src/diff.c:902 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" #: src/diff.c:903 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" #: src/diff.c:904 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" #: src/diff.c:905 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" #: src/diff.c:907 msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." msgstr "" #: src/diff.c:908 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" " %> lines from FILE2\n" " %= lines common to FILE1 and FILE2\n" " %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n" " LETTERs are as follows for new group, lower case for old group:\n" " F first line number\n" " L last line number\n" " N number of lines = L-F+1\n" " E F-1\n" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" #: src/diff.c:920 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" #: src/diff.c:924 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" " %c'C' the single character C\n" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" #: src/diff.c:930 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" #: src/diff.c:931 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" #: src/diff.c:932 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" #: src/diff.c:934 msgid " --help display this help and exit" msgstr "" #: src/diff.c:935 msgid "-v, --version output version information and exit" msgstr "" #: src/diff.c:937 msgid "" "FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." msgstr "" #: src/diff.c:938 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" #: src/diff.c:939 src/diff3.c:481 src/sdiff.c:216 msgid "If a FILE is `-', read standard input." msgstr "" #: src/diff.c:949 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" #: src/diff.c:950 msgid "Compare FILES line by line." msgstr "" #: src/diff.c:984 #, c-format msgid "conflicting %s option value `%s'" msgstr "" #: src/diff.c:997 #, c-format msgid "conflicting output style options" msgstr "" #: src/diff.c:1054 src/diff.c:1254 #, c-format msgid "Only in %s: %s\n" msgstr "" #: src/diff.c:1183 msgid "cannot compare `-' to a directory" msgstr "" #: src/diff.c:1215 msgid "-D option not supported with directories" msgstr "" #: src/diff.c:1224 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "" #: src/diff.c:1264 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "" #: src/diff.c:1335 #, c-format msgid "Files %s and %s are identical\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff3.c:41 msgid "Randy Smith" msgstr "" #: src/diff3.c:313 #, c-format msgid "incompatible options" msgstr "" #: src/diff3.c:353 msgid "`-' specified for more than one input file" msgstr "" #: src/diff3.c:395 src/diff3.c:1262 src/diff3.c:1666 src/diff3.c:1721 #: src/sdiff.c:304 src/sdiff.c:853 src/sdiff.c:864 msgid "read failed" msgstr "" #: src/diff3.c:428 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" #: src/diff3.c:430 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" #: src/diff3.c:432 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" #: src/diff3.c:433 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" #: src/diff3.c:434 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" #: src/diff3.c:435 msgid "-X like -x, but bracket conflicts" msgstr "" #: src/diff3.c:436 msgid "-i append `w' and `q' commands to ed scripts" msgstr "" #: src/diff3.c:438 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" #: src/diff3.c:441 msgid "-a, --text treat all files as text" msgstr "" #: src/diff3.c:442 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" #: src/diff3.c:443 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" #: src/diff3.c:444 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" #: src/diff3.c:445 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" #: src/diff3.c:448 msgid " --help display this help and exit" msgstr "" #: src/diff3.c:449 msgid "-v, --version output version information and exit" msgstr "" #: src/diff3.c:458 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "" #: src/diff3.c:460 msgid "Compare three files line by line." msgstr "" #: src/diff3.c:470 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" "the changes.\n" "\n" "The -e, -E, -x, -X (and corresponding long) options cause an ed script\n" "to be output instead of the default.\n" "\n" "Finally, the -m (--merge) option causes diff3 to do the merge internally\n" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" #: src/diff3.c:482 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" #: src/diff3.c:675 msgid "internal error: screwup in format of diff blocks" msgstr "" #: src/diff3.c:968 #, c-format msgid "%s: diff failed: " msgstr "" #: src/diff3.c:990 msgid "internal error: invalid diff type in process_diff" msgstr "" #: src/diff3.c:1015 msgid "invalid diff format; invalid change separator" msgstr "" #: src/diff3.c:1272 msgid "invalid diff format; incomplete last line" msgstr "" #: src/diff3.c:1296 src/sdiff.c:272 src/util.c:301 #, c-format msgid "subsidiary program `%s' could not be invoked" msgstr "" #: src/diff3.c:1321 msgid "invalid diff format; incorrect leading line chars" msgstr "" #: src/diff3.c:1394 msgid "internal error: invalid diff type passed to output" msgstr "" #: src/diff3.c:1668 src/diff3.c:1725 msgid "input file shrank" msgstr "" #: src/dir.c:158 #, c-format msgid "cannot compare file names `%s' and `%s'" msgstr "" #: src/dir.c:209 #, c-format msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/sdiff.c:42 msgid "Thomas Lord" msgstr "" #: src/sdiff.c:170 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" #: src/sdiff.c:172 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "" #: src/sdiff.c:173 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" #: src/sdiff.c:174 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" #: src/sdiff.c:175 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" #: src/sdiff.c:176 msgid "-W, --ignore-all-space ignore all white space" msgstr "" #: src/sdiff.c:177 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" #: src/sdiff.c:179 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" #: src/sdiff.c:180 msgid "-a, --text treat all files as text" msgstr "" #: src/sdiff.c:182 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" #: src/sdiff.c:183 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" #: src/sdiff.c:184 msgid "-s, --suppress-common-lines do not output common lines" msgstr "" #: src/sdiff.c:186 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" #: src/sdiff.c:187 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" #: src/sdiff.c:189 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" #: src/sdiff.c:190 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" #: src/sdiff.c:191 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" #: src/sdiff.c:193 msgid " --help display this help and exit" msgstr "" #: src/sdiff.c:194 msgid "-v, --version output version information and exit" msgstr "" #: src/sdiff.c:203 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" #: src/sdiff.c:205 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "" #: src/sdiff.c:326 msgid "cannot interactively merge standard input" msgstr "" #: src/sdiff.c:592 msgid "both files to be compared are directories" msgstr "" #: src/sdiff.c:827 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" "el or e1:\tEdit then use the left version.\n" "er or e2:\tEdit then use the right version.\n" "e:\tDiscard both versions then edit a new one.\n" "l or 1:\tUse the left version.\n" "r or 2:\tUse the right version.\n" "s:\tSilently include common lines.\n" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr ""