Tweak Conflict Resolver to be more clear

[Nerdy314159265]

I don't know how to put this into words exactly or what exactly is wrong with it.

However, every single time, without fail, I use the conflict resolver, I pick the wrong option. I have absolutely no clue why or how I'm picking the wrong file every time but I definitely am.

I recently had to migrate the server that was running my main Syncthing instance and it had gotten rather out of date.

In the process of re-syncing file conflicts occurred (not entirely sure why, I'd expect them to just update based on the other devices).

I go to fix the conflicts decide that it should clearly be the most recent files that are the correct ones, so I select them and select most recent. Broke everything.

I also have tried to gauge which device created the conflicting file, if it's the device that I was actively using then I select it and break everything.

I don't know if it's how the information is listed and I wrongly associate it with the wrong file/option or if there is something unclear about what the conflicts are in reference to (e.g. are the new files the ones getting marked or are the out of date files getting marked) but each time I've had to fix conflicts it feels like I'm being pranked.

[fdutheil]

Hello. Same here, I know the version of the files I wanna keep (local or remote version, related to a firefox profile), but I always end up with the wrong ones (workflow: selected all files then made a choice). I first thought the french translation was misleading or completely wrong, but it seems it's "well" translated after all.

It's a "major" issue still eady to fix :)

[Oktayey]

The same confusion just happened to me. I guess I got tripped up by intuitively assuming the two dates shown were the different modification dates for the two files. Luckily, I noticed that the file I thought the dialog was saying is older was larger in size than the newer one, which wouldn't make sense in my case. After being perplexed for several minutes, I realized that the bottom date didn't indicate the modification date of the bottom file, but rather, the time the program found the conflict between the two files. That function fits the label "Conflict Created" more closely, but I guess I assumed it was just an awkward translation because the layout strongly suggested the two dates were for comparing the two files in question, at least in my eyes.