Commit 4eac76b
committed
Transfer dialog: relabel conflict radios for single-conflict case
- "Ask for each" was confusing with only one conflict (asking "for each" of 1 makes no sense). Now reads "Ask later".
- Same applies to the other radios: drop "all" when there's only one conflict. "Skip all" → "Skip", "Overwrite all" → "Overwrite", "Overwrite all smaller/older" → "Overwrite if smaller/older".
- Trigger is `totalConflictCount === 1`, not selection size: a single folder containing many conflicts still gets the "all" wording, and 5 selected files with only 1 conflict get the singular wording.
- Backend `ConflictResolution` variants unchanged; this is pure label text.
- Reported by a user test on the conflict dialog.1 parent 52f3cd8 commit 4eac76b
2 files changed
Lines changed: 8 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| |||
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
541 | 541 | | |
542 | 542 | | |
543 | 543 | | |
544 | | - | |
| 544 | + | |
545 | 545 | | |
546 | 546 | | |
547 | 547 | | |
548 | | - | |
| 548 | + | |
549 | 549 | | |
550 | 550 | | |
551 | 551 | | |
552 | | - | |
| 552 | + | |
553 | 553 | | |
554 | 554 | | |
555 | 555 | | |
556 | | - | |
| 556 | + | |
557 | 557 | | |
558 | 558 | | |
559 | 559 | | |
560 | | - | |
| 560 | + | |
561 | 561 | | |
562 | 562 | | |
563 | 563 | | |
| |||
0 commit comments