### Eclipse Workspace Patch 1.0 #P org.eclipse.compare Index: compare/org/eclipse/compare/internal/patch/PatchMessages.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchMessages.properties,v retrieving revision 1.42 diff -u -r1.42 PatchMessages.properties --- compare/org/eclipse/compare/internal/patch/PatchMessages.properties 28 May 2007 20:40:34 -0000 1.42 +++ compare/org/eclipse/compare/internal/patch/PatchMessages.properties 20 Oct 2007 12:31:15 -0000 @@ -74,20 +74,20 @@ PreviewPatchPage2_4=Performing this operation will require that your manual changes be discarded. PreviewPatchPage2_5=Changing the fuzz factor will require that your manual changes be discarded. PreviewPatchPage2_6=Changing the fuzz factor will require that your manual changes be discarded. -PreviewPatchPage2_7=Show Excluded +PreviewPatchPage2_7=&Show Excluded 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. PreviewPatchPage_Target=(target: {0}) PreviewPatchPage_PatchOptions_title=Patch options PreviewPatchPage_IgnoreSegments_text=&Ignore leading path name segments: -PreviewPatchPage_ReversePatch_text=Reverse patch -PreviewPatchPage_FuzzFactor_text=&Maximum fuzz factor: +PreviewPatchPage_ReversePatch_text=&Reverse patch +PreviewPatchPage_FuzzFactor_text=&Fuzz factor: PreviewPatchPage2_RetargetAction=&Move PreviewPatchPage2_RetargetTooltip=Move the selected patch element to another resource PreviewPatchPage2_OrphanedHunk=Unmatched Patch Segment -PreviewPatchPage2_IgnoreWSAction=Ignore WhiteSpace -PreviewPatchPage_FuzzFactor_tooltip=Allow Context to Shift This Number of Lines from the Original Location +PreviewPatchPage2_IgnoreWSAction=Ignore whitespace +PreviewPatchPage_FuzzFactor_tooltip=Allow this number of context lines to be ignored PreviewPatchPage_FileExists_error=(file already exists) -PreviewPatchPage2_IgnoreWSTooltip=Ignore WhiteSpace +PreviewPatchPage2_IgnoreWSTooltip=Ignore whitespace PreviewPatchPage2_IgnoreWhitespace=Ignore whitespace PreviewPatchPage2_PatchedLocalFile=Patched Local File PreviewPatchPage2_CalculateReverse=Calculating reverse @@ -106,6 +106,6 @@ Patcher_Task_message=Patching Diff_2Args={0} {1} HunkMergePage_Merged=(merged) -HunkMergePage_GenerateRejectFile=Generate a .rej file for unmerged hunks +HunkMergePage_GenerateRejectFile=G&enerate a .rej file for unmerged hunks RetargetPatchElementDialog_0=Select the new target file for the portion of the patch targeted to file ''{0}'' RetargetPatchElementDialog_1=Select the new target file for this portion of the patch targeted to file ''{0}'' Index: compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java,v retrieving revision 1.27 diff -u -r1.27 PreviewPatchPage2.java --- compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java 24 Apr 2007 15:39:59 -0000 1.27 +++ compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java 20 Oct 2007 12:31:16 -0000 @@ -412,8 +412,9 @@ l.setLayoutData(gd); fFuzzField= new Text(pair, SWT.BORDER); - fFuzzField.setText("2"); //$NON-NLS-1$ - gd= new GridData(GridData.VERTICAL_ALIGN_CENTER | GridData.HORIZONTAL_ALIGN_END); gd.widthHint= 30; + fFuzzField.setText("0"); //$NON-NLS-1$ + gd= new GridData(GridData.VERTICAL_ALIGN_CENTER | GridData.HORIZONTAL_ALIGN_END); + gd.widthHint= 30; fFuzzField.setLayoutData(gd); Button b= new Button(pair, SWT.PUSH);