1# SOME DESCRIPTIVE TITLE. 2# Copyright (C) YEAR Free Software Foundation, Inc. 3# This file is distributed under the same license as the PACKAGE package. 4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. 5# 6#, fuzzy 7msgid "" 8msgstr "" 9"Project-Id-Version: PACKAGE VERSION\n" 10"POT-Creation-Date: 2002-04-05 14:10-0800\n" 11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13"Language-Team: LANGUAGE <LL@li.org>\n" 14"MIME-Version: 1.0\n" 15"Content-Type: text/plain; charset=CHARSET\n" 16"Content-Transfer-Encoding: 8bit\n" 17 18#: lib/c-stack.c:188 19msgid "program error" 20msgstr "" 21 22#: lib/c-stack.c:189 23msgid "stack overflow" 24msgstr "" 25 26#: lib/error.c:128 lib/error.c:156 27msgid "Unknown system error" 28msgstr "" 29 30#: lib/freesoft.c:27 31msgid "" 32"This program comes with NO WARRANTY, to the extent permitted by law.\n" 33"You may redistribute copies of this program\n" 34"under the terms of the GNU General Public License.\n" 35"For more information about these matters, see the file named COPYING." 36msgstr "" 37 38#: lib/getopt.c:693 39#, c-format 40msgid "%s: option `%s' is ambiguous\n" 41msgstr "" 42 43#: lib/getopt.c:718 44#, c-format 45msgid "%s: option `--%s' doesn't allow an argument\n" 46msgstr "" 47 48#: lib/getopt.c:723 49#, c-format 50msgid "%s: option `%c%s' doesn't allow an argument\n" 51msgstr "" 52 53#: lib/getopt.c:741 lib/getopt.c:914 54#, c-format 55msgid "%s: option `%s' requires an argument\n" 56msgstr "" 57 58#: lib/getopt.c:770 59#, c-format 60msgid "%s: unrecognized option `--%s'\n" 61msgstr "" 62 63#: lib/getopt.c:774 64#, c-format 65msgid "%s: unrecognized option `%c%s'\n" 66msgstr "" 67 68#: lib/getopt.c:800 69#, c-format 70msgid "%s: illegal option -- %c\n" 71msgstr "" 72 73#: lib/getopt.c:803 74#, c-format 75msgid "%s: invalid option -- %c\n" 76msgstr "" 77 78#: lib/getopt.c:833 lib/getopt.c:963 79#, c-format 80msgid "%s: option requires an argument -- %c\n" 81msgstr "" 82 83#: lib/getopt.c:880 84#, c-format 85msgid "%s: option `-W %s' is ambiguous\n" 86msgstr "" 87 88#: lib/getopt.c:898 89#, c-format 90msgid "%s: option `-W %s' doesn't allow an argument\n" 91msgstr "" 92 93#: lib/regex.c:1367 94msgid "Success" 95msgstr "" 96 97#: lib/regex.c:1370 98msgid "No match" 99msgstr "" 100 101#: lib/regex.c:1373 102msgid "Invalid regular expression" 103msgstr "" 104 105#: lib/regex.c:1376 106msgid "Invalid collation character" 107msgstr "" 108 109#: lib/regex.c:1379 110msgid "Invalid character class name" 111msgstr "" 112 113#: lib/regex.c:1382 114msgid "Trailing backslash" 115msgstr "" 116 117#: lib/regex.c:1385 118msgid "Invalid back reference" 119msgstr "" 120 121#: lib/regex.c:1388 122msgid "Unmatched [ or [^" 123msgstr "" 124 125#: lib/regex.c:1391 126msgid "Unmatched ( or \\(" 127msgstr "" 128 129#: lib/regex.c:1394 130msgid "Unmatched \\{" 131msgstr "" 132 133#: lib/regex.c:1397 134msgid "Invalid content of \\{\\}" 135msgstr "" 136 137#: lib/regex.c:1400 138msgid "Invalid range end" 139msgstr "" 140 141#: lib/regex.c:1403 142msgid "Memory exhausted" 143msgstr "" 144 145#: lib/regex.c:1406 146msgid "Invalid preceding regular expression" 147msgstr "" 148 149#: lib/regex.c:1409 150msgid "Premature end of regular expression" 151msgstr "" 152 153#: lib/regex.c:1412 154msgid "Regular expression too big" 155msgstr "" 156 157#: lib/regex.c:1415 158msgid "Unmatched ) or \\)" 159msgstr "" 160 161#: lib/regex.c:8034 162msgid "No previous regular expression" 163msgstr "" 164 165#: lib/xmalloc.c:63 166msgid "memory exhausted" 167msgstr "" 168 169#: src/analyze.c:809 src/diff.c:1283 170#, c-format 171msgid "Files %s and %s differ\n" 172msgstr "" 173 174#: src/analyze.c:812 175#, c-format 176msgid "Binary files %s and %s differ\n" 177msgstr "" 178 179#: src/analyze.c:1058 src/diff3.c:1413 src/util.c:526 180msgid "No newline at end of file" 181msgstr "" 182 183#: src/cmp.c:43 184msgid "Written by Torbjorn Granlund and David MacKenzie." 185msgstr "" 186 187#: src/cmp.c:118 src/diff.c:817 src/diff3.c:427 src/sdiff.c:168 188#, c-format 189msgid "Try `%s --help' for more information." 190msgstr "" 191 192#: src/cmp.c:137 193#, c-format 194msgid "invalid --ignore-initial value `%s'" 195msgstr "" 196 197#: src/cmp.c:146 198msgid "options -l and -s are incompatible" 199msgstr "" 200 201#: src/cmp.c:154 src/diff.c:826 src/diff3.c:435 src/sdiff.c:177 202#: src/sdiff.c:313 src/sdiff.c:320 src/sdiff.c:910 src/util.c:194 203#: src/util.c:286 src/util.c:293 204msgid "write failed" 205msgstr "" 206 207#: src/cmp.c:156 src/diff.c:828 src/diff.c:1354 src/diff3.c:437 208#: src/sdiff.c:179 209msgid "standard output" 210msgstr "" 211 212#: src/cmp.c:160 213msgid "-b --print-bytes Print differing bytes." 214msgstr "" 215 216#: src/cmp.c:161 217msgid "-i SKIP --ignore-initial=SKIP Skip the first SKIP bytes of input." 218msgstr "" 219 220#: src/cmp.c:162 221msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" 222msgstr "" 223 224#: src/cmp.c:163 225msgid "" 226" Skip the first SKIP1 bytes of FILE1 and the first SKIP2 bytes of FILE2." 227msgstr "" 228 229#: src/cmp.c:164 230msgid "-l --verbose Output byte numbers and values of all differing bytes." 231msgstr "" 232 233#: src/cmp.c:165 234msgid "-n LIMIT --bytes=LIMIT Compare at most LIMIT bytes." 235msgstr "" 236 237#: src/cmp.c:166 238msgid "-s --quiet --silent Output nothing; yield exit status only." 239msgstr "" 240 241#: src/cmp.c:167 src/diff.c:904 src/diff3.c:455 src/sdiff.c:204 242msgid "-v --version Output version info." 243msgstr "" 244 245#: src/cmp.c:168 src/diff.c:905 src/diff3.c:456 src/sdiff.c:205 246msgid "--help Output this help." 247msgstr "" 248 249#: src/cmp.c:177 250#, c-format 251msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" 252msgstr "" 253 254#: src/cmp.c:179 255msgid "Compare two files byte by byte." 256msgstr "" 257 258#: src/cmp.c:183 259msgid "SKIP1 and SKIP2 are the number of bytes to skip in each file." 260msgstr "" 261 262#: src/cmp.c:184 263msgid "" 264"SKIP values may be followed by the following multiplicative suffixes:\n" 265"kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" 266"GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." 267msgstr "" 268 269#: src/cmp.c:187 270msgid "If a FILE is `-' or missing, read standard input." 271msgstr "" 272 273#: src/cmp.c:188 src/diff.c:911 src/diff3.c:475 src/sdiff.c:223 274msgid "Report bugs to <bug-gnu-utils@gnu.org>." 275msgstr "" 276 277#: src/cmp.c:231 278#, c-format 279msgid "invalid --bytes value `%s'" 280msgstr "" 281 282#: src/cmp.c:258 src/diff.c:734 src/diff3.c:333 src/sdiff.c:558 283#, c-format 284msgid "missing operand after `%s'" 285msgstr "" 286 287#: src/cmp.c:270 src/diff.c:736 src/diff3.c:335 src/sdiff.c:560 288#, c-format 289msgid "extra operand `%s'" 290msgstr "" 291 292#: src/cmp.c:477 293#, c-format 294msgid "%s %s differ: byte %s, line %s\n" 295msgstr "" 296 297#: src/cmp.c:495 298#, c-format 299msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" 300msgstr "" 301 302#: src/cmp.c:543 303#, c-format 304msgid "cmp: EOF on %s\n" 305msgstr "" 306 307#: src/diff.c:41 308msgid "" 309"Written by Paul Eggert, Mike Haertel, David Hayes,\n" 310"Richard Stallman, and Len Tower." 311msgstr "" 312 313#: src/diff.c:322 314#, c-format 315msgid "invalid context length `%s'" 316msgstr "" 317 318#: src/diff.c:405 319msgid "pagination not supported on this host" 320msgstr "" 321 322#: src/diff.c:420 src/diff3.c:315 323msgid "too many file label options" 324msgstr "" 325 326#: src/diff.c:498 327#, c-format 328msgid "invalid width `%s'" 329msgstr "" 330 331#: src/diff.c:502 332msgid "conflicting width options" 333msgstr "" 334 335#: src/diff.c:526 336#, c-format 337msgid "invalid horizon length `%s'" 338msgstr "" 339 340#: src/diff.c:629 341#, c-format 342msgid "`-%ld' option is obsolete; use `-%c %ld'" 343msgstr "" 344 345#: src/diff.c:641 346#, c-format 347msgid "`-%ld' option is obsolete; omit it" 348msgstr "" 349 350#: src/diff.c:709 351msgid "--from-file and --to-file both specified" 352msgstr "" 353 354#: src/diff.c:832 355msgid "Compare files line by line." 356msgstr "" 357 358#: src/diff.c:834 359msgid "-i --ignore-case Ignore case differences in file contents." 360msgstr "" 361 362#: src/diff.c:835 363msgid "--ignore-file-name-case Ignore case when comparing file names." 364msgstr "" 365 366#: src/diff.c:836 367msgid "--no-ignore-file-name-case Consider case when comparing file names." 368msgstr "" 369 370#: src/diff.c:837 src/sdiff.c:186 371msgid "-E --ignore-tab-expansion Ignore changes due to tab expansion." 372msgstr "" 373 374#: src/diff.c:838 src/sdiff.c:187 375msgid "-b --ignore-space-change Ignore changes in the amount of white space." 376msgstr "" 377 378#: src/diff.c:839 379msgid "-w --ignore-all-space Ignore all white space." 380msgstr "" 381 382#: src/diff.c:840 src/sdiff.c:189 383msgid "-B --ignore-blank-lines Ignore changes whose lines are all blank." 384msgstr "" 385 386#: src/diff.c:841 src/sdiff.c:190 387msgid "" 388"-I RE --ignore-matching-lines=RE Ignore changes whose lines all match RE." 389msgstr "" 390 391#: src/diff.c:842 src/sdiff.c:191 392msgid "--strip-trailing-cr Strip trailing carriage return on input." 393msgstr "" 394 395#: src/diff.c:844 396msgid "--binary Read and write data in binary mode." 397msgstr "" 398 399#: src/diff.c:846 src/diff3.c:451 src/sdiff.c:192 400msgid "-a --text Treat all files as text." 401msgstr "" 402 403#: src/diff.c:848 404msgid "" 405"-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " 406"context.\n" 407"-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified " 408"context.\n" 409" --label LABEL Use LABEL instead of file name.\n" 410" -p --show-c-function Show which C function each change is in.\n" 411" -F RE --show-function-line=RE Show the most recent line matching RE." 412msgstr "" 413 414#: src/diff.c:853 415msgid "-q --brief Output only whether files differ." 416msgstr "" 417 418#: src/diff.c:854 419msgid "-e --ed Output an ed script." 420msgstr "" 421 422#: src/diff.c:855 423msgid "--normal Output a normal diff." 424msgstr "" 425 426#: src/diff.c:856 427msgid "-n --rcs Output an RCS format diff." 428msgstr "" 429 430#: src/diff.c:857 431msgid "" 432"-y --side-by-side Output in two columns.\n" 433" -W NUM --width=NUM Output at most NUM (default 130) print columns.\n" 434" --left-column Output only the left column of common lines.\n" 435" --suppress-common-lines Do not output common lines." 436msgstr "" 437 438#: src/diff.c:861 439msgid "-D NAME --ifdef=NAME Output merged file to show `#ifdef NAME' diffs." 440msgstr "" 441 442#: src/diff.c:862 443msgid "" 444"--GTYPE-group-format=GFMT Similar, but format GTYPE input groups with GFMT." 445msgstr "" 446 447#: src/diff.c:863 448msgid "--line-format=LFMT Similar, but format all input lines with LFMT." 449msgstr "" 450 451#: src/diff.c:864 452msgid "" 453"--LTYPE-line-format=LFMT Similar, but format LTYPE input lines with LFMT." 454msgstr "" 455 456#: src/diff.c:865 457msgid " LTYPE is `old', `new', or `unchanged'. GTYPE is LTYPE or `changed'." 458msgstr "" 459 460#: src/diff.c:866 461msgid "" 462" GFMT may contain:\n" 463" %< lines from FILE1\n" 464" %> lines from FILE2\n" 465" %= lines common to FILE1 and FILE2\n" 466" %[-][WIDTH][.[PREC]]{doxX}LETTER printf-style spec for LETTER\n" 467" LETTERs are as follows for new group, lower case for old group:\n" 468" F first line number\n" 469" L last line number\n" 470" N number of lines = L-F+1\n" 471" E F-1\n" 472" M L+1" 473msgstr "" 474 475#: src/diff.c:877 476msgid "" 477" LFMT may contain:\n" 478" %L contents of line\n" 479" %l contents of line, excluding any trailing newline\n" 480" %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" 481msgstr "" 482 483#: src/diff.c:881 484msgid "" 485" Either GFMT or LFMT may contain:\n" 486" %% %\n" 487" %c'C' the single character C\n" 488" %c'\\OOO' the character with octal code OOO" 489msgstr "" 490 491#: src/diff.c:886 492msgid "-l --paginate Pass the output through `pr' to paginate it." 493msgstr "" 494 495#: src/diff.c:887 src/sdiff.c:198 496msgid "-t --expand-tabs Expand tabs to spaces in output." 497msgstr "" 498 499#: src/diff.c:888 src/diff3.c:452 500msgid "-T --initial-tab Make tabs line up by prepending a tab." 501msgstr "" 502 503#: src/diff.c:890 504msgid "-r --recursive Recursively compare any subdirectories found." 505msgstr "" 506 507#: src/diff.c:891 508msgid "-N --new-file Treat absent files as empty." 509msgstr "" 510 511#: src/diff.c:892 512msgid "--unidirectional-new-file Treat absent first files as empty." 513msgstr "" 514 515#: src/diff.c:893 516msgid "-s --report-identical-files Report when two files are the same." 517msgstr "" 518 519#: src/diff.c:894 520msgid "-x PAT --exclude=PAT Exclude files that match PAT." 521msgstr "" 522 523#: src/diff.c:895 524msgid "" 525"-X FILE --exclude-from=FILE Exclude files that match any pattern in FILE." 526msgstr "" 527 528#: src/diff.c:896 529msgid "" 530"-S FILE --starting-file=FILE Start with FILE when comparing directories." 531msgstr "" 532 533#: src/diff.c:897 534msgid "" 535"--from-file=FILE1 Compare FILE1 to all operands. FILE1 can be a directory." 536msgstr "" 537 538#: src/diff.c:898 539msgid "" 540"--to-file=FILE2 Compare all operands to FILE2. FILE2 can be a directory." 541msgstr "" 542 543#: src/diff.c:900 544msgid "--horizon-lines=NUM Keep NUM lines of the common prefix and suffix." 545msgstr "" 546 547#: src/diff.c:901 src/sdiff.c:200 548msgid "-d --minimal Try hard to find a smaller set of changes." 549msgstr "" 550 551#: src/diff.c:902 552msgid "" 553"--speed-large-files Assume large files and many scattered small changes." 554msgstr "" 555 556#: src/diff.c:907 557msgid "" 558"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'." 559msgstr "" 560 561#: src/diff.c:908 562msgid "" 563"If --from-file or --to-file is given, there are no restrictions on FILES." 564msgstr "" 565 566#: src/diff.c:909 src/diff3.c:474 src/sdiff.c:222 567msgid "If a FILE is `-', read standard input." 568msgstr "" 569 570#: src/diff.c:920 571#, c-format 572msgid "Usage: %s [OPTION]... FILES\n" 573msgstr "" 574 575#: src/diff.c:949 576#, c-format 577msgid "conflicting %s option value `%s'" 578msgstr "" 579 580#: src/diff.c:962 581msgid "conflicting output style options" 582msgstr "" 583 584#: src/diff.c:976 585msgid "regular empty file" 586msgstr "" 587 588#: src/diff.c:976 589msgid "regular file" 590msgstr "" 591 592#: src/diff.c:978 593msgid "directory" 594msgstr "" 595 596#: src/diff.c:981 597msgid "block special file" 598msgstr "" 599 600#: src/diff.c:984 601msgid "character special file" 602msgstr "" 603 604#: src/diff.c:987 605msgid "fifo" 606msgstr "" 607 608#: src/diff.c:991 609msgid "socket" 610msgstr "" 611 612#: src/diff.c:994 613msgid "message queue" 614msgstr "" 615 616#: src/diff.c:997 617msgid "semaphore" 618msgstr "" 619 620#: src/diff.c:1000 621msgid "shared memory object" 622msgstr "" 623 624#: src/diff.c:1003 625msgid "typed memory object" 626msgstr "" 627 628#: src/diff.c:1006 629msgid "weird file" 630msgstr "" 631 632#: src/diff.c:1070 src/diff.c:1256 633#, c-format 634msgid "Only in %s: %s\n" 635msgstr "" 636 637#: src/diff.c:1193 638msgid "cannot compare `-' to a directory" 639msgstr "" 640 641#: src/diff.c:1220 642msgid "-D option not supported with directories" 643msgstr "" 644 645#: src/diff.c:1229 646#, c-format 647msgid "Common subdirectories: %s and %s\n" 648msgstr "" 649 650#: src/diff.c:1266 651#, c-format 652msgid "File %s is a %s while file %s is a %s\n" 653msgstr "" 654 655#: src/diff.c:1345 656#, c-format 657msgid "Files %s and %s are identical\n" 658msgstr "" 659 660#: src/diff3.c:26 661msgid "Written by Randy Smith." 662msgstr "" 663 664#: src/diff3.c:328 665msgid "incompatible options" 666msgstr "" 667 668#: src/diff3.c:368 669msgid "`-' specified for more than one input file" 670msgstr "" 671 672#: src/diff3.c:408 src/diff3.c:1232 src/diff3.c:1645 src/diff3.c:1700 673#: src/sdiff.c:305 src/sdiff.c:879 src/sdiff.c:890 674msgid "read failed" 675msgstr "" 676 677#: src/diff3.c:441 678msgid "-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE." 679msgstr "" 680 681#: src/diff3.c:442 682msgid "-E --show-overlap Output unmerged changes, bracketing conflicts." 683msgstr "" 684 685#: src/diff3.c:443 686msgid "-A --show-all Output all changes, bracketing conflicts." 687msgstr "" 688 689#: src/diff3.c:444 690msgid "-x --overlap-only Output overlapping changes." 691msgstr "" 692 693#: src/diff3.c:445 694msgid "-X Output overlapping changes, bracketing them." 695msgstr "" 696 697#: src/diff3.c:446 698msgid "-3 --easy-only Output unmerged nonoverlapping changes." 699msgstr "" 700 701#: src/diff3.c:448 702msgid "-m --merge Output merged file instead of ed script (default -A)." 703msgstr "" 704 705#: src/diff3.c:449 706msgid "-L LABEL --label=LABEL Use LABEL instead of file name." 707msgstr "" 708 709#: src/diff3.c:450 710msgid "-i Append `w' and `q' commands to ed scripts." 711msgstr "" 712 713#: src/diff3.c:453 src/sdiff.c:202 714msgid "--diff-program=PROGRAM Use PROGRAM to compare files." 715msgstr "" 716 717#: src/diff3.c:465 718#, c-format 719msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" 720msgstr "" 721 722#: src/diff3.c:467 723msgid "Compare three files line by line." 724msgstr "" 725 726#: src/diff3.c:673 727msgid "internal error: screwup in format of diff blocks" 728msgstr "" 729 730#: src/diff3.c:971 731#, c-format 732msgid "%s: diff failed: " 733msgstr "" 734 735#: src/diff3.c:993 736msgid "internal error: invalid diff type in process_diff" 737msgstr "" 738 739#: src/diff3.c:1018 740msgid "invalid diff format; invalid change separator" 741msgstr "" 742 743#: src/diff3.c:1242 744msgid "invalid diff format; incomplete last line" 745msgstr "" 746 747#: src/diff3.c:1265 src/sdiff.c:273 748#, c-format 749msgid "subsidiary program `%s' not executable" 750msgstr "" 751 752#: src/diff3.c:1268 src/sdiff.c:276 src/util.c:298 753#, c-format 754msgid "subsidiary program `%s' not found" 755msgstr "" 756 757#: src/diff3.c:1272 src/sdiff.c:268 src/util.c:301 758#, c-format 759msgid "subsidiary program `%s' failed" 760msgstr "" 761 762#: src/diff3.c:1294 763msgid "invalid diff format; incorrect leading line chars" 764msgstr "" 765 766#: src/diff3.c:1370 767msgid "internal error: invalid diff type passed to output" 768msgstr "" 769 770#: src/diff3.c:1647 src/diff3.c:1704 771msgid "input file shrank" 772msgstr "" 773 774#: src/dir.c:162 775#, c-format 776msgid "cannot compare file names `%s' and `%s'" 777msgstr "" 778 779#: src/sdiff.c:35 780msgid "Written by Thomas Lord." 781msgstr "" 782 783#: src/sdiff.c:183 784msgid "-o FILE --output=FILE Operate interactively, sending output to FILE." 785msgstr "" 786 787#: src/sdiff.c:185 788msgid "-i --ignore-case Consider upper- and lower-case to be the same." 789msgstr "" 790 791#: src/sdiff.c:188 792msgid "-W --ignore-all-space Ignore all white space." 793msgstr "" 794 795#: src/sdiff.c:194 796msgid "-w NUM --width=NUM Output at most NUM (default 130) columns per line." 797msgstr "" 798 799#: src/sdiff.c:195 800msgid "-l --left-column Output only the left column of common lines." 801msgstr "" 802 803#: src/sdiff.c:196 804msgid "-s --suppress-common-lines Do not output common lines." 805msgstr "" 806 807#: src/sdiff.c:201 808msgid "" 809"-H --speed-large-files Assume large files and many scattered small changes." 810msgstr "" 811 812#: src/sdiff.c:214 813#, c-format 814msgid "Usage: %s [OPTION]... FILE1 FILE2\n" 815msgstr "" 816 817#: src/sdiff.c:215 818msgid "Side-by-side merge of file differences." 819msgstr "" 820 821#: src/sdiff.c:327 822msgid "cannot interactively merge standard input" 823msgstr "" 824 825#: src/sdiff.c:588 826msgid "both files to be compared are directories" 827msgstr "" 828 829#: src/sdiff.c:853 830msgid "" 831"ed:\tEdit then use both versions, each decorated with a header.\n" 832"eb:\tEdit then use both versions.\n" 833"el:\tEdit then use the left version.\n" 834"er:\tEdit then use the right version.\n" 835"e:\tEdit a new version.\n" 836"l:\tUse the left version.\n" 837"r:\tUse the right version.\n" 838"s:\tSilently include common lines.\n" 839"v:\tVerbosely include common lines.\n" 840"q:\tQuit.\n" 841msgstr "" 842