Replace "Match similar lines" with "Align similar lines"

WinMerge / winmerge

WinMerge is an Open Source differencing and merging tool for Windows. WinMerge can compare both folders and files, presenting differences in a visual text format that is easy to understand and handle.

https://winmerge.org/

GNU General Public License v2.0

6.15k stars 784 forks source link

Replace "Match similar lines" with "Align similar lines" #2230

Closed vlakoff closed 5 months ago

vlakoff commented 5 months ago

This PR is a follow-up to #1200.

One commit is for the documentation, so that it matches the setting name that is displayed in the program.
The other commit is for the program source, better make things consistent.

sdottaka commented 5 months ago

Thank you for the PR! I have merged this PR. However, since the compatibility of the configuration information will be lost, I would like to restore part of Line 212 of OptionsDef.h to the following.

inline const String OPT_CMP_ALIGN_SIMILAR_LINES {_T("Settings/AlignSimilarLines"s)};

↓

inline const String OPT_CMP_ALIGN_SIMILAR_LINES {_T("Settings/MatchSimilarLines"s)};

vlakoff commented 5 months ago

Could you please elaborate on what could have been the issue? From what I understood, it is a constant so the actual value it contains isn't important, what we use is the symbol.

By the way, there is a remaining entry that you may want to replace as well: the <title>類似行をマッチさせる<indexterm>, in Docs/Manual/Japanese/Configuration.xml.

sdottaka commented 5 months ago

The string above is the key name used to save or load the “Align similar lines” checkbox value to the registry or INI file. If this is changed, the "Align similar lines" checkbox will revert to an unchecked state in the new WinMerge version, even if the "Align similar lines" checkbox was checked in an earlier WinMerge version.

vlakoff commented 4 months ago

Understood, thanks for the clarification.

Agree that keeping the current configuration item name is the best to do. It should not be very bad, it seems there are other configuration items in the same case, having functionnality that has slightly diverged over time from the unchanging configuration item name.