Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 360257 - Don't use "the user" in the UI
Summary: Don't use "the user" in the UI
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.2   Edit
Hardware: All All
: P3 trivial (vote)
Target Milestone: 1.2-M1   Edit
Assignee: Kevin Sawicki CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-07 12:39 EDT by Markus Keller CLA
Modified: 2011-11-07 16:59 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 Markus Keller CLA 2011-10-07 12:39:35 EDT 
Preferences > Team > Git: The first choice in the "Merge tool content" combo is "Ask the user when the tool is started".

The UI should address the user directly, so use you/me, not "the user". Best solution in this case is to just say "Ask when the tool is started".
Comment 1 Kevin Sawicki CLA 2011-11-07 12:18:20 EST 
Proposed fix pushed to: http://egit.eclipse.org/r/4552

Updated to be "Prompt when starting tool"
Comment 2 Matthias Sohn CLA 2011-11-07 16:59:51 EST 
merged as daa9d3da919189081e7f5b63f3461a036e51d424