monoid opened the ticket and wrote:

There are a few unused strings remaining. These two patches make use of the strings that are still useful, and removes the unnecessary ones.

The first patch does some of this cleanup in a straightforward way. The otherwise-unused strings STR_STATION_BUILD_AIRPORT_TOOLTIP, STR_CONTENT_MATRIX_TOOLTIP and STR_NEWGRF_SETTINGS_FILE_TOOLTIP (slightly edited) are used in their appropriate locations, while STR_ERROR_BRIBE_FAILED and STR_ERROR_BRIBE_FAILED_2 are merged to just a single string, since ShowErrorMessage can now handle wrapping long strings. The unused strings STR_SORT_BY_POPULATION, STR_PLAYLIST_SAVE, STR_PLAYLIST_TOOLTIP_SAVE_MUSIC_SETTINGS, STR_NEWGRF_SETTINGS_PARAMETER_QUERY, STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP, and STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD are removed.

The second patch makes use of the otherwise-unused STR_NETWORK_ERROR_NOSERVER, which takes a little more effort. The tick-based ratelimit for LAN UDP broadcasts is changed so that it is also used for master server UDP queries. When no games are found in a given search period, the STR_NETWORK_ERROR_NOSERVER error message is shown as a warning. In addition, the find servers button in the network GUI is disabled during the search period.

This should, in theory, leave only one unused string: STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST. I couldn't find a sane place to make use of that, but it seems like it should still be used somewhere.

Attachments

• 01-useandremovestrs.diff (8.48 KiB)
• 02-usenogamesstr.diff (4.47 KiB)

Reported version: trunk
Operating system: All

This issue was imported from FlySpray: https://bugs.openttd.org/task/4789