Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 360257

Summary: Don't use "the user" in the UI
Product: [Technology] EGit Reporter: Markus Keller <markus.kell.r>
Component: UIAssignee: Kevin Sawicki <kevin>
Status: RESOLVED FIXED QA Contact:
Severity: trivial    
Priority: P3 CC: matthias.sohn
Version: 1.2   
Target Milestone: 1.2-M1   
Hardware: All   
OS: All   
Whiteboard:

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