Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 363634 - Problem with MarkAsMergedAction.tooltip
Summary: Problem with MarkAsMergedAction.tooltip
Status: CLOSED FIXED
Alias: None
Product: Subversive
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 trivial (vote)
Target Milestone: ---   Edit
Assignee: Igor Burilo CLA
QA Contact:
URL: URL_TO_THE_STRING
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-11-11 22:13 EST by Satoru Yoshida CLA
Modified: 2012-01-06 05:36 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Satoru Yoshida CLA 2011-11-11 22:13:51 EST 
Hello , I find a problem with MarkAsMergedAction.tooltip in org.eclipse.team.svn.ui/plugin.properties .

The key value says, "Mark conflicting resource as merged an resolved" .

But I think the last 3words, "merged an resolved" may be "merged and resolved" .

Thanks.
Comment 1 Satoru Yoshida CLA 2011-11-11 22:27:26 EST 
I find also same issue at MarkAsMergedCommand_tooltip in org.eclipse.team.svn.ui/src/org/eclipse/team/svn/ui/messages.properties .

Thanks.
Comment 2 Alexander Gurov CLA 2011-11-12 04:56:11 EST 
Thank you for your help. It is fixed now.
Comment 3 Satoru Yoshida CLA 2012-01-06 05:36:10 EST 
Thank You for fix, I can ensure it in subversion 0.8 in Babel .