mergetool.en.txt 21.5 KB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998
== MergetoolWindowTitle ==
Plastic SCM Merge tool

== FirstConflictButtonTooltip ==
Go to first conflict (Ctrl + Shift + -)

== PrevConflictButtonTooltip ==
Previous conflict (Ctrl + -)

== NextConflictButtonTooltip ==
Next conflict (Ctrl + +)

== LastConflictButtonTooltip ==
Go to last conflict (Ctrl + Shift + +)

== PrevNotAutomaticConflictButtonTooltip ==
Previous not automatic conflict (Ctrl + PageUp)

== NextNotAutomaticConflictButtonTooltip ==
Next not automatic conflict (Ctrl + PageDown)

== GtkPendingAutomaticConflictsLabel ==
{0}/{1}

== GtkPendingNonAutomaticConflictsLabel ==
Pending non-automatic: {0}/{1}

== PendingAutomaticConflictsLabel ==
Current conflict: {0} of {1}

== PendingNonAutomaticConflictsLabel ==
Pending unsolved: {0} of {1}

== NonAutomaticConflictsLabelTooltip ==
Current unsolved non-automatic conflict

== CurrentConflictLabelTooltip ==
Current merge conflict

== NonAutomaticConflictsNavigationTooltip ==
Navigate through the currently unsolved conflicts

== AutomaticConflictsNavigationTooltip ==
Navigate through the merge conflicts

== AutomaticConflictMarkup ==
Current conflict is <span foreground='green'>automatic</span>. No user intervention is required.

== NonAutomaticConflictMarkup ==
Current conflict is <span foreground='red'>non-automatic</span>. Resolve it by clicking the buttons above, editing the result file or marking it as resolved.

== NonAutomaticConflictMarkedAsResolvedMarkup ==
Current conflict is <span foreground='green'>non-automatic</span>, and it has been already <span foreground='green'>resolved</span> by the user.

== MarkAsResolvedButton ==
Mark as resolved

== MarkAsUnresolvedButton ==
Mark as unresolved

== MergetoolUsageTitle ==
Mergetool usage

== GtkMergetoolUsageHeader ==
    Usage: gtkmergetool

== MacMergetoolUsageHeader ==
    Usage: macmergetool
    
== MergetoolUsage ==
    mergeOptions: <sourceFile> [<sourceSymbolicName>] 
                  <baseFile> [<baseSymbolicName>]
                  <destinationfile> [<destinationSymbolicName>]
                  [[<autosave>] <resultFile>]
                  [<mergeType>]
                  [<generalOptions>]

        sourceFile:              {-s | --source}=<filename>
        sourceSymbolicName:      {-sn | --srcsymbolicname}=<symbolicname>
        baseFile:                {-b | --base}=<filename> 
        baseSymbolicName:        {-bn | --basesymbolicname}=<symbolicname>
        destinationFile:         {-d | --destination}=<filename>; 
        destinationSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
        autosave:                -as | --autosave
        automatic:               -a | --automatic
        silent:                  --silent
        resultFile:              {-r | --result}=<filename>
        mergeType:               {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}

    generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<resultEncoding>]

        defaultEncoding:     {-e | --defaultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
        resultEncoding:      {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
        comparisonMethod:    {-i | --ignore}={none | eol | whitespaces | ""eol&whitespaces""}

    remarks:
          
        -a | --automatic:    Tries to resolve the merge automatically.
                             If the merge can't be resolved automatically (requires user interaction), the merge tool is shown.
        --silent:            This option must be used combined with the --automatic option.
                             When a merge can't be resolved automatically, this option causes the tool to return immediately
                             with a non-zero exit code (no merge tool is shown).
                             If the tool was able to resolve the merge automatically, the program returns exit code 0.

== WinMergetoolUsage ==
Usage: mergetool [<diffOptions> | <mergeOptions>]

    diffOptions: <generalFiles> [<generalOptions>]

    mergeOptions: <generalFiles> <baseFile> [<baseSymbolicName>] [[<automatic>] [<silent>] <resultFile>] [<mergeType>] [<generalOptions>]

        baseFile:            {-b | --base}=<filename> 
        baseSymbolicName:    {-bn | --basesymbolicname}=<symbolicname>
        automatic:           -a | --automatic
        silent:              --silent
        resultFile:          {-r | --result}=<filename>
        mergeType:           {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}

    generalFiles: <sourceFile> [<srcSymbolicName>] <destination> [<dstSymbolicName>]

        sourceFile:          {-s | --source}=<filename>
        srcSymbolicName:     {-sn | --srcsymbolicname}=<symbolicname>
        destinationFile:     {-d | --destination}=<filename> 
        dstSymbolicName:     {-dn | --dstsymbolicname}=<symbolicname>

    generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<fileType>] [<resultEncoding>]

        defaultEncoding:     {-e | --encoding}={none |ascii | unicode | bigendian | utf7 | utf8}
        comparisonMethod:    {-i | --ignore}={none | eol | whitespaces | eol&whitespaces}
        fileType:            {-t | --filestype}={text/csharp | text/XML | text}
        resultEncoding:      {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
        progress:            {--progress}=progress string indicating the current progress, for example: Merging file 1/8
        extraInfoFile:       {--extrainfofile}=path to a file that contains extra info about the merge

    Remarks:
          
        -a | --automatic:    Tries to resolve the merge automatically.
                             If the merge can't be resolved automatically (requires user interaction), the merge tool is shown.
        --silent:            This option must be used combined with the --automatic option.
                             When a merge can't be resolved automatically, this option causes the tool to return immediately
                             with a non-zero exit code (no merge tool is shown).
                             If the tool was able to resolve the merge automatically, the program returns exit code 0.

    Examples:

        mergetool
        mergetool -s=file1.txt -d=file2.txt
        mergetool -s=file1.txt -b=file0.txt --destination=file2.txt
        mergetool --base=file0.txt -d=file2.txt --source=file1.txt --automatic --result=result.txt
        mergetool -b=file0.txt -s=file1.txt -d=file2.txt -a -r=result.txt -e=utf7 -i=eol -t=text/csharp -m=onlyone
        
== BrowseForSaveFileTitle ==
Save file

== PendingUnsolvedConflicts ==
The file still has {0} unsolved conflicts.

== FileChangedSinceSaved ==
The file has been changed since it was last saved.

== SaveAndExitDialogButton ==
Save & exit

== ExitWithoutSavingButton ==
Exit without saving

== CloseButton ==
Close

== OkButton ==
OK

== CancelButton ==
Cancel

== SourceHeaderButton ==
Select Source: '{0}'

== SourceHeaderPressedButton ==
Deselect Source: '{0}'

== SourceHeaderButtonTooltip ==
(Ctrl+1)

== BaseHeaderButton ==
Select Base: '{0}'

== BaseHeaderPressedButton ==
Deselect Base: '{0}'

== BaseHeaderButtonTooltip ==
(Ctrl+2)

== DestinationHeaderButton ==
Select Destination: '{0}'

== DestinationHeaderPressedButton ==
Deselect Destination: '{0}'

== DestinationHeaderButtonTooltip ==
(Ctrl+3)

== ResultButton ==
Select Result

== ResultPressedButton ==
Deselect Result

== ResultButtonTooltip ==
(Ctrl+4)

== SaveAndExitButton ==
Save & exit

== SaveAndExitTooltip ==
Save result and close mergetool

== SaveAsTooltip ==
Save result in a new file

== SaveButton ==
Save

== SaveButtonTooltip ==
Save changes (Ctrl+S)

== SaveButtonTooltipWithCustomShortcut ==
Save changes ({0})

== SaveAsMenu ==
Save as...

== MergeButton ==
Merge

== KeepSrcMenu ==
Keep source contributor & exit

== KeepBaseMenu ==
Keep base contributor & exit

== KeepDstMenu ==
Keep destination contributor & exit

== SrcNeeded ==
Source file name is needed

== DstNeeded ==
Destination file name is needed

== ResultNeeded ==
In automatic merge result file name is needed

== AutomaticNeeded ==
In silent mode the automatic merge option is needed

== FileTypeError ==
{0} isn't a valid file type for syntax highlight

== CompMethodError ==
Invaild comparison method

== ArgError ==
The specified arguments are not valid

== SrcEncodingMenuTitle ==
Source encoding

== DstEncodingMenuTitle ==
Destination encoding

== BaseEncodingMenuTitle ==
Base encoding

== ResultEncodingMenuTitle ==
Result encoding

== SplitBlocksMenuTitle ==
Split conflict blocks

== ComparisonMethodMenuTitle ==
Comparison method

== RecognizeAll ==
Recognize all

== IgnoreEol ==
Ignore EOLs

== IgnoreWhitespace ==
Ignore whitespaces

== IgnoreEolWhitespace ==
Ignore EOLs and whitespaces

== EncodingDialogTitle ==
Select encoding

== EncodingDialogDescription ==
Select a character encoding

== EncodingDialogLabel ==
Encoding:

== DefaultEncoding ==
Default encoding:

== ResultEncoding ==
Result encoding:

== NoneEncoding ==
NONE

== AsciiEncoding ==
ASCII

== UnicodeEncoding ==
Unicode

== UnicodeBigEndianEncoding ==
Unicode Big-Endian

== Utf7Encoding ==
UTF-7

== Utf8Encoding ==
UTF-8

== OtherEncoding ==
Other...

== ChangeEncoding ==
Change...

== Options ==
Options

== FindButton ==
Find...

== MatchCase ==
Match case

== MergeResolutionOptionsTooltip ==
Merge resolution options

== MergeOptionsTooltip ==
Display and calculation options

== SyntaxHighlight ==
Syntax highlight

== FirstDiffButtonTooltip ==
First difference

== PrevDiffButtonTooltip ==
Previous difference

== NextDiffButtonTooltip ==
Next difference

== LastDiffButtonTooltip ==
Last difference

== FirstDiffButtonTooltipWithShortcut ==
First difference (Ctrl + Shift + n)

== PrevDiffButtonTooltipWithShortcut ==
Previous difference (Ctrl + n)

== NextDiffButtonTooltipWithShortcut ==
Next difference (Ctrl + m)

== LastDiffButtonTooltipWithShortcut ==
Last difference (Ctrl + Shift + m)

== CurrentDifference ==
Current: {0}/{1}

== LeftEncoding ==
Left encoding

== RightEncoding ==
Right encoding

== DifferencesWindowTitle ==
Differences

== AutomaticConflictChunk1 ==
Current conflict is 

== AutomaticConflictChunk2 ==
automatic

== AutomaticConflictChunk3 ==
. No user intervention is required.

== SolvedConflictChunk1 ==
Current conflict is 

== SolvedConflictChunk2 ==
non-automatic

== SolvedConflictChunk3 ==
, and it has been already 

== SolvedConflictChunk4 ==
resolved

== SolvedConflictChunk5 ==
 by the user.

== NonAutomaticConflictChunk1 ==
Current conflict is 

== NonAutomaticConflictChunk2 ==
non-automatic

== NonAutomaticConflictChunk3 ==
. Resolve it by clicking the buttons above, editing the result file or marking it as resolved.

== PatternNotFound ==
Pattern not found

== PreviousSearchButtonTooltip ==
Search previous match

== NextSearchButtonTooltip ==
Search next match

== UnexpectedError ==
An unexpected error has occurred.

== GoToLineMenuItem ==
Go to line...

== AddDiffSelectionMenuItem ==
Add diff selection

== DiffWithPreviousSelectionMenuItem ==
Diff with previous selection

== FindMenuItem ==
Find...

== FindNextMenuItem ==
Find next

== FirstSelection ==
First selection

== SecondSelection ==
Second selection

== SemanticDiffMovedCode ==
Diff moved code...

== SemanticGoToMovedCode ==
Go to moved code

== SemanticDiffChangedCode ==
Diff changed code...

== SyncMovedCode ==
Sync moved code on top

== UnsyncMovedCode ==
Restore scroll position

== OutliningMenu ==
Outlining

== CollapseRegionsWithoutDiffsMenu ==
Collapse regions without diffs

== CollapseToDefinitionsMenu ==
Collapse to definitions

== ExpandAllMenu ==
Expand all

== Merged ==
Merged

== LoadingAnnotations ==
Loading annotations...

== AnnotateLineInfoChangeset ==
Changeset

== AnnotateLineInfoTimeStamp ==
Creation date

== AnnotateLineInfoOwner ==
Owner

== AnnotateLineInfoComments ==
Comments

== AnnotateColorByAuthor ==
Color by author

== AnnotateColorByDate ==
Color by date

== AnnotateContextMenu ==
Annotate

== AnnotateShowAuthor ==
Show author

== AnnotateShowBranch ==
Show branch

== AnnotateShowChangeInMerge ==
Show whether line was changed in a merge

== AnnotateShowChangeset ==
Show changeset

== AnnotateShowDateModified ==
Show date modified

== AnnotateShowLineAge ==
Show line age

== BigFileMessage ==
The file is quite big. Calculating differences could take a while. Click the button if you really want to calculate the differences for this file.

== CalculateDifferencesButton ==
Calculate differences

== BigFileContentsMessage ==
The file is quite big. Showing the content could take a while. Click the button if you really want to show the content for this file.

== ShowContentButton ==
Show content

== BranchChanges ==
Branch changes

== BranchChangesTooltip ==
Highlight changes done in the branch

== ConflictChanges ==
Conflict changes

== ConflictChangesTooltip ==
Highlight changes with conflicts that the user solved during the merge

== MergedChanges ==
Merged changes

== MergedChangesTooltip ==
Highlight changes coming from a merge

== CaseSensitiveCheckBox ==
Match case

== ColorsConfigurationMenuItem ==
Configure fonts and colors...

== ComparisonMethodMenuItem ==
Comparison method

== ComparisonMethodIgnoreEolMenuItem ==
Ignore EOL

== ComparisonMethodIgnoreWhitespacesMenuItem ==
Ignore whitespaces

== ComparisonMethodIgnoreEolWhitespacesMenuItem ==
Ignore EOL and whitespaces

== ComparisonMethodRecognizeAllMenuItem ==
Recognize all

== Content ==
Content of {0}

== CopyToClipboard ==
Copy to clipboard

== DiffWaitingAnimation ==
Calculating differences...

== ContentWaitingAnimation  ==
Calculating contents to show...

== DiscardButton ==
Discard

== DiscardButtonTooltip ==
Discard changes

== EditorOptions ==
Editor options

== EditorOptionsConvertTabsToSpaces ==
Convert tabs to spaces while editing

== EditorOptionsWhistespaces ==
View whitespaces

== EditorOptionsTabs ==
Tabs

== EditorOptionsTabsSpacesNumber ==
{0} spaces

== EditorOptionsColumnGuides ==
Column guides

== EditorOptionsColumnsNumber ==
{0} columns

== EditorOptionsBorderLines ==
View border lines for unselected regions

== EncodingDifferences ==
Encoding changed from {0} to {1}.

== FsProtectionDifferences ==
Filesystem permissions changed from {0} to {1}

== UnableCalculateDiffs ==
Unable to calculate the differences.

== HideUnchanged ==
hide unchanged

== HideUnchangedTooltip ==
show changed declarations only

== ShowUnchanged ==
show unchanged

== ShowUnchangedTooltip ==
show the complete file trees, so you can check every declaration

== GroupUnchanged ==
group unchanged

== GroupUnchangedTooltip ==
show changed declarations grouping the rest of the declarations into an single, unchanged one

== ZoomIn ==
zoom in

== ZoomInTooltip ==
zoom in on the graphic - you can also use the scroll wheel while holding the control key pressed

== ZoomOut ==
zoom out

== ZoomOutTooltip ==
zoom out on the graphic - you can also use the scroll wheel while holding the control key pressed

== ErrorSavingFile ==
An error occured saving the file: {0}

== Find ==
Find:

== FindCloseButtonTooltip ==
Close search bar

== FindPreviousButtonTooltip ==
Search previous match

== FindNextButtonTooltip ==
Search next match

== MovedDetectionMenuItem ==
Moved detection

== MovedDetectionDialogMenuItem ==
Moved detection...

== EnableMoveDetectionMenuItem ==
Enable moved detection

== MoveDetectionRatio ==
Move detection ratio

== MinimumLinesInDifference ==
Minimum lines in difference

== MaximizeButtonLeftTooltip ==
Maximize left panel

== MaximizeButtonRightTooltip ==
Maximize right panel

== RestoreButtonLeftTooltip ==
Restore left panel

== RestoreButtonRightTooltip ==
Restore right panel

== OutliningPreferencesTitle ==
Outlining preferences

== OutliningPreferencesCaption ==
Outlining preferences

== OutliningPreferencesDetails ==
Select your preferred outlining mode when a file loads

== OutliningPreferencesExplanation ==
After a file is loaded, use the following outlining mode:

== OutliningPreferencesCollapseWithoutDiffs ==
Collapse regions without differences

== OutliningPreferencesCollapseToDefinitions ==
Collapse to definitions

== OutliningPreferencesExpandAll ==
Expand all

== NavigationTooltip ==
Go to moved fragment

== XDiffTooltip ==
Show differences of moved fragment side by side

== XDiffFragment ==
[fragment]

== FontsAndColorsMenuItem ==
Fonts and colors

== FontDoesNotSupportStrikeout ==
The font {0} does not support the strikeout style, used by the application. Please choose other font.

== ChangeFontMenuItem ==
Change font...

== LeftDiffColorMenuItem ==
Left diff color

== RightDiffColorMenuItem ==
Right diff color

== RestoreDefaultsMenuItem ==
Restore defaults

== FilesIdentical ==
Files are identical.

== AddDiffSelection ==
Add diff selection

== DiffWithPreviousSelection ==
Diff with previous selection

== DiffSourceWithBase ==
Diff base with source contributor

== DiffDestinationWithBase ==
Diff base with destination contributor

== DiffDestinationWithSource ==
Diff source with destination contributor

== Encoding ==
Encoding

== FontMenuItem ==
Font

== DuplicatedArg ==
Duplicated argument {0}.

== MergeTypeError ==
{0} isn't a valid merge resolution type

== MergeExplanation ==
This option launches a 3 - way merge tool, involving base, source and destination files.You'll be able to save the result to another file.

== DifferencesExplanation ==
This option launches a visual text file differencing tool.Please select two files to see textual differences between them.

== XMergeNoChanges ==
Xmerge result is empty.No changes will be performed.

== XMergeConfirmationMessage ==
Xmerge result will replace your selection, and the not automatic conflict will be discarded. Do you want to continue?

== SourceDesc ==
source (code you are merging)

== SourceLoc ==
in the source

== DestinationDesc ==
destination (your working copy)

== DestinationLoc ==
in the destination

== HowXMergeFormat ==
You have a merge conflict but the {0} is not there anymore.

What has happened? Most likely one developer has moved a piece of code ({1}) and another developer has modified that piece of code in the original location ({2}).

== UnauthorizedAccessFile ==
File '{0}' cannot be saved because you don't have permission. You can save the file in another path.

== AutomaticConflictMarkup1 ==
Current conflict is 

== AutomaticConflictMarkup2 ==
automatic

== AutomaticConflictMarkup3 ==
. No user intervention is required.

== SolvedConflictMarkup1 ==
Current conflict is 

== SolvedConflictMarkup2 ==
non-automatic

== SolvedConflictMarkup3 ==
 , and it has been already 

== SolvedConflictMarkup4 ==
resolved

== SolvedConflictMarkup5 ==
 by the user.

== NonAutomaticConflictMarkup1 ==
Current conflict is 

== NonAutomaticConflictMarkup2 ==
non-automatic

== NonAutomaticConflictMarkup3 ==
. Resolve it by clicking the buttons above, editing the result file or marking it as resolved.

== MarkAsResolvedExplanation ==
Select the contributors that should go to the result file using thee buttons below (source, base or destination). Or, if the suggested result is already good, click \"Mark as resolved\"

== SourceFileName ==
Source file: {0}

== BaseFileName ==
Base file: {0}

== DestinationFileName ==
Destination file: {0}

== RestoreButtonSrcTooltip ==
Restore src panel

== RestoreButtonBaseTooltip ==
Restore base panel

== RestoreButtonDstTooltip ==
Restore dst panel

== RestoreButtonResultTooltip ==
Restore result panel

== MaximizeButtonSrcTooltip ==
Maximize src panel

== MaximizeButtonBaseTooltip ==
Maximize base panel

== MaximizeButtonDstTooltip ==
Maximize dst panel

== MaximizeButtonResultTooltip ==
Maximize result panel

== PendingNonAutomatic ==
Pending to solve: {0}/{1}

== PreviousConflictButtonTooltip ==
Previous conflict(Ctrl+-)

== PreviousUnsolvedConflictButtonTooltip ==
Previous not automatic conflict (Ctrl+PageUp)

== NextUnsolvedConflictButtonTooltip ==
Next not automatic conflict (Ctrl+PagDown)

== OptionsButton ==
Options

== BaseEncodingMenuItem ==
Base encoding

== SrcEncodingMenuItem ==
Source encoding

== DstEncodingMenuItem ==
Destination encoding

== ResultEncodingMenuItem ==
Result encoding

== SplitMenuItem ==
Split conflict blocks

== XmergeButton ==
XMerge...

== XmergeButtonTooltip ==
Launch XMerge wizard

== XmergeMenuItem ==
XMerge...

== XmergeNoTextSelected ==
There is no text selected. Can't perform Xmerge.

== XmergeNotEnoughInfo ==
Not enough information to perform XMerge

== XmergeRemovedTextSelected ==
The selected lines are removed. They are not valid as Xmerge selection.

== XmergeStartTip ==
This window shows the moved and the modifed code fragments. The moved code is on the {0} ({1}). On the {2} ({3}) the modified code before it was moved.Solve the remaining manual conflicts and click on \"Save & Exit\".

== UnsolvedPendingConflicts ==
The file still has {0} unsolved conflicts.

== ChangedFile ==
The file has been changed since it was last saved.

== MergeWaitingAnimation ==
Calculating conflicts. Please wait...

== SaveAsButton ==
Save as...

== SaveBaseContributor ==
Keep base contributor & exit

== SaveDstContributor ==
Keep destination contributor & exit

== SaveSrcContributor ==
Keep source contributor & exit

== ExtraInfoButton ==
Info about this merge

== ExtraInfoButtonTooltip ==
Show the info about this merge in a panel

== Left ==
left

== Right ==
right

== SourceContributor ==
source contributor

== DestinationContributor ==
destination contributor

== MovedCode ==
Moved piece of code.

== ModifiedCode ==
Modified piece of code in the original location.

== OriginalCode ==
Original piece of code.

== ResultFile ==
Result file

== AnnotateOptions ==
Annotate options

== Copy ==
Copy

== Cut ==
Cut

== Paste ==
Paste

== SelectAll ==
Select all

== FileTooLargeToDisplay ==
File is too large to display content.