From 7e75f6c8de4a00602164d80c4ddc1cab6de4c4c7 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:24:46 -0400
Subject: [PATCH 01/11] feat: add button to go from co date notification to
 setting directly

---
 src/helpers/notifications.ts           |  3 ++-
 src/i18n/en.json                       |  2 ++
 src/pages/CongregationSelectorPage.vue | 15 ++++++++++++-
 src/pages/SettingsPage.vue             | 29 ++++++++++++++++++++++++++
 src/router/routes.ts                   |  2 +-
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/helpers/notifications.ts b/src/helpers/notifications.ts
index 1465eeaa..7921b1d3 100644
--- a/src/helpers/notifications.ts
+++ b/src/helpers/notifications.ts
@@ -3,6 +3,7 @@ import { Notify, type QNotifyCreateOptions } from 'quasar';
 import { errorCatcher } from './error-catcher';
 
 const createTemporaryNotification = ({
+  actions,
   badgeStyle,
   caption,
   color,
@@ -35,7 +36,7 @@ const createTemporaryNotification = ({
       ...(group && { group }),
       ...(badgeStyle && { badgeStyle }),
       ...(!noClose && {
-        actions: [
+        actions: actions || [
           {
             color: 'white',
             icon: 'close',
diff --git a/src/i18n/en.json b/src/i18n/en.json
index e090aadd..c21ea2ac 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -125,6 +125,7 @@
   "full-screen": "Full screen",
   "github-repo": "GitHub repo",
   "go-home": "Go Home",
+  "go-to-settings": "Go to Settings",
   "got-it": "Got it",
   "hide-image-for-zoom-participants": "Hide image for Zoom participants",
   "hide-media-display": "Hide media display",
@@ -261,6 +262,7 @@
   "question-mark": "?",
   "refresh": "Refresh",
   "regular": "Regular",
+  "remind-me-later": "Remind me later",
   "remove-all-cache": "Remove all files from cache",
   "remove-unused-cache": "Remove unused items from cache",
   "replace": "Replace",
diff --git a/src/pages/CongregationSelectorPage.vue b/src/pages/CongregationSelectorPage.vue
index bee43992..7b354d71 100644
--- a/src/pages/CongregationSelectorPage.vue
+++ b/src/pages/CongregationSelectorPage.vue
@@ -183,6 +183,19 @@ const checkCoDate = () => {
     date.getDateDiff(new Date(), currentSettings.value?.coWeek, 'months') > 2
   ) {
     createTemporaryNotification({
+      actions: [
+        {
+          color: 'white',
+          label: t('remind-me-later'),
+        },
+        {
+          color: 'white',
+          handler: () => {
+            router.push('/settings/coWeek');
+          },
+          label: t('go-to-settings'),
+        },
+      ],
       caption: t('dont-forget-to-add-circuit-overseer-date', {
         congregationMeetings: t('congregationMeetings'),
         settings: t('titles.settings'),
@@ -191,7 +204,7 @@ const checkCoDate = () => {
       icon: 'mmm-error',
       message: t('no-circuit-overseer-date-set'),
       textColor: 'white',
-      timeout: 10000,
+      timeout: 30000,
     });
   }
 };
diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue
index 60e84d21..50c7f4fc 100644
--- a/src/pages/SettingsPage.vue
+++ b/src/pages/SettingsPage.vue
@@ -66,10 +66,12 @@
                   !invalidSettingsLength ||
                   invalidSettings.includes(settingId as keyof SettingsItems))
               "
+              :id="settingId"
               :class="{
                 'bg-error': invalidSettings.includes(
                   settingId as keyof SettingsItems,
                 ),
+                'bg-accent-300': route.params.setting === settingId,
                 'q-mt-sm': index === 0,
                 'rounded-borders': true,
               }"
@@ -166,6 +168,9 @@ import { errorCatcher } from 'src/helpers/error-catcher';
 import { useCurrentStateStore } from 'src/stores/current-state';
 import { useJwStore } from 'src/stores/jw';
 import { computed, onMounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
 
 // Store initializations
 const currentState = useCurrentStateStore();
@@ -207,6 +212,30 @@ const validateSettingsLocal = () => {
 // Lifecycle hooks
 onMounted(() => {
   validateSettingsLocal();
+  watch(
+    () => route.params.setting,
+    (newWatchedSettings) => {
+      if (!newWatchedSettings) return;
+      if (!Array.isArray(newWatchedSettings))
+        newWatchedSettings = [newWatchedSettings];
+      newWatchedSettings.forEach((setting) => {
+        if (setting)
+          expansionState.value[
+            settingsDefinitions[setting as keyof SettingsItems]
+              .group as keyof SettingsItems
+          ] = true;
+      });
+      setTimeout(() => {
+        if (!newWatchedSettings[0]) return;
+        document.getElementById(newWatchedSettings[0])?.scrollIntoView({
+          behavior: 'smooth',
+          block: 'start',
+          inline: 'nearest',
+        });
+      }, 500);
+    },
+    { immediate: true },
+  );
 });
 
 watch(
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 394de648..c7680195 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -51,7 +51,7 @@ const routes: RouteRecordRaw[] = [
     children: [{ component: () => import('pages/SettingsPage.vue'), path: '' }],
     component: () => import('layouts/MainLayout.vue'),
     meta: { icon: 'mmm-settings', title: 'titles.settings' },
-    path: '/settings',
+    path: '/settings/:setting?',
   },
 
   // Always leave this as last one,

From f445e6b55e3fb41370574dfafee615c16e07db2d Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:32:15 -0400
Subject: [PATCH 02/11] fix: make media tags a bit wider to accommodate the
 improved paragraph display

---
 src/css/app.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 9fe8a280..89cdb623 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -485,7 +485,7 @@ a {
 }
 
 .media-tag {
-  min-width: 70px;
+  min-width: 80px;
   border-radius: 6px;
 }
 

From bd36af4d46b883b8aa59475f06147d25c118505d Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:06:00 -0400
Subject: [PATCH 03/11] fix: auto start background music only if meeting is in
 less than two hours

---
 src/components/media/MusicButton.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/media/MusicButton.vue b/src/components/media/MusicButton.vue
index bdfcbff1..1667939f 100644
--- a/src/components/media/MusicButton.vue
+++ b/src/components/media/MusicButton.vue
@@ -464,10 +464,11 @@ onMounted(() => {
       try {
         meetingDay.value = !!newToday && !!newMeeting;
         if (
-          currentSettings.value?.enableMusicButton &&
-          currentSettings.value?.autoStartMusic &&
-          meetingDay.value &&
-          remainingTimeBeforeMeetingStart() > 90
+          currentSettings.value?.enableMusicButton && // background music feature is enabled
+          currentSettings.value?.autoStartMusic && // auto-start music is enabled
+          meetingDay.value && // today is a meeting day
+          remainingTimeBeforeMeetingStart() > 90 && // meeting is starting in at least 90 seconds
+          remainingTimeBeforeMeetingStart() < 60 * 60 * 2 // meeting is starting in less than 2 hours
         ) {
           playMusic();
         }

From 2c9cd83e043fda1832dccd43976c13a9d656e6b4 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:19:05 -0400
Subject: [PATCH 04/11] fix: clean up error code checks; prevent OBS error
 unless there's an actual error code

---
 src/boot/axios.ts                  |  2 +-
 src/components/media/ObsStatus.vue | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/boot/axios.ts b/src/boot/axios.ts
index c1c1a5ab..30f8b279 100644
--- a/src/boot/axios.ts
+++ b/src/boot/axios.ts
@@ -9,7 +9,7 @@ const get = async (url: string, params?: AxiosRequestConfig) => {
   returnVal = await axios.get(url, { params }).catch((error) => {
     if (
       !(error instanceof AxiosError) ||
-      (error.status !== 400 && error.status !== 404)
+      ![400, 404].includes(error.status ?? 0)
     )
       errorCatcher(error);
     return { data: undefined };
diff --git a/src/components/media/ObsStatus.vue b/src/components/media/ObsStatus.vue
index e2551402..0bf1a088 100644
--- a/src/components/media/ObsStatus.vue
+++ b/src/components/media/ObsStatus.vue
@@ -158,16 +158,8 @@ const obsCloseHandler = () => {
 
 const obsErrorHandler = (err: OBSWebSocketError) => {
   obsMessage.value = 'obs.error';
-  if (
-    !(
-      err?.code === -1 ||
-      err?.code === 1001 ||
-      err?.code === 1006 ||
-      err?.code === 4009
-    )
-  ) {
+  if (err?.code && ![-1, 1001, 1006, 4009].includes(err.code))
     errorCatcher(err);
-  }
 };
 
 const obsConnect = async (setup?: boolean) => {

From 0bc941f26a91ed69015437988801d5e8b4ad24c9 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:24:42 -0400
Subject: [PATCH 05/11] fix: better catch OBS connection errors

---
 src/components/media/ObsStatus.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/media/ObsStatus.vue b/src/components/media/ObsStatus.vue
index 0bf1a088..e568f319 100644
--- a/src/components/media/ObsStatus.vue
+++ b/src/components/media/ObsStatus.vue
@@ -194,7 +194,7 @@ const obsConnect = async (setup?: boolean) => {
           break;
         }
       } catch (err) {
-        errorCatcher(err);
+        obsErrorHandler(err);
       } finally {
         attempt++;
         if (attempt < maxAttempts) {

From 8d498fbfa9001d7ba239fbc01f7c69b57f9705e6 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:10:25 -0400
Subject: [PATCH 06/11] chore: add more debug info to error catcher

---
 src/helpers/error-catcher.ts    | 25 ++++++++++++++++++++++---
 src/pages/MediaCalendarPage.vue |  4 ++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/helpers/error-catcher.ts b/src/helpers/error-catcher.ts
index ccc9e0fe..a7d0a828 100644
--- a/src/helpers/error-catcher.ts
+++ b/src/helpers/error-catcher.ts
@@ -1,10 +1,29 @@
+import type { SettingsValues } from 'src/types';
+
 import * as Sentry from '@sentry/vue';
+import { extend } from 'quasar';
 
-const errorCatcher = (error: Error | string | unknown) => {
+const errorCatcher = async (originalError: Error | string | unknown) => {
+  if (!originalError) return;
+  const currentSettingsSnapshot = {} as SettingsValues;
+  try {
+    const { useCurrentStateStore } = await import('src/stores/current-state');
+    const currentState = useCurrentStateStore();
+    const { currentSettings } = currentState;
+    extend(true, currentSettingsSnapshot, currentSettings) as SettingsValues;
+    if (currentSettingsSnapshot.obsPassword?.length)
+      currentSettingsSnapshot.obsPassword = '*'.repeat(
+        currentSettingsSnapshot.obsPassword.length,
+      );
+  } catch (error) {
+    console.error(error);
+  }
   if (process.env.NODE_ENV === 'production') {
-    Sentry.captureException(error);
+    if (Object.keys(currentSettingsSnapshot).length)
+      Sentry.setContext('currentSettings', currentSettingsSnapshot);
+    Sentry.captureException(originalError);
   } else {
-    console.error(error);
+    console.error(originalError);
   }
 };
 
diff --git a/src/pages/MediaCalendarPage.vue b/src/pages/MediaCalendarPage.vue
index b19cb65a..cfc0698e 100644
--- a/src/pages/MediaCalendarPage.vue
+++ b/src/pages/MediaCalendarPage.vue
@@ -156,13 +156,13 @@
       class="media-section additional"
     >
       <q-item class="text-additional items-center">
-            <!-- :class="
+        <!-- :class="
               isWeMeetingDay(selectedDateObject?.date)
                 ? 'bg-white text-additional jw-icon'
                 : 'text-white bg-additional rounded-borders-sm'
             " -->
         <q-avatar
-        :size="isWeMeetingDay(selectedDateObject?.date) ? 'lg' : 'md'"
+          :size="isWeMeetingDay(selectedDateObject?.date) ? 'lg' : 'md'"
           class="text-white bg-additional jw-icon"
         >
           <template v-if="isWeMeetingDay(selectedDateObject?.date)">

From 6daf690a5377d6da10a14a69de5c6792558dca5b Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:54:22 -0400
Subject: [PATCH 07/11] fix: don't show resize notification on initial resize
 of media window

---
 src/pages/MediaPlayerPage.vue | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/MediaPlayerPage.vue b/src/pages/MediaPlayerPage.vue
index dc8d2837..b4a90979 100644
--- a/src/pages/MediaPlayerPage.vue
+++ b/src/pages/MediaPlayerPage.vue
@@ -281,16 +281,19 @@ const playMedia = () => {
   }
 };
 
+let initialResize = true;
 function onResize(size: { height: number; width: number }) {
-  createTemporaryNotification({
-    badgeStyle: 'display: none',
-    color: 'accent-400',
-    group: 'resize',
-    icon: 'mmm-info',
-    message: size.width + 'x' + size.height,
-    noClose: true,
-    position: 'bottom'
-  });
+  if (!initialResize)
+    createTemporaryNotification({
+      badgeStyle: 'display: none',
+      color: 'accent-400',
+      group: 'resize',
+      icon: 'mmm-info',
+      message: size.width + 'x' + size.height,
+      noClose: true,
+      position: 'bottom',
+    });
+  initialResize = false;
 }
 
 const $q = useQuasar();

From f8f2e11ebf53368625270489f3528d786c2b3ce8 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:24:48 -0400
Subject: [PATCH 08/11] fix: close warning was triggering on non-meeting days
 when no media playing

---
 src/layouts/MainLayout.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index c6822011..553e4aab 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -155,6 +155,7 @@ const {
   mediaPlaying,
   online,
   selectedDate,
+  selectedDateObject,
 } = storeToRefs(currentState);
 
 watch(currentCongregation, (newCongregation, oldCongregation) => {
@@ -201,7 +202,7 @@ watch(online, (isNowOnline) => {
 
 const navigateToCongregationSelector = () => {
   try {
-    if (route.fullPath !== '/congregation-selector') {
+    if (!route.fullPath.includes('/congregation-selector')) {
       router.push({ path: '/congregation-selector' });
       selectedDate.value = '';
     }
@@ -357,11 +358,14 @@ const closeAttempts = ref(0);
 const bcClose = new BroadcastChannel('closeAttempts');
 bcClose.onmessage = (event) => {
   if (event?.data?.attemptedClose) {
+    const meetingDay =
+      !!selectedDateObject.value?.today && !!selectedDateObject.value?.meeting;
     if (
       (mediaPlaying.value ||
-        (currentCongregation.value &&
-          !currentSettings.value?.disableMediaFetching &&
-          remainingTimeBeforeMeetingStart() < 90)) &&
+        (currentCongregation.value && // a congregation is selected
+          !currentSettings.value?.disableMediaFetching && // media fetching is enabled
+          meetingDay && // today is a meeting day
+          remainingTimeBeforeMeetingStart() < 90)) && // meeting is starting in less than 90 seconds
       closeAttempts.value === 0
     ) {
       createTemporaryNotification({

From 1dd2f61b1ff48b5bc72d4bd578ecff7e3e0b0453 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:25:56 -0400
Subject: [PATCH 09/11] fix: i18n for CO date notification wasn't working

---
 src/components/header/HeaderBase.vue   |  6 ++--
 src/pages/CongregationSelectorPage.vue | 43 ++------------------------
 src/pages/MediaCalendarPage.vue        | 42 +++++++++++++++++++++++++
 src/pages/SettingsPage.vue             |  2 --
 src/router/routes.ts                   |  2 +-
 5 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/src/components/header/HeaderBase.vue b/src/components/header/HeaderBase.vue
index 478a6ea5..4135fcf7 100644
--- a/src/components/header/HeaderBase.vue
+++ b/src/components/header/HeaderBase.vue
@@ -36,9 +36,9 @@
         <HeaderCongregation
           v-if="route.fullPath.includes('congregation-selector')"
         />
-        <HeaderCalendar v-else-if="route.fullPath === '/media-calendar'" />
-        <HeaderSettings v-else-if="route.fullPath === '/settings'" />
-        <HeaderWebsite v-else-if="route.fullPath === '/present-website'" />
+        <HeaderCalendar v-else-if="route.fullPath.includes('/media-calendar')" />
+        <HeaderSettings v-else-if="route.fullPath.includes('/settings')" />
+        <HeaderWebsite v-else-if="route.fullPath.includes('/present-website')" />
       </div>
     </div>
   </q-header>
diff --git a/src/pages/CongregationSelectorPage.vue b/src/pages/CongregationSelectorPage.vue
index 7b354d71..6bd6dc23 100644
--- a/src/pages/CongregationSelectorPage.vue
+++ b/src/pages/CongregationSelectorPage.vue
@@ -117,20 +117,16 @@
 
 <script setup lang="ts">
 import { storeToRefs } from 'pinia';
-import { date } from 'quasar';
 import { useLocale } from 'src/composables/useLocale';
 import { errorCatcher } from 'src/helpers/error-catcher';
 import { downloadSongbookVideos } from 'src/helpers/jw-media';
-import { createTemporaryNotification } from 'src/helpers/notifications';
 import { useCongregationSettingsStore } from 'src/stores/congregation-settings';
 import { useCurrentStateStore } from 'src/stores/current-state';
 import { useJwStore } from 'src/stores/jw';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 const { getDateLocale } = useLocale();
-const { t } = useI18n();
 
 const congregationSettings = useCongregationSettingsStore();
 const currentState = useCurrentStateStore();
@@ -139,7 +135,7 @@ const { updateYeartext } = jwStore;
 const { congregationCount, congregations } = storeToRefs(congregationSettings);
 const { createCongregation, deleteCongregation } = congregationSettings;
 const { invalidSettings, setCongregation } = currentState;
-const { currentCongregation, currentSettings } = storeToRefs(currentState);
+const { currentCongregation } = storeToRefs(currentState);
 const route = useRoute();
 const router = useRouter();
 const congToDelete = ref<number | string>('');
@@ -161,11 +157,10 @@ function chooseCongregation(
         // if (initialLoad || invalidSettings)
         router.push('/setup-wizard');
       } else {
-        checkCoDate();
         if (invalidSettings) {
           router.push('/settings');
         } else {
-          router.push('/media-calendar');
+          router.push('/media-calendar/initial');
         }
       }
     }
@@ -175,40 +170,6 @@ function chooseCongregation(
   }
 }
 
-const checkCoDate = () => {
-  if (!currentSettings.value || currentSettings.value?.disableMediaFetching)
-    return;
-  if (
-    !currentSettings.value?.coWeek ||
-    date.getDateDiff(new Date(), currentSettings.value?.coWeek, 'months') > 2
-  ) {
-    createTemporaryNotification({
-      actions: [
-        {
-          color: 'white',
-          label: t('remind-me-later'),
-        },
-        {
-          color: 'white',
-          handler: () => {
-            router.push('/settings/coWeek');
-          },
-          label: t('go-to-settings'),
-        },
-      ],
-      caption: t('dont-forget-to-add-circuit-overseer-date', {
-        congregationMeetings: t('congregationMeetings'),
-        settings: t('titles.settings'),
-      }),
-      color: 'primary',
-      icon: 'mmm-error',
-      message: t('no-circuit-overseer-date-set'),
-      textColor: 'white',
-      timeout: 30000,
-    });
-  }
-};
-
 const isHomePage = computed(() => {
   return route?.path === '/initial-congregation-selector';
 });
diff --git a/src/pages/MediaCalendarPage.vue b/src/pages/MediaCalendarPage.vue
index cfc0698e..d5c2962a 100644
--- a/src/pages/MediaCalendarPage.vue
+++ b/src/pages/MediaCalendarPage.vue
@@ -432,6 +432,7 @@ import { useCurrentStateStore } from 'src/stores/current-state';
 import { useJwStore } from 'src/stores/jw';
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
 
 const dragging = ref(false);
 const jwpubImportDb = ref('');
@@ -449,6 +450,8 @@ watch(
 );
 
 const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
 
 const jwStore = useJwStore();
 const { addToAdditionMediaMap, removeFromAdditionMediaMap } = jwStore;
@@ -769,6 +772,44 @@ const goToNextDayWithMedia = () => {
 
 const coWeek = ref(false);
 
+const checkCoDate = () => {
+  if (
+    !currentSettings.value ||
+    currentSettings.value?.disableMediaFetching ||
+    route.params?.typeOfLoad !== 'initial'
+  )
+    return;
+  if (
+    !currentSettings.value?.coWeek ||
+    date.getDateDiff(new Date(), currentSettings.value?.coWeek, 'months') > 2
+  ) {
+    createTemporaryNotification({
+      actions: [
+        {
+          color: 'white',
+          label: t('remind-me-later'),
+        },
+        {
+          color: 'white',
+          handler: () => {
+            router.push('/settings/coWeek');
+          },
+          label: t('go-to-settings'),
+        },
+      ],
+      caption: t('dont-forget-to-add-circuit-overseer-date', {
+        congregationMeetings: t('congregationMeetings'),
+        settings: t('titles.settings'),
+      }),
+      color: 'primary',
+      icon: 'mmm-error',
+      message: t('no-circuit-overseer-date-set'),
+      textColor: 'white',
+      timeout: 30000,
+    });
+  }
+};
+
 onMounted(async () => {
   window.addEventListener('draggingSomething', startDragging);
   window.addEventListener('localFiles-browsed', localFilesBrowsedListener);
@@ -791,6 +832,7 @@ onMounted(async () => {
   goToNextDayWithMedia();
   sendObsSceneEvent('camera');
   fetchMedia();
+  checkCoDate();
 });
 
 const [tgwList, sortableTgwMediaItems] = useDragAndDrop(
diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue
index 50c7f4fc..4a4cb980 100644
--- a/src/pages/SettingsPage.vue
+++ b/src/pages/SettingsPage.vue
@@ -229,8 +229,6 @@ onMounted(() => {
         if (!newWatchedSettings[0]) return;
         document.getElementById(newWatchedSettings[0])?.scrollIntoView({
           behavior: 'smooth',
-          block: 'start',
-          inline: 'nearest',
         });
       }, 500);
     },
diff --git a/src/router/routes.ts b/src/router/routes.ts
index c7680195..5a056f16 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -23,7 +23,7 @@ const routes: RouteRecordRaw[] = [
     ],
     component: () => import('layouts/MainLayout.vue'),
     meta: { icon: 'mmm-media', title: 'titles.meetingMedia' },
-    path: '/media-calendar',
+    path: '/media-calendar/:typeOfLoad?',
   },
   {
     children: [

From 2f896448f7b9c5a133d37fb79475b81924cb0c37 Mon Sep 17 00:00:00 2001
From: Olivier Savignac <1275666+sircharlo@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:26:11 -0400
Subject: [PATCH 10/11] fix: show vernacular language name in congregation
 lookup

---
 src/components/dialog/DialogCongregationLookup.vue |  2 +-
 src/i18n/af.json                                   | 11 ++++++-----
 src/i18n/am.json                                   | 11 ++++++-----
 src/i18n/cmn-hans.json                             | 11 ++++++-----
 src/i18n/de.json                                   | 11 ++++++-----
 src/i18n/el.json                                   | 11 ++++++-----
 src/i18n/es.json                                   | 11 ++++++-----
 src/i18n/et.json                                   | 11 ++++++-----
 src/i18n/fi.json                                   | 11 ++++++-----
 src/i18n/fr.json                                   | 11 ++++++-----
 src/i18n/hu.json                                   | 11 ++++++-----
 src/i18n/ilo.json                                  | 11 ++++++-----
 src/i18n/it.json                                   | 11 ++++++-----
 src/i18n/mg.json                                   | 11 ++++++-----
 src/i18n/nl.json                                   | 13 +++++++------
 src/i18n/pag.json                                  | 11 ++++++-----
 src/i18n/pt-pt.json                                | 11 ++++++-----
 src/i18n/pt.json                                   | 11 ++++++-----
 src/i18n/rmn-x-rmg.json                            | 11 ++++++-----
 src/i18n/ro.json                                   | 11 ++++++-----
 src/i18n/ru.json                                   | 11 ++++++-----
 src/i18n/sk.json                                   | 11 ++++++-----
 src/i18n/sl.json                                   | 11 ++++++-----
 src/i18n/sv.json                                   | 11 ++++++-----
 src/i18n/sw.json                                   | 11 ++++++-----
 src/i18n/ta.json                                   | 11 ++++++-----
 src/i18n/tl.json                                   | 11 ++++++-----
 src/i18n/uk.json                                   | 11 ++++++-----
 src/i18n/wes-x-pgw.json                            | 11 ++++++-----
 29 files changed, 170 insertions(+), 142 deletions(-)

diff --git a/src/components/dialog/DialogCongregationLookup.vue b/src/components/dialog/DialogCongregationLookup.vue
index 74bd4ff9..a53ef5fb 100644
--- a/src/components/dialog/DialogCongregationLookup.vue
+++ b/src/components/dialog/DialogCongregationLookup.vue
@@ -81,7 +81,7 @@
                     jwLanguages.list?.find(
                       (l) =>
                         l.langcode === congregation?.properties?.languageCode,
-                    )?.name
+                    )?.vernacularName
                   }}</q-item-label>
                 </q-item-section>
               </q-item>
diff --git a/src/i18n/af.json b/src/i18n/af.json
index 70e9f3a0..714a08d1 100644
--- a/src/i18n/af.json
+++ b/src/i18n/af.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Donker",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/am.json b/src/i18n/am.json
index 2000fe97..e090aadd 100644
--- a/src/i18n/am.json
+++ b/src/i18n/am.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/cmn-hans.json b/src/i18n/cmn-hans.json
index 3212e1d0..14e97dc3 100644
--- a/src/i18n/cmn-hans.json
+++ b/src/i18n/cmn-hans.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "从我们的歌曲添加一首歌曲到会议媒体列表。",
   "add-a-video-explain": "从 JW.org 添加一个视频到媒体列表。 最新视频显示在这里，但您也可以在需要时通过所有视频进行搜索。",
   "add-an-opening-song": "添加开始歌曲",
@@ -75,6 +70,9 @@
   "dark": "暗",
   "darkMode": "主题设置",
   "darkMode-explain": "强制应用程序使用亮色或暗色模式，或使用系统默认",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "删除",
   "delete-media": "删除媒体",
   "depends-on": "链接到",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "配置聚会媒体下载和播放设置。",
   "meeting-media-manager": "聚会媒体管理器",
   "midweek-meeting": "中周聚会",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "停止中...",
   "musicVolume": "背景音乐播放音量",
   "musicVolume-explain": "选择背景音乐播放的音量。 这样可以设置背景音乐的较低音量，同时保持其他媒体的高音量。",
diff --git a/src/i18n/de.json b/src/i18n/de.json
index fc717b81..dcd1312d 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag",
-  "days-short": "So_Mo_Di_Mi_Do_Fr_Sa",
-  "months-long": "Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember",
-  "months-short": "Jan_Feb_Mar_Apr_Mai_Jun_Jul_Aug_Sep_Okt_Nov_Dec",
-  "days-plural": "tage",
   "add-a-song": "Ein Lied aus unserem Liederbuch zur Medienliste hinzufügen.",
   "add-a-video-explain": "Fügen ein JW.org Video zur Medienliste hinzu. Hier werden die neuesten Videos angezeigt, eine Suche aller Videos ist ebenfalls möglich.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dunkel",
   "darkMode": "Design",
   "darkMode-explain": "Erzwinge die App den hellen oder dunklen Modus zu verwenden oder verwende den Systemstandard",
+  "days-long": "Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag",
+  "days-plural": "tage",
+  "days-short": "So_Mo_Di_Mi_Do_Fr_Sa",
   "delete": "Löschen",
   "delete-media": "Medien löschen",
   "depends-on": "Verknüpft mit:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Einstellungen für Download und Wiedergabe von Zusammenkünften konfigurieren.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Zusammenkunft unter der Woche",
+  "months-long": "Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember",
+  "months-short": "Jan_Feb_Mar_Apr_Mai_Jun_Jul_Aug_Sep_Okt_Nov_Dec",
+  "music.starting": "Startet...",
   "music.stopping": "Stoppen...",
   "musicVolume": "Lautstärke der Hintergrundmusik",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/el.json b/src/i18n/el.json
index 2377fcce..8f9a67d4 100644
--- a/src/i18n/el.json
+++ b/src/i18n/el.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Σκοτεινό",
   "darkMode": "Προτίμηση θέματος",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Διαγραφή",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Μεσοβδόμαδη συνάθροιση",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Ένταση ήχου αναπαραγωγής μουσικής παρασκηνίου",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 23239814..bbaade61 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado",
-  "days-short": "Dom_Lun_Mar_Mié_Jue_Vie_Sáb_Dom",
-  "months-long": "Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre",
-  "months-short": "Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic",
-  "days-plural": "días",
   "add-a-song": "Añada una canción de nuestro cancionero a la lista de multimedia de la reunión.",
   "add-a-video-explain": "Añada uno de los vídeos de JW.org a la lista de multimedia. Aquí se muestran los vídeos más recientes, pero también puede buscar entre todos los vídeos si lo necesita.",
   "add-an-opening-song": "Añadir canción inicial",
@@ -75,6 +70,9 @@
   "dark": "Oscuro",
   "darkMode": "Seleccionar tema",
   "darkMode-explain": "Forzar a la aplicación a utilizar el modo claro u oscuro, o usar el modo predeterminado del sistema",
+  "days-long": "Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado",
+  "days-plural": "días",
+  "days-short": "Dom_Lun_Mar_Mié_Jue_Vie_Sáb_Dom",
   "delete": "Borrar",
   "delete-media": "Borrar multimedia",
   "depends-on": "Vinculado a:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configurar las opciones de descarga y reproducción de medios para las reuniones.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Reunión entre semana",
+  "months-long": "Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre",
+  "months-short": "Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic",
+  "music.starting": "Iniciando...",
   "music.stopping": "Deteniendo...",
   "musicVolume": "Volumen de reproducción de música de fondo",
   "musicVolume-explain": "Elija el volumen de la reproducción de música de fondo. Esto le permite establecer un volumen más bajo para la música de fondo, mientras mantiene el volumen de otros medios alto.",
diff --git a/src/i18n/et.json b/src/i18n/et.json
index 02e8ba7f..22da1593 100644
--- a/src/i18n/et.json
+++ b/src/i18n/et.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Pühapäev_Esmaspäev_Teisipäev_Kolmapäev_Neljapäev_Reede_Laupäev",
-  "days-short": "Pü_Es_Te_Ko_Ne_Re_La",
-  "months-long": "Jaanuar_Veebruar_Märts_Aprill_Mai_Juuni_Juuli_August_September_Oktoober_November_Detsember",
-  "months-short": "Jaa_Vee_Mär_Apr_Mai_Juun_Juul_Aug_Sept_Okt_Nov_Dets",
-  "days-plural": "päeva",
   "add-a-song": "Lisa lauliku laul koosoleku meedialisti.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Lisa avalaul",
@@ -75,6 +70,9 @@
   "dark": "Tume",
   "darkMode": "Teema eelistus",
   "darkMode-explain": "Sunni rakendust kasutama kas tumedat või heledat teemat, või kasuta arvuti süsteemiseadeid",
+  "days-long": "Pühapäev_Esmaspäev_Teisipäev_Kolmapäev_Neljapäev_Reede_Laupäev",
+  "days-plural": "päeva",
+  "days-short": "Pü_Es_Te_Ko_Ne_Re_La",
   "delete": "Kustuta",
   "delete-media": "Kustuta meedia",
   "depends-on": "Seotud:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Konfigureeri koosoleku meedia allalaadimise ja taasesituse seaded.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Nädalasisene koosolek",
+  "months-long": "Jaanuar_Veebruar_Märts_Aprill_Mai_Juuni_Juuli_August_September_Oktoober_November_Detsember",
+  "months-short": "Jaa_Vee_Mär_Apr_Mai_Juun_Juul_Aug_Sept_Okt_Nov_Dets",
+  "music.starting": "Käivitamine...",
   "music.stopping": "Peatamine...",
   "musicVolume": "Taustamuusika helivaljusus",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index fe075980..5e124a9a 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Tumma",
   "darkMode": "Teeman asetukset",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Poista",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Viikkokokous",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Taustamusiikin voimakkuus",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index f013ff47..cc1f6a6c 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi",
-  "days-short": "Dim_Lun_Mar_Mer_Jeu_Ven_Sam",
-  "months-long": "Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Août_Septembre_Octobre_Novembre_Décembre",
-  "months-short": "Jan_Fév_Mar_Avr_Mai_Juin_Juil_Août_Sep_Oct_Nov_Déc",
-  "days-plural": "jours",
   "add-a-song": "Ajoutez un cantique à la liste des médias pour cette réunion.",
   "add-a-video-explain": "Ajoutez l'une des vidéos de JW.org à la liste des médias. Les dernières vidéos sont affichées ici, mais vous pouvez également rechercher toutes les vidéos si nécessaire.",
   "add-an-opening-song": "Ajouter un cantique d'ouverture",
@@ -75,6 +70,9 @@
   "dark": "Sombre",
   "darkMode": "Préférence de thème",
   "darkMode-explain": "Forcer l'application à utiliser le mode clair ou sombre, ou bien utiliser la valeur par défaut du système",
+  "days-long": "Dimanche_Lundi_Mardi_Mercredi_Jeudi_Vendredi_Samedi",
+  "days-plural": "jours",
+  "days-short": "Dim_Lun_Mar_Mer_Jeu_Ven_Sam",
   "delete": "Supprimer",
   "delete-media": "Suppression de média",
   "depends-on": "Relié à :",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configurez les paramètres de téléchargement et de lecture des médias pour les réunions",
   "meeting-media-manager": "M³ - Meeting Media Manager",
   "midweek-meeting": "Réunion de semaine",
+  "months-long": "Janvier_Février_Mars_Avril_Mai_Juin_Juillet_Août_Septembre_Octobre_Novembre_Décembre",
+  "months-short": "Jan_Fév_Mar_Avr_Mai_Juin_Juil_Août_Sep_Oct_Nov_Déc",
+  "music.starting": "Lecture...",
   "music.stopping": "Arrêt en cours...",
   "musicVolume": "Volume de la musique de fond",
   "musicVolume-explain": "Choisissez le volume de la lecture de la musique de fond. Cela permet de régler un volume plus bas pour la musique de fond, tout en maintenant un volume élevé pour les autres médias.",
diff --git a/src/i18n/hu.json b/src/i18n/hu.json
index f1e9b8e0..98835a12 100644
--- a/src/i18n/hu.json
+++ b/src/i18n/hu.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Sötét",
   "darkMode": "Téma",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Törlés",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Hétköznapi összejövetel",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Háttérzene lejátszási hangerő",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/ilo.json b/src/i18n/ilo.json
index 63d3dc8c..2282da56 100644
--- a/src/i18n/ilo.json
+++ b/src/i18n/ilo.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "I-delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index ac233670..eb3e6dbc 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Aggiungi un cantico dal nostro libro dei cantici alla lista dei media dell'adunanza.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Aggiungi un cantico di apertura",
@@ -75,6 +70,9 @@
   "dark": "Scuro",
   "darkMode": "Preferenza tema",
   "darkMode-explain": "Forza l'applicazione a utilizzare la modalità chiara o scura oppure usa quella predefinita nel sistema",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Elimina",
   "delete-media": "Elimina contenuto multimediale",
   "depends-on": "Collegato a:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Adunanza infrasettimanale",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Volume della musica di sottofondo",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/mg.json b/src/i18n/mg.json
index 91e50757..5af7cb67 100644
--- a/src/i18n/mg.json
+++ b/src/i18n/mg.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Maizina",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Hamafa",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Fivoriana andavanandro",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index b1688f63..f05b8af3 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Zondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrijdag_Zaterdag",
-  "days-short": "Zo_Ma_Di_Wo_Do_Vr_Za",
-  "months-long": "Januari_Februari_Maart_April_Mei_Juni_Juli_Augustus_September_Oktober_November_December",
-  "months-short": "Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Dec",
-  "days-plural": "dagen",
   "add-a-song": "Voeg een koninkrijkslied toe aan de medialijst.",
   "add-a-video-explain": "Voeg een video van jw.org toe aan de medialijst. De nieuwste filmpjes worden standaard getoond, maar je kan ook de zoekfunctie gebruiken.",
   "add-an-opening-song": "Voeg een openingslied toe",
@@ -75,6 +70,9 @@
   "dark": "Donker",
   "darkMode": "Thema voorkeur",
   "darkMode-explain": "Gebruik de app in lichte of donkere modus, of gebruik de systeemvoorkeur",
+  "days-long": "Zondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrijdag_Zaterdag",
+  "days-plural": "dagen",
+  "days-short": "Zo_Ma_Di_Wo_Do_Vr_Za",
   "delete": "Verwijder",
   "delete-media": "Verwijder media",
   "depends-on": "Gelinkt met:",
@@ -187,7 +185,10 @@
   "mediaRetrievalAndPlaybackDescription": "Download- en afspeelinstellingen voor vergadering configureren.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Doordeweekse vergadering",
-  "music.stopping": "Bezig met stoppen...",
+  "months-long": "Januari_Februari_Maart_April_Mei_Juni_Juli_Augustus_September_Oktober_November_December",
+  "months-short": "Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Dec",
+  "music.starting": "Starten...",
+  "music.stopping": "Stoppen...",
   "musicVolume": "Afspeelvolume achtergrondmuziek",
   "musicVolume-explain": "Kies het volume van de achtergrondmuziek. Hierdoor kan een lager volume voor achtergrondmuziek ingesteld worden, terwijl het volume van andere media hoog blijft.",
   "mwDay": "Doordeweekse vergaderdag",
diff --git a/src/i18n/pag.json b/src/i18n/pag.json
index 59e1343d..56706a03 100644
--- a/src/i18n/pag.json
+++ b/src/i18n/pag.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/pt-pt.json b/src/i18n/pt-pt.json
index da159d03..d89308f9 100644
--- a/src/i18n/pt-pt.json
+++ b/src/i18n/pt-pt.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Domingo_Segunda_Terça_Quarta_Quinta_Sexta_Sábado",
-  "days-short": "Dom_Seg_Ter_Qua_Qui_Sex_Sáb",
-  "months-long": "Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro",
-  "months-short": "Jan_Feb_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez",
-  "days-plural": "dias",
   "add-a-song": "Adicionar um cântico à lista de multimédias da reunião.",
   "add-a-video-explain": "Adicione um dos vídeos do JW.org à lista de multimédia. Os vídeos mais recentes são exibidos aqui, mas também pode pesquisar por outros quaisquer através da barra de pesquisa, se necessário.",
   "add-an-opening-song": "Adicionar um cântico inicial",
@@ -75,6 +70,9 @@
   "dark": "Escuro",
   "darkMode": "Preferência de tema",
   "darkMode-explain": "Forçar o aplicativo a usar o modo claro ou escuro, ou usar o padrão do sistema",
+  "days-long": "Domingo_Segunda_Terça_Quarta_Quinta_Sexta_Sábado",
+  "days-plural": "dias",
+  "days-short": "Dom_Seg_Ter_Qua_Qui_Sex_Sáb",
   "delete": "Eliminar",
   "delete-media": "Eliminar multimédia",
   "depends-on": "Associado a:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configurar as definições de descarregamento e reprodução de multimédia para reuniões.",
   "meeting-media-manager": "Gestor de Multimédia das Reuniões",
   "midweek-meeting": "Reunião do meio de semana",
+  "months-long": "Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro",
+  "months-short": "Jan_Feb_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez",
+  "music.starting": "A iniciar...",
   "music.stopping": "A parar...",
   "musicVolume": "Volume de reprodução de música de fundo",
   "musicVolume-explain": "Escolha o volume da reprodução de música de fundo. Isto permite definir um volume mais baixo para a música de fundo, mantendo o volume de outros tipos de multimédia alto.",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index c7ea70de..02849af8 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Domingo_Segunda_Terça_Quarta_Quinta_Sexta_Sábado",
-  "days-short": "Dom_Seg_Ter_Qua_Qui_Sex_Sáb",
-  "months-long": "Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro",
-  "months-short": "Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez",
-  "days-plural": "dias",
   "add-a-song": "Adicione um cântico à lista de mídia da reunião.",
   "add-a-video-explain": "Adicione um dos vídeos do JW.org à lista de mídia. Os vídeos mais recentes são exibidos aqui, mas você também pode pesquisar por todos os vídeos, se necessário.",
   "add-an-opening-song": "Adicionar um cântico inicial",
@@ -75,6 +70,9 @@
   "dark": "Escuro",
   "darkMode": "Preferência de tema",
   "darkMode-explain": "Forçar o aplicativo a usar o modo claro ou escuro, ou usar o padrão do sistema",
+  "days-long": "Domingo_Segunda_Terça_Quarta_Quinta_Sexta_Sábado",
+  "days-plural": "dias",
+  "days-short": "Dom_Seg_Ter_Qua_Qui_Sex_Sáb",
   "delete": "Excluir",
   "delete-media": "Excluir mídia",
   "depends-on": "Vinculado a:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configurar as opções de reprodução das mídias nas reuniões.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Reunião do meio de semana",
+  "months-long": "Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro",
+  "months-short": "Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez",
+  "music.starting": "Iniciando...",
   "music.stopping": "Parando...",
   "musicVolume": "Volume de reprodução dos cânticos de fundo",
   "musicVolume-explain": "Você pode definir um volume menor para os cânticos de fundo, mantendo o volume de outras mídias elevado.",
diff --git a/src/i18n/rmn-x-rmg.json b/src/i18n/rmn-x-rmg.json
index 1fe889c9..7a58f5a2 100644
--- a/src/i18n/rmn-x-rmg.json
+++ b/src/i18n/rmn-x-rmg.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/ro.json b/src/i18n/ro.json
index edeacfa9..8f5d2b5e 100644
--- a/src/i18n/ro.json
+++ b/src/i18n/ro.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Întunecat",
   "darkMode": "Preferințe de temă",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Șterge",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Întrunirea din timpul săptămânii",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Volumul redării muzicii de fundal",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 1502c54b..12fbeba4 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Воскресенье_Понедельник_Вторник_Среда_Четверг_Пятница_Суббота",
-  "days-short": "Вс_Пн_Вт_Ср_Чт_Пт_Сб",
-  "months-long": "Январь_Февраль_Март_Апрель_Май_Июнь_Июль_Август_Сентябрь_Октябрь_Ноябрь_Декабрь",
-  "months-short": "Янв_Фев_Март_Апр_Май_Июн_Июл_Авг_Сен_Окт_Ноя_Дек",
-  "days-plural": "дн.",
   "add-a-song": "Добавить песню из нашего песенника в список медиа файлов для встречи.",
   "add-a-video-explain": "Добавить одно из видео с сайта JW.org в список медиа файлов. Здесь показаны последние видео, но при необходимости можно выполнить поиск по всем видео.",
   "add-an-opening-song": "Добавить вступительную песню",
@@ -75,6 +70,9 @@
   "dark": "Темный",
   "darkMode": "Предпочтение темы",
   "darkMode-explain": "Заставить приложение использовать светлый или темный режим, или использовать системный режим по умолчанию",
+  "days-long": "Воскресенье_Понедельник_Вторник_Среда_Четверг_Пятница_Суббота",
+  "days-plural": "дн.",
+  "days-short": "Вс_Пн_Вт_Ср_Чт_Пт_Сб",
   "delete": "Удалить",
   "delete-media": "Удалить медиа",
   "depends-on": "Связан с:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Установите настройки загрузки и воспроизведения медиафайлов.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Встречи в будние дни",
+  "months-long": "Январь_Февраль_Март_Апрель_Май_Июнь_Июль_Август_Сентябрь_Октябрь_Ноябрь_Декабрь",
+  "months-short": "Янв_Фев_Март_Апр_Май_Июн_Июл_Авг_Сен_Окт_Ноя_Дек",
+  "music.starting": "Запуск...",
   "music.stopping": "Остановка...",
   "musicVolume": "Громкость фоновой музыки",
   "musicVolume-explain": "Выберите громкость воспроизведения фоновой музыки. Это позволяет установить более низкий уровень громкости для фоновой музыки, сохранив при этом высокий уровень громкости других медиа файлов.",
diff --git a/src/i18n/sk.json b/src/i18n/sk.json
index 4dbf8fdc..f9087af2 100644
--- a/src/i18n/sk.json
+++ b/src/i18n/sk.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Tmavá",
   "darkMode": "Nastavenie témy",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Vymazať",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Zhromaždenie v týždni",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/sl.json b/src/i18n/sl.json
index 5c28203b..5e4623f5 100644
--- a/src/i18n/sl.json
+++ b/src/i18n/sl.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Na seznam multimedijske vsebine dodaj pesem iz naše pesmarice.",
   "add-a-video-explain": "Na seznam multimedijske vsebine dodaj enega od videoposnetkov z jw.org. Tu so sicer prikazani samo najnovejši videoposnetki, vendar lahko po potrebi poiščeš tudi katerega koli drugega.",
   "add-an-opening-song": "Dodaj uvodno pesem",
@@ -75,6 +70,9 @@
   "dark": "Temen",
   "darkMode": "Tema",
   "darkMode-explain": "Prisili aplikacijo, da uporabi svetli ali temni način, ali pa uporabi privzeto nastavitev sistema",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Izbriši",
   "delete-media": "Izbriši multimedijsko vsebino",
   "depends-on": "Povezan z:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Nastavi prenos in predvajanje multimedijske vsebine za shod.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Shod med tednom",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Zaustavljanje...",
   "musicVolume": "Glasnost predvajanja glasbe v ozadju",
   "musicVolume-explain": "Izberi glasnost predvajanja glasbe v ozadju. To ti omogoča nastavitev nižje glasnosti glasbe v ozadju, medtem ko glasnost druge multimedijske vsebine ostane visoka.",
diff --git a/src/i18n/sv.json b/src/i18n/sv.json
index a8220a17..d0227fb7 100644
--- a/src/i18n/sv.json
+++ b/src/i18n/sv.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag",
-  "days-short": "Sön_mån_tis_tors_fre_lör",
-  "months-long": "Januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december",
-  "months-short": "Jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec",
-  "days-plural": "dagar",
   "add-a-song": "Lägg till en sång från sångboken till medialistan.",
   "add-a-video-explain": "Lägg till en video från JW.org till medialistan. Senaste videon visas här men du kan också söka efter alla videos.",
   "add-an-opening-song": "Lägg till inledande sång",
@@ -75,6 +70,9 @@
   "dark": "Mörk",
   "darkMode": "Temainställningar",
   "darkMode-explain": "Tvinga appen att använda ljus eller mörkt läge, eller använd systemets standard",
+  "days-long": "Söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag",
+  "days-plural": "dagar",
+  "days-short": "Sön_mån_tis_tors_fre_lör",
   "delete": "Radera",
   "delete-media": "Radera media",
   "depends-on": "Länkad till:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Konfigurera nedladdnings- och uppspelningsinställningar för mötesmedia.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Veckomöte",
+  "months-long": "Januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december",
+  "months-short": "Jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stoppar...",
   "musicVolume": "Ljudvolym för bakgrundsmusik",
   "musicVolume-explain": "Välj volymen för bakgrundsmusikens uppspelning. Detta gör det möjligt att ställa in en lägre volym för bakgrundsmusik, samtidigt som volymen av annan media är hög.",
diff --git a/src/i18n/sw.json b/src/i18n/sw.json
index 1a411ab4..83b089b3 100644
--- a/src/i18n/sw.json
+++ b/src/i18n/sw.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Ongeza wimbo kutoka kitabu cha wimbo kwenye orodha.",
   "add-a-video-explain": "Ongeza video kutoka kwa tovuti la jw.org kwenye orodha ya media. Video za hivi karibuni zinaonyeshwa hapa, lakini unaweza pia kutafuta video zote ikiwa inahitajika.",
   "add-an-opening-song": "Ongeza wimbo wa kwanza",
@@ -75,6 +70,9 @@
   "dark": "Mwonekano mweusi",
   "darkMode": "Mapendeleo ya mandhari",
   "darkMode-explain": "Lazimisha mfumo utumie hali ya mwangaza au giza, au tumia mipangilio ya kompyuta yako",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Futa",
   "delete-media": "Futa midia",
   "depends-on": "Imeunganishwa na:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/ta.json b/src/i18n/ta.json
index 2000fe97..e090aadd 100644
--- a/src/i18n/ta.json
+++ b/src/i18n/ta.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/tl.json b/src/i18n/tl.json
index 6ce12a76..64b390f1 100644
--- a/src/i18n/tl.json
+++ b/src/i18n/tl.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme preference",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "I-delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "Background music playback volume",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",
diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 9f43caf2..c5188807 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Неділя_Понеділок_Вівторок_Середа_Четвер_П'ятниця_Субота",
-  "days-short": "Нед_Пон_Вів_Сер_Чет_П'ят_Суб",
-  "months-long": "Січень_Лютий_Березень_Квітень_Травень_Червень_Липень_Серпень_Вересень_Жовтень_Листопад_Грудень",
-  "months-short": "Січ_Лют_Бер_Кві_Тра_Чер_Лип_Сер_Вер_Жов_Лис_Гру",
-  "days-plural": "дні",
   "add-a-song": "Додати пісню з нашого пісенника до списку медіафайлів зібрання.",
   "add-a-video-explain": "Додати одне з відео з JW.org до списку медіафайлів. Останні відео показуються тут, але ви також можете шукати по всіх відео, якщо необхідно.",
   "add-an-opening-song": "Додати вступну пісню",
@@ -75,6 +70,9 @@
   "dark": "Темний",
   "darkMode": "Налаштування теми",
   "darkMode-explain": "Примусово увімкніть світлу або темну тему, або використовуйте системну",
+  "days-long": "Неділя_Понеділок_Вівторок_Середа_Четвер_П'ятниця_Субота",
+  "days-plural": "дні",
+  "days-short": "Нед_Пон_Вів_Сер_Чет_П'ят_Суб",
   "delete": "Видалити",
   "delete-media": "Видалити медіа",
   "depends-on": "Пов'язано з:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Налаштуйте параметри завантаження та відтворення медіа для зібрань.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Зібрання серед тижня",
+  "months-long": "Січень_Лютий_Березень_Квітень_Травень_Червень_Липень_Серпень_Вересень_Жовтень_Листопад_Грудень",
+  "months-short": "Січ_Лют_Бер_Кві_Тра_Чер_Лип_Сер_Вер_Жов_Лис_Гру",
+  "music.starting": "Запуск...",
   "music.stopping": "Зупинення...",
   "musicVolume": "Гучність відтворення музики у фоновому режимі",
   "musicVolume-explain": "Виберіть гучність відтворення фонової музики. Це дозволяє встановити нижчу гучність для фонової музики, зберігаючи високу гучність іншого медіа.",
diff --git a/src/i18n/wes-x-pgw.json b/src/i18n/wes-x-pgw.json
index 5ea1a8d6..bffa4718 100644
--- a/src/i18n/wes-x-pgw.json
+++ b/src/i18n/wes-x-pgw.json
@@ -1,9 +1,4 @@
 {
-  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
-  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
-  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
-  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
-  "days-plural": "days",
   "add-a-song": "Add a song from our songbook to the meeting media list.",
   "add-a-video-explain": "Add one of the videos from JW.org to the media list. The latest videos are displayed here, but you can also search through all videos if needed.",
   "add-an-opening-song": "Add an opening song",
@@ -75,6 +70,9 @@
   "dark": "Dark",
   "darkMode": "Theme setting",
   "darkMode-explain": "Force the app to use light or dark mode, or use the system default",
+  "days-long": "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday",
+  "days-plural": "days",
+  "days-short": "Sun_Mon_Tue_Wed_Thu_Fri_Sat",
   "delete": "Delete",
   "delete-media": "Delete media",
   "depends-on": "Linked to:",
@@ -187,6 +185,9 @@
   "mediaRetrievalAndPlaybackDescription": "Configure meeting media download and playback settings.",
   "meeting-media-manager": "Meeting Media Manager",
   "midweek-meeting": "Midweek meeting",
+  "months-long": "January_February_March_April_May_June_July_August_September_October_November_December",
+  "months-short": "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec",
+  "music.starting": "Starting...",
   "music.stopping": "Stopping...",
   "musicVolume": "How loud the background music go play",
   "musicVolume-explain": "Choose the volume of the background music playback. This allows you to set a lower volume for background music, while keeping the volume of other media high.",

From 2a6281b47bf5ffc2f88a689c985473d137b95905 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Oct 2024 06:09:45 +0000
Subject: [PATCH 11/11] chore(deps-dev): bump @types/node from 20.16.11 to
 20.16.12

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.16.11 to 20.16.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5b67c471..0bf5d9c8 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "@types/fs-extra": "^11.0.4",
     "@types/heic-convert": "^2.1.0",
     "@types/klaw-sync": "^6.0.5",
-    "@types/node": "^20.16.11",
+    "@types/node": "^20.16.12",
     "@types/pretty-bytes": "^5.2.0",
     "@types/sanitize-html": "^2",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
diff --git a/yarn.lock b/yarn.lock
index d48e4305..bbd9ae6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2308,7 +2308,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.16.11, @types/node@npm:^20.9.0":
+"@types/node@npm:^20.16.12":
+  version: 20.16.12
+  resolution: "@types/node@npm:20.16.12"
+  dependencies:
+    undici-types: "npm:~6.19.2"
+  checksum: 10c0/f6a3c90c6745881d47f8dae7eb39d0dd6df9a4060c8f1ab7004690f60b9b183d862c9c6b380b9e8d5a17dd670ac7b19d6318f24c170897c85a9729f9804f47cf
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:^20.9.0":
   version: 20.16.11
   resolution: "@types/node@npm:20.16.11"
   dependencies:
@@ -9084,7 +9093,7 @@ __metadata:
     "@types/fs-extra": "npm:^11.0.4"
     "@types/heic-convert": "npm:^2.1.0"
     "@types/klaw-sync": "npm:^6.0.5"
-    "@types/node": "npm:^20.16.11"
+    "@types/node": "npm:^20.16.12"
     "@types/pretty-bytes": "npm:^5.2.0"
     "@types/sanitize-html": "npm:^2"
     "@typescript-eslint/eslint-plugin": "npm:^7.18.0"