Make PR merge options more intuitive

[aaribaud]

Reword options making clear whether the PRed branch is rebased or not, and which type of commit will be created if any.

Fix #5863

[aaribaud]

Not sure why the build fails. I ran it fine locally, plus the patch does not actually change any code, only locale strings.

[markkrj]

IMHO current is better, and it is consistent with git defaults.

[codecov-commenter]

Codecov Report

Merging #16582 (d9a8ee8) into main (24366ed) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main   #16582      +/-   ##
==========================================
- Coverage   45.37%   45.35%   -0.02%     
==========================================
  Files         750      750              
  Lines       85098    85098              
==========================================
- Hits        38611    38599      -12     
- Misses      40243    40254      +11     
- Partials     6244     6245       +1     

Impacted Files	Coverage Δ
services/pull/temp_repo.go	30.76% <0.00%> (-3.85%)	⬇️
services/pull/check.go	25.51% <0.00%> (-2.76%)	⬇️
modules/log/event.go	60.64% <0.00%> (-1.86%)	⬇️
services/pull/patch.go	54.23% <0.00%> (-1.70%)	⬇️
modules/log/file.go	73.60% <0.00%> (-1.61%)	⬇️
modules/queue/workerpool.go	53.81% <0.00%> (-1.15%)	⬇️
routers/web/repo/view.go	41.52% <0.00%> (+0.57%)	⬆️
modules/queue/unique_queue_disk_channel.go	48.63% <0.00%> (+1.36%)	⬆️
modules/git/blame.go	67.14% <0.00%> (+1.42%)	⬆️
models/unit.go	43.83% <0.00%> (+2.73%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 24366ed...d9a8ee8. Read the comment docs.

[zeripath]

make lgtm work