Merge branch 'master' into mac-move-window-to-new-monitor-immediately

README.md

@@ -45,7 +45,7 @@ In addition, M³ itself has been translated into several languages by many volun
 
 #### Available
 
-<table><tr><td align="center" valign="top"><img width="30px" height="30px" title="Chinese Simplified" alt="Chinese Simplified" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/zh-CN.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Dutch" alt="Dutch" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/nl.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Portuguese, Brazilian" alt="Portuguese, Brazilian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/pt-BR.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Swedish" alt="Swedish" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/sv-SE.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="French" alt="French" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/fr.png"></div><div align="center" valign="top">99%</td></tr><tr><td align="center" valign="top"><img width="30px" height="30px" title="Portuguese" alt="Portuguese" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/pt-PT.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Russian" alt="Russian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/ru.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Slovenian" alt="Slovenian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/sl.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Swahili" alt="Swahili" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/sw.png"></div><div align="center" valign="top">98%</td><td align="center" valign="top"><img width="30px" height="30px" title="Ukrainian" alt="Ukrainian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/uk.png"></div><div align="center" valign="top">87%</td></tr><tr><td align="center" valign="top"><img width="30px" height="30px" title="Hungarian" alt="Hungarian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/hu.png"></div><div align="center" valign="top">66%</td><td align="center" valign="top"><img width="30px" height="30px" title="Spanish" alt="Spanish" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/es-ES.png"></div><div align="center" valign="top">63%</td><td align="center" valign="top"><img width="30px" height="30px" title="Estonian" alt="Estonian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/et.png"></div><div align="center" valign="top">60%</td></table>
+<table><tr><td align="center" valign="top"><img width="30px" height="30px" title="Chinese Simplified" alt="Chinese Simplified" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/zh-CN.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Dutch" alt="Dutch" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/nl.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Portuguese, Brazilian" alt="Portuguese, Brazilian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/pt-BR.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Swahili" alt="Swahili" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/sw.png"></div><div align="center" valign="top">100%</td><td align="center" valign="top"><img width="30px" height="30px" title="Swedish" alt="Swedish" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/sv-SE.png"></div><div align="center" valign="top">100%</td></tr><tr><td align="center" valign="top"><img width="30px" height="30px" title="French" alt="French" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/fr.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Portuguese" alt="Portuguese" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/pt-PT.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Russian" alt="Russian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/ru.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Slovenian" alt="Slovenian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/sl.png"></div><div align="center" valign="top">99%</td><td align="center" valign="top"><img width="30px" height="30px" title="Ukrainian" alt="Ukrainian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/uk.png"></div><div align="center" valign="top">87%</td></tr><tr><td align="center" valign="top"><img width="30px" height="30px" title="Hungarian" alt="Hungarian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/hu.png"></div><div align="center" valign="top">66%</td><td align="center" valign="top"><img width="30px" height="30px" title="Spanish" alt="Spanish" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/es-ES.png"></div><div align="center" valign="top">63%</td><td align="center" valign="top"><img width="30px" height="30px" title="Estonian" alt="Estonian" src="https://raw.githubusercontent.com/benjaminjonard/crowdin-translations-progress-action/1.0/flags/et.png"></div><div align="center" valign="top">60%</td></table>
 
 #### In progress
 

docs/src/sw/using-at-a-kingdom-hall.md

@@ -76,15 +76,15 @@ Ikiwa kidirisha cha midia ni nyeusi unapowasilisha tovuti baada ya kusasisha M³
 1. Kufungua mipangilio ya **Privacy & Security** kwenye mfumo wako wa macOS.
 2. Nenda kwenye **Screen Recording**.
 3. Chagua M³ kwenye orodha.
-4. Click the `-` (minus) button to remove it.
-5. Click the `+` (plus) button and select M³ from the Applications folder.
-6. You may be prompted to relaunch M³ to apply the change.
+4. Bonyeza kitufe cha `-` (minus) ili kuiondoa.
+5. Bonyeza kitufe cha `+` (plus) na uchague M³ kutoka kwa folder ya Programu.
+6. Unaweza ombwa kufungua M³ kwa upya ili mabadiliko yafanye kazi.
 
-After these steps, screen sharing should function as expected once again.
+Baada ya hatua hizi, screen sharing inafaa kufanya kazi kama inavyotakikana.
 
 :::tip Kidokezo
 
-These steps are optional and can be skipped if you do not plan to use the website presentation feature. On the other hand, if you do plan to use the website presentation feature, it is recommended to follow these steps after every update to ensure the feature works as expected.
+Unaweza kupuuza hatua hizi ikiwa haupangi kutumia kipengele cha kuwasilisha tovuti. Kwa upande mwingine, ikiwa unapanga kutumia kipengele cha uwasilishaji wa tovuti, inashauriwa kufuata hatua hizi baada ya kila sasisho ili kuhakikisha kuwa kipengele kinafanya kazi inavyotarajiwa.
 
 :::
 

src-electron/electron-main.ts

@@ -13,10 +13,16 @@ import {
 } from 'electron';
 
 import { PLATFORM } from './constants';
+import { cancelAllDownloads } from './main/downloads';
 import { initScreenListeners } from './main/screen';
 import { initSessionListeners } from './main/session';
 import { initUpdater } from './main/updater';
-import { createMainWindow } from './main/window/window-main';
+import { closeOtherWindows, sendToWindow } from './main/window/window-base';
+import {
+  authorizedClose,
+  createMainWindow,
+  mainWindow,
+} from './main/window/window-main';
 import { errorCatcher } from './utils';
 
 initSentry({
@@ -37,6 +43,19 @@ app.on('window-all-closed', () => {
   if (PLATFORM !== 'darwin') app.quit();
 });
 
+app.on('before-quit', (e) => {
+  if (PLATFORM === 'darwin' && mainWindow) {
+    if (authorizedClose) {
+      cancelAllDownloads();
+      closeOtherWindows(mainWindow);
+      mainWindow?.close();
+    } else {
+      e.preventDefault();
+      sendToWindow(mainWindow, 'attemptedClose');
+    }
+  }
+});
+
 app.on('activate', () => {
   app
     .whenReady()

src/components/media/SongPicker.vue

@@ -8,6 +8,7 @@
       <div class="row q-px-md">
         <q-input
           v-model="filter"
+          :disable="loading"
           :label="$t('search-by-title-or-number')"
           class="col"
           clearable
@@ -21,7 +22,11 @@
           </template>
         </q-input>
       </div>
-
+      <q-slide-transition>
+        <div v-if="loading" class="row items-center justify-center">
+          <q-spinner color="primary" size="lg" />
+        </div>
+      </q-slide-transition>
       <q-scroll-area
         :bar-style="barStyle"
         :thumb-style="thumbStyle"