View | Details | Raw Unified | Return to bug 131574
Collapse All | Expand All

(-)compare/org/eclipse/compare/internal/patch/PatchMessages.properties (-7 / +7 lines)
Lines 74-93 Link Here
74 
PreviewPatchPage2_4=Performing this operation will require that your manual changes be discarded.
 74 
PreviewPatchPage2_4=Performing this operation will require that your manual changes be discarded.
75 
PreviewPatchPage2_5=Changing the fuzz factor will require that your manual changes be discarded.
 75 
PreviewPatchPage2_5=Changing the fuzz factor will require that your manual changes be discarded.
76 
PreviewPatchPage2_6=Changing the fuzz factor will require that your manual changes be discarded.
 76 
PreviewPatchPage2_6=Changing the fuzz factor will require that your manual changes be discarded.
77 
PreviewPatchPage2_7=Show Excluded
 77 
PreviewPatchPage2_7=&Show Excluded
78 
PreviewPatchPage2_8=Review the patch with respect to the local file system and manually merge any unmatched portions. Double-click on file or patch segment entries to view their content.
 78 
PreviewPatchPage2_8=Review the patch with respect to the local file system and manually merge any unmatched portions. Double-click on file or patch segment entries to view their content.
79 
PreviewPatchPage_Target=(target: {0})
 79 
PreviewPatchPage_Target=(target: {0})
80 
PreviewPatchPage_PatchOptions_title=Patch options
 80 
PreviewPatchPage_PatchOptions_title=Patch options
81 
PreviewPatchPage_IgnoreSegments_text=&Ignore leading path name segments:
 81 
PreviewPatchPage_IgnoreSegments_text=&Ignore leading path name segments:
82 
PreviewPatchPage_ReversePatch_text=Reverse patch
 82 
PreviewPatchPage_ReversePatch_text=&Reverse patch
83 
PreviewPatchPage_FuzzFactor_text=&Maximum fuzz factor:
 83 
PreviewPatchPage_FuzzFactor_text=&Fuzz factor:
84 
PreviewPatchPage2_RetargetAction=&Move
 84 
PreviewPatchPage2_RetargetAction=&Move
85 
PreviewPatchPage2_RetargetTooltip=Move the selected patch element to another resource
 85 
PreviewPatchPage2_RetargetTooltip=Move the selected patch element to another resource
86 
PreviewPatchPage2_OrphanedHunk=Unmatched Patch Segment
 86 
PreviewPatchPage2_OrphanedHunk=Unmatched Patch Segment
87 
PreviewPatchPage2_IgnoreWSAction=Ignore WhiteSpace
 87 
PreviewPatchPage2_IgnoreWSAction=Ignore whitespace
88 
PreviewPatchPage_FuzzFactor_tooltip=Allow Context to Shift This Number of Lines from the Original Location
 88 
PreviewPatchPage_FuzzFactor_tooltip=Allow this number of context lines to be ignored
89 
PreviewPatchPage_FileExists_error=(file already exists)
 89 
PreviewPatchPage_FileExists_error=(file already exists)
90 
PreviewPatchPage2_IgnoreWSTooltip=Ignore WhiteSpace
 90 
PreviewPatchPage2_IgnoreWSTooltip=Ignore whitespace
91 
PreviewPatchPage2_IgnoreWhitespace=Ignore whitespace
 91 
PreviewPatchPage2_IgnoreWhitespace=Ignore whitespace
92 
PreviewPatchPage2_PatchedLocalFile=Patched Local File
 92 
PreviewPatchPage2_PatchedLocalFile=Patched Local File
93 
PreviewPatchPage2_CalculateReverse=Calculating reverse
 93 
PreviewPatchPage2_CalculateReverse=Calculating reverse
Lines 106-111 Link Here
106 
Patcher_Task_message=Patching
 106 
Patcher_Task_message=Patching
107 
Diff_2Args={0} {1}
 107 
Diff_2Args={0} {1}
108 
HunkMergePage_Merged=(merged)
 108 
HunkMergePage_Merged=(merged)
109 
HunkMergePage_GenerateRejectFile=Generate a .rej file for unmerged hunks
 109 
HunkMergePage_GenerateRejectFile=G&enerate a .rej file for unmerged hunks
110 
RetargetPatchElementDialog_0=Select the new target file for the portion of the patch targeted to file ''{0}''
 110 
RetargetPatchElementDialog_0=Select the new target file for the portion of the patch targeted to file ''{0}''
111 
RetargetPatchElementDialog_1=Select the new target file for this portion of the patch targeted to file ''{0}''
 111 
RetargetPatchElementDialog_1=Select the new target file for this portion of the patch targeted to file ''{0}''
(-)compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java (-2 / +3 lines)
Lines 412-419 Link Here
412 
		l.setLayoutData(gd);
 412 
		l.setLayoutData(gd);
413 

          413
          

        

        

          414
          
		fFuzzField= new Text(pair, SWT.BORDER);

          414
          
		fFuzzField= new Text(pair, SWT.BORDER);

        

          
            

              415
              
		fFuzzField.setText("2"); //$NON-NLS-1$


              415
              
		fFuzzField.setText("0"); //$NON-NLS-1$

            

            

              416
              
			gd= new GridData(GridData.VERTICAL_ALIGN_CENTER | GridData.HORIZONTAL_ALIGN_END); gd.widthHint= 30;


              416
              
		gd= new GridData(GridData.VERTICAL_ALIGN_CENTER | GridData.HORIZONTAL_ALIGN_END);

            

            

              
              

              417
              
		gd.widthHint= 30;

            

        

          417
          
		fFuzzField.setLayoutData(gd);

          418
          
		fFuzzField.setLayoutData(gd);

        

        

          418
          

          419
          

        

        

          419
          
		Button b= new Button(pair, SWT.PUSH);

          420
          
		Button b= new Button(pair, SWT.PUSH);

        






  

  Return to bug 131574