Upstreaming this from https://phabricator.wikimedia.org/T158177 and https://gitlab.wikimedia.org/repos/phabricator/deployment/-/commit/024c5b0d1d05cbac148128eb0f77df7ac578220b , as we had several folks expressing their confusion about the current message.
In downstream, we changed the following two messages:
"Your browser timezone setting differs from the timezone setting in your profile, click to reconcile." to
"Your browser timezone setting differs from the timezone setting in your profile, click to reconcile or ignore the conflict."
and
"Your browser timezone (%s) differs from your profile timezone (%s). You can ignore this conflict or adjust your profile setting to match your client." to
"Your browser timezone (%s) differs from your profile timezone (%s). You can ignore this conflict or adjust your profile setting to match your client. Ignoring the conflict is the top option in the dropdown menu.",
The corresponding files in Phorge which include these strings are:
* `src/view/page/PhabricatorStandardPageView.php`
* `src/applications/settings/controller/PhabricatorSettingsTimezoneController.php`