Merge branch 'release/2.1.0' into develop

diff --cc client/src/assets/player/videojs-components/resolution-menu-button.ts
index af044a9e5aeb78fd8c6656ddf1568b701e1c3f7f,2de3ece19a5caa81dbe086f1e05f4fadf6da267c..0fa6272e7bcf8ac2183efa6e32f252760f8c9bb7
--- 1/client/src/assets/player/videojs-components/resolution-menu-button.ts
--- 2/client/src/assets/player/videojs-components/resolution-menu-button.ts
+++ b/client/src/assets/player/videojs-components/resolution-menu-button.ts
@@@ -72,8 -75,8 +72,8 @@@ class ResolutionMenuButton extends Menu
        // Skip auto resolution, we'll add it ourselves
        if (d.id === -1) continue
  
-       const label = d.id === 0
+       const label = d.label === '0p'
 -        ? this.player.localize('Audio-only')
 +        ? this.player().localize('Audio-only')
          : d.label
  
        this.menu.addChild(new ResolutionMenuItem(