FormResolveConflicts: Clearer label and confirmation messages for Reset button

[mstv]

Replaces #9907, which would be too intrusive and does not work for cherry-picks

Proposed changes

• FormResolveConflicts: Just clearer label and confirmation messages for Reset button
  (The command git reset --hard will still be used.)

Screenshots

Before

After

Test methodology

• manual

Test environment(s)

• Git Extensions 33.33.33
• Build ec324af
• Git 2.35.1.windows.1
• Microsoft Windows NT 10.0.19044.0
• .NET 6.0.3
• DPI 96dpi (no scaling)

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).

---

✒️ I contribute this code under The Developer Certificate of Origin.

[gerhardol]

I have a minor preference for just Reset, but that may not be clearer...

[RussKie]

The new button text is clipped.

[mstv]

Popup title: I have a minor preference for just Reset, but that may not be clearer...

The new button text is clipped.

I was and am undecided.
Would "Reset to previous" suffice for the button? Or even just "Reset"?
Or should I resize the buttons (with some reserve for lengthy translations)?

[gerhardol]

I was and am undecided. Would "Reset to previous" suffice for the button? Or even just "Reset"? Or should I resize the buttons (with some reserve for lengthy translations)?

I find Reset enough, easier to translate and full info in the popup.
(Maybe tooltip)

[RussKie]

I think a fix would mean the dialog's updated to inherit from GitExtensionsDialog and all the buttons moved to ControlsPanel (see #6183). This way the buttons can have arbitrary widths. Though I agree that it doesn't mean that we'd want the buttons to contain more text than absolutely necessary. Tooltips can be used to provide extra data. Also each form can/should point to the relevant section in the docs, which should/can contain all the necessary information pertaining to the dialog and individual elements on it.

[EDIT] On a second thought, "All buttons" may be a stretch - some buttons may be "context dependent" and as such won't belong to the footer of the dialog.

[mstv]

I find Reset enough, easier to translate and full info in the popup.

OK, done.

(Maybe tooltip)

Tooltips can be used to provide extra data.

A tooltip would be a good idea. But the designer is broken. It is not worth fixing it right now. I think the updated label and message suffice.

I think a fix would mean the dialog's updated to inherit from GitExtensionsDialog and all the buttons moved to ControlsPanel (see #6183). This way the buttons can have arbitrary widths. Though I agree that it doesn't mean that we'd want the buttons to contain more text than absolutely necessary.

category: nice to have Not my cup of tea, anyway.

Also each form can/should point to the relevant section in the docs, which should/can contain all the necessary information pertaining to the dialog and individual elements on it.

Already there.