GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

GIT_SILENT

GIT_SILENT

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

When there's only one output device, the user knows which device is
playing audio, so there's no need to show it in the tooltip.

The ability to scroll over the icon to change the icon is really cool,
but it's hidden. We recently adjusted the tooltip to mention that you
can middle-click on the icon to mute and unmute; we can do the same with
this feature to surface it to users.