# 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.0\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" "POT-Creation-Date: 2010-05-03 17:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #: lib/c-stack.c:196 lib/c-stack.c:309 msgid "program error" msgstr "" #: lib/c-stack.c:197 lib/c-stack.c:310 msgid "stack overflow" msgstr "" #: lib/error.c:153 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:527 lib/getopt.c:543 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "" #: lib/getopt.c:576 lib/getopt.c:580 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:589 lib/getopt.c:594 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:637 lib/getopt.c:656 #, c-format msgid "%s: option '--%s' requires an argument\n" msgstr "" #: lib/getopt.c:694 lib/getopt.c:697 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "" #: lib/getopt.c:705 lib/getopt.c:708 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: lib/getopt.c:757 lib/getopt.c:760 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" #: lib/getopt.c:810 lib/getopt.c:827 lib/getopt.c:1035 lib/getopt.c:1053 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" #: lib/getopt.c:883 lib/getopt.c:899 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "" #: lib/getopt.c:923 lib/getopt.c:941 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "" #: lib/getopt.c:962 lib/getopt.c:980 #, 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:272 msgid "`" msgstr "" #: lib/quotearg.c:273 msgid "'" msgstr "" #: lib/regcomp.c:134 msgid "Success" msgstr "" #: lib/regcomp.c:137 msgid "No match" msgstr "" #: lib/regcomp.c:140 msgid "Invalid regular expression" msgstr "" #: lib/regcomp.c:143 msgid "Invalid collation character" msgstr "" #: lib/regcomp.c:146 msgid "Invalid character class name" msgstr "" #: lib/regcomp.c:149 msgid "Trailing backslash" msgstr "" #: lib/regcomp.c:152 msgid "Invalid back reference" msgstr "" #: lib/regcomp.c:155 msgid "Unmatched [ or [^" msgstr "" #: lib/regcomp.c:158 msgid "Unmatched ( or \\(" msgstr "" #: lib/regcomp.c:161 msgid "Unmatched \\{" msgstr "" #: lib/regcomp.c:164 msgid "Invalid content of \\{\\}" msgstr "" #: lib/regcomp.c:167 msgid "Invalid range end" msgstr "" #: lib/regcomp.c:170 msgid "Memory exhausted" msgstr "" #: lib/regcomp.c:173 msgid "Invalid preceding regular expression" msgstr "" #: lib/regcomp.c:176 msgid "Premature end of regular expression" msgstr "" #: lib/regcomp.c:179 msgid "Regular expression too big" msgstr "" #: lib/regcomp.c:182 msgid "Unmatched ) or \\)" msgstr "" #: lib/regcomp.c:703 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:1258 #, 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:1419 src/util.c:545 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:829 src/diff3.c:415 src/sdiff.c:178 #, 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:838 src/diff3.c:423 src/sdiff.c:187 #: src/sdiff.c:329 src/sdiff.c:336 src/sdiff.c:924 src/util.c:191 #: src/util.c:284 src/util.c:291 msgid "write failed" msgstr "" #: src/cmp.c:157 src/diff.c:840 src/diff.c:1323 src/diff3.c:425 #: src/sdiff.c:189 msgid "standard output" msgstr "" #: src/cmp.c:161 msgid "-b --print-bytes Print differing bytes." msgstr "" #: src/cmp.c:162 msgid "-i SKIP --ignore-initial=SKIP Skip the first SKIP bytes of input." msgstr "" #: src/cmp.c:163 msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" msgstr "" #: src/cmp.c:164 msgid "" " Skip the first SKIP1 bytes of FILE1 and the first SKIP2 bytes of FILE2." msgstr "" #: src/cmp.c:165 msgid "-l --verbose Output byte numbers and values of all differing bytes." msgstr "" #: src/cmp.c:166 msgid "-n LIMIT --bytes=LIMIT Compare at most LIMIT bytes." msgstr "" #: src/cmp.c:167 msgid "-s --quiet --silent Output nothing; yield exit status only." msgstr "" #: src/cmp.c:168 src/diff.c:918 src/diff3.c:444 src/sdiff.c:215 msgid "-v --version Output version info." msgstr "" #: src/cmp.c:169 src/diff.c:919 src/diff3.c:445 src/sdiff.c:216 msgid "--help Output this help." 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:184 msgid "SKIP1 and SKIP2 are the number of bytes to skip in each file." msgstr "" #: src/cmp.c:185 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:188 msgid "If a FILE is `-' or missing, read standard input." msgstr "" #: src/cmp.c:189 src/diff.c:924 src/sdiff.c:234 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" #: src/cmp.c:234 #, c-format msgid "invalid --bytes value `%s'" msgstr "" #: src/cmp.c:260 src/diff.c:747 src/diff3.c:319 src/sdiff.c:575 #, c-format msgid "missing operand after `%s'" msgstr "" #: src/cmp.c:272 src/diff.c:749 src/diff3.c:321 src/sdiff.c:577 #, c-format msgid "extra operand `%s'" msgstr "" #: src/cmp.c:485 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "" #: src/cmp.c:501 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "" #: src/cmp.c:553 #, c-format msgid "cmp: EOF on %s\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:47 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:48 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:49 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:50 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. #: src/diff.c:51 msgid "Len Tower" msgstr "" #: src/diff.c:333 #, c-format msgid "invalid context length `%s'" msgstr "" #: src/diff.c:416 #, c-format msgid "pagination not supported on this host" msgstr "" #: src/diff.c:431 src/diff3.c:301 #, c-format msgid "too many file label options" msgstr "" #: src/diff.c:508 #, c-format msgid "invalid width `%s'" msgstr "" #: src/diff.c:512 msgid "conflicting width options" msgstr "" #: src/diff.c:537 #, c-format msgid "invalid horizon length `%s'" msgstr "" #: src/diff.c:588 #, c-format msgid "invalid tabsize `%s'" msgstr "" #: src/diff.c:592 msgid "conflicting tabsize options" msgstr "" #: src/diff.c:724 msgid "--from-file and --to-file both specified" msgstr "" #: src/diff.c:844 msgid "Compare files line by line." msgstr "" #: src/diff.c:846 msgid "-i --ignore-case Ignore case differences in file contents." msgstr "" #: src/diff.c:847 msgid "--ignore-file-name-case Ignore case when comparing file names." msgstr "" #: src/diff.c:848 msgid "--no-ignore-file-name-case Consider case when comparing file names." msgstr "" #: src/diff.c:849 src/sdiff.c:196 msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." msgstr "" #: src/diff.c:850 src/sdiff.c:197 msgid "-b --ignore-space-change Ignore changes in the amount of white space." msgstr "" #: src/diff.c:851 msgid "-w --ignore-all-space Ignore all white space." msgstr "" #: src/diff.c:852 src/sdiff.c:199 msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." msgstr "" #: src/diff.c:853 src/sdiff.c:200 msgid "" "-I RE --ignore-matching-lines=RE Ignore changes whose lines all match RE." msgstr "" #: src/diff.c:854 src/diff3.c:440 src/sdiff.c:201 msgid "--strip-trailing-cr Strip trailing carriage return on input." msgstr "" #: src/diff.c:856 msgid "--binary Read and write data in binary mode." msgstr "" #: src/diff.c:858 src/diff3.c:439 src/sdiff.c:202 msgid "-a --text Treat all files as text." msgstr "" #: src/diff.c:860 msgid "" "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " "context.\n" "-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " "context.\n" " --label LABEL Use LABEL instead of file name.\n" " -p --show-c-function Show which C function each change is in.\n" " -F RE --show-function-line=RE Show the most recent line matching RE." msgstr "" #: src/diff.c:865 msgid "-q --brief Output only whether files differ." msgstr "" #: src/diff.c:866 msgid "-e --ed Output an ed script." msgstr "" #: src/diff.c:867 msgid "--normal Output a normal diff." msgstr "" #: src/diff.c:868 msgid "-n --rcs Output an RCS format diff." msgstr "" #: src/diff.c:869 msgid "" "-y --side-by-side Output in two columns.\n" " -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" " --left-column Output only the left column of common lines.\n" " --suppress-common-lines Do not output common lines." msgstr "" #: src/diff.c:873 msgid "-D NAME --ifdef=NAME Output merged file to show `#ifdef NAME' diffs." msgstr "" #: src/diff.c:874 msgid "" "--GTYPE-group-format=GFMT Similar, but format GTYPE input groups with GFMT." msgstr "" #: src/diff.c:875 msgid "--line-format=LFMT Similar, but format all input lines with LFMT." msgstr "" #: src/diff.c:876 msgid "" "--LTYPE-line-format=LFMT Similar, but format LTYPE input lines with LFMT." msgstr "" #: src/diff.c:877 msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." msgstr "" #: src/diff.c:878 msgid "" " GFMT 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" msgstr "" #: src/diff.c:889 msgid "" " LFMT 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:893 msgid "" " Either GFMT or LFMT may contain:\n" " %% %\n" " %c'C' the single character C\n" " %c'\\OOO' the character with octal code OOO" msgstr "" #: src/diff.c:898 msgid "-l --paginate Pass the output through `pr' to paginate it." msgstr "" #: src/diff.c:899 src/sdiff.c:208 msgid "-t --expand-tabs Expand tabs to spaces in output." msgstr "" #: src/diff.c:900 src/diff3.c:441 msgid "-T --initial-tab Make tabs line up by prepending a tab." msgstr "" #: src/diff.c:901 src/sdiff.c:209 msgid "--tabsize=NUM Tab stops are every NUM (default 8) print columns." msgstr "" #: src/diff.c:902 msgid "" "--suppress-blank-empty Suppress space or tab before empty output lines." msgstr "" #: src/diff.c:904 msgid "-r --recursive Recursively compare any subdirectories found." msgstr "" #: src/diff.c:905 msgid "-N --new-file Treat absent files as empty." msgstr "" #: src/diff.c:906 msgid "--unidirectional-new-file Treat absent first files as empty." msgstr "" #: src/diff.c:907 msgid "-s --report-identical-files Report when two files are the same." msgstr "" #: src/diff.c:908 msgid "-x PAT --exclude=PAT Exclude files that match PAT." msgstr "" #: src/diff.c:909 msgid "" "-X FILE --exclude-from=FILE Exclude files that match any pattern in FILE." msgstr "" #: src/diff.c:910 msgid "" "-S FILE --starting-file=FILE Start with FILE when comparing directories." msgstr "" #: src/diff.c:911 msgid "" "--from-file=FILE1 Compare FILE1 to all operands. FILE1 can be a directory." msgstr "" #: src/diff.c:912 msgid "" "--to-file=FILE2 Compare all operands to FILE2. FILE2 can be a directory." msgstr "" #: src/diff.c:914 msgid "--horizon-lines=NUM Keep NUM lines of the common prefix and suffix." msgstr "" #: src/diff.c:915 src/sdiff.c:211 msgid "-d --minimal Try hard to find a smaller set of changes." msgstr "" #: src/diff.c:916 msgid "" "--speed-large-files Assume large files and many scattered small changes." msgstr "" #: src/diff.c:921 msgid "" "FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." msgstr "" #: src/diff.c:922 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILES." msgstr "" #: src/diff.c:923 src/diff3.c:463 src/sdiff.c:233 msgid "If a FILE is `-', read standard input." msgstr "" #: src/diff.c:933 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" #: src/diff.c:963 #, c-format msgid "conflicting %s option value `%s'" msgstr "" #: src/diff.c:976 #, c-format msgid "conflicting output style options" msgstr "" #: src/diff.c:1033 src/diff.c:1233 #, c-format msgid "Only in %s: %s\n" msgstr "" #: src/diff.c:1162 msgid "cannot compare `-' to a directory" msgstr "" #: src/diff.c:1194 msgid "-D option not supported with directories" msgstr "" #: src/diff.c:1203 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "" #: src/diff.c:1243 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "" #: src/diff.c:1314 #, 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:42 msgid "Randy Smith" msgstr "" #: src/diff3.c:314 #, c-format msgid "incompatible options" msgstr "" #: src/diff3.c:354 msgid "`-' specified for more than one input file" msgstr "" #: src/diff3.c:396 src/diff3.c:1244 src/diff3.c:1648 src/diff3.c:1703 #: src/sdiff.c:321 src/sdiff.c:894 src/sdiff.c:905 msgid "read failed" msgstr "" #: src/diff3.c:429 msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE." msgstr "" #: src/diff3.c:430 msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." msgstr "" #: src/diff3.c:431 msgid "-A --show-all Output all changes, bracketing conflicts." msgstr "" #: src/diff3.c:432 msgid "-x --overlap-only Output overlapping changes." msgstr "" #: src/diff3.c:433 msgid "-X Output overlapping changes, bracketing them." msgstr "" #: src/diff3.c:434 msgid "-3 --easy-only Output unmerged nonoverlapping changes." msgstr "" #: src/diff3.c:436 msgid "-m --merge Output merged file instead of ed script (default -A)." msgstr "" #: src/diff3.c:437 msgid "-L LABEL --label=LABEL Use LABEL instead of file name." msgstr "" #: src/diff3.c:438 msgid "-i Append `w' and `q' commands to ed scripts." msgstr "" #: src/diff3.c:442 src/sdiff.c:213 msgid "--diff-program=PROGRAM Use PROGRAM to compare files." msgstr "" #: src/diff3.c:454 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "" #: src/diff3.c:456 msgid "Compare three files line by line." msgstr "" #: src/diff3.c:464 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" #: src/diff3.c:657 msgid "internal error: screwup in format of diff blocks" msgstr "" #: src/diff3.c:950 #, c-format msgid "%s: diff failed: " msgstr "" #: src/diff3.c:972 msgid "internal error: invalid diff type in process_diff" msgstr "" #: src/diff3.c:997 msgid "invalid diff format; invalid change separator" msgstr "" #: src/diff3.c:1254 msgid "invalid diff format; incomplete last line" msgstr "" #: src/diff3.c:1278 src/sdiff.c:289 src/util.c:301 #, c-format msgid "subsidiary program `%s' could not be invoked" msgstr "" #: src/diff3.c:1303 msgid "invalid diff format; incorrect leading line chars" msgstr "" #: src/diff3.c:1376 msgid "internal error: invalid diff type passed to output" msgstr "" #: src/diff3.c:1650 src/diff3.c:1707 msgid "input file shrank" msgstr "" #: src/dir.c:157 #, c-format msgid "cannot compare file names `%s' and `%s'" msgstr "" #: src/dir.c:208 #, 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:193 msgid "-o FILE --output=FILE Operate interactively, sending output to FILE." msgstr "" #: src/sdiff.c:195 msgid "-i --ignore-case Consider upper- and lower-case to be the same." msgstr "" #: src/sdiff.c:198 msgid "-W --ignore-all-space Ignore all white space." msgstr "" #: src/sdiff.c:204 msgid "-w NUM --width=NUM Output at most NUM (default 130) print columns." msgstr "" #: src/sdiff.c:205 msgid "-l --left-column Output only the left column of common lines." msgstr "" #: src/sdiff.c:206 msgid "-s --suppress-common-lines Do not output common lines." msgstr "" #: src/sdiff.c:212 msgid "" "-H --speed-large-files Assume large files and many scattered small changes." msgstr "" #: src/sdiff.c:225 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "" #: src/sdiff.c:226 msgid "Side-by-side merge of file differences." msgstr "" #: src/sdiff.c:343 msgid "cannot interactively merge standard input" msgstr "" #: src/sdiff.c:605 msgid "both files to be compared are directories" msgstr "" #: src/sdiff.c:868 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 ""